From 0e77c728205cb09c2594e05d9d455e84c6a330ab Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Mon, 31 Aug 2015 18:10:08 -0400 Subject: [PATCH] Move some tests to the "events" subpackage Better clarify these now that we have "client" and "filter" tests too. Signed-off-by: Alexandre Montplaisir --- .../agent/integration/{ => events}/EnabledEventsITBase.java | 2 +- .../agent/integration/{ => events}/MultiSessionITBase.java | 2 +- .../integration/{ => events}/jul/JulEnabledEventsIT.java | 4 ++-- .../agent/integration/{ => events}/jul/JulLegacyApiIT.java | 2 +- .../agent/integration/{ => events}/jul/JulMultiSessionIT.java | 4 ++-- .../ust/agent/integration/{ => events}/jul/JulTestUtils.java | 2 +- .../integration/{ => events}/log4j/Log4jEnabledEventsIT.java | 4 ++-- .../integration/{ => events}/log4j/Log4jLegacyApiIT.java | 2 +- .../integration/{ => events}/log4j/Log4jMultiSessionIT.java | 4 ++-- .../agent/integration/{ => events}/log4j/Log4jTestUtils.java | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/EnabledEventsITBase.java (99%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/MultiSessionITBase.java (99%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/jul/JulEnabledEventsIT.java (96%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/jul/JulLegacyApiIT.java (99%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/jul/JulMultiSessionIT.java (96%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/jul/JulTestUtils.java (97%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/log4j/Log4jEnabledEventsIT.java (96%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/log4j/Log4jLegacyApiIT.java (99%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/log4j/Log4jMultiSessionIT.java (96%) rename lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/{ => events}/log4j/Log4jTestUtils.java (97%) diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/EnabledEventsITBase.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java similarity index 99% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/EnabledEventsITBase.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java index 0e8c9e6..5659493 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/EnabledEventsITBase.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration; +package org.lttng.ust.agent.integration.events; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/MultiSessionITBase.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/MultiSessionITBase.java similarity index 99% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/MultiSessionITBase.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/MultiSessionITBase.java index e467f0e..6864292 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/MultiSessionITBase.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/MultiSessionITBase.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration; +package org.lttng.ust.agent.integration.events; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulEnabledEventsIT.java similarity index 96% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulEnabledEventsIT.java index d7a31f1..3b292fe 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulEnabledEventsIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.jul; +package org.lttng.ust.agent.integration.events.jul; import static org.junit.Assume.assumeTrue; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.lttng.tools.ILttngSession.Domain; import org.lttng.tools.LttngToolsHelper; -import org.lttng.ust.agent.integration.EnabledEventsITBase; +import org.lttng.ust.agent.integration.events.EnabledEventsITBase; import org.lttng.ust.agent.jul.LttngLogHandler; import org.lttng.ust.agent.utils.LttngUtils; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulLegacyApiIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulLegacyApiIT.java similarity index 99% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulLegacyApiIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulLegacyApiIT.java index a7abe71..fc0353b 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulLegacyApiIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulLegacyApiIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.jul; +package org.lttng.ust.agent.integration.events.jul; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulMultiSessionIT.java similarity index 96% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulMultiSessionIT.java index 8d71c86..59c8e39 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulMultiSessionIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.jul; +package org.lttng.ust.agent.integration.events.jul; import static org.junit.Assume.assumeTrue; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.lttng.tools.ILttngSession.Domain; import org.lttng.tools.LttngToolsHelper; -import org.lttng.ust.agent.integration.MultiSessionITBase; +import org.lttng.ust.agent.integration.events.MultiSessionITBase; import org.lttng.ust.agent.jul.LttngLogHandler; import org.lttng.ust.agent.utils.LttngUtils; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulTestUtils.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulTestUtils.java similarity index 97% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulTestUtils.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulTestUtils.java index 0a3e13c..2d98496 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/jul/JulTestUtils.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/jul/JulTestUtils.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.jul; +package org.lttng.ust.agent.integration.events.jul; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jEnabledEventsIT.java similarity index 96% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jEnabledEventsIT.java index 02bae94..120143d 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jEnabledEventsIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.log4j; +package org.lttng.ust.agent.integration.events.log4j; import static org.junit.Assume.assumeTrue; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.lttng.tools.ILttngSession.Domain; import org.lttng.tools.LttngToolsHelper; -import org.lttng.ust.agent.integration.EnabledEventsITBase; +import org.lttng.ust.agent.integration.events.EnabledEventsITBase; import org.lttng.ust.agent.log4j.LttngLogAppender; import org.lttng.ust.agent.utils.LttngUtils; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jLegacyApiIT.java similarity index 99% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jLegacyApiIT.java index 054fd94..d673cfa 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jLegacyApiIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.log4j; +package org.lttng.ust.agent.integration.events.log4j; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionIT.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jMultiSessionIT.java similarity index 96% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionIT.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jMultiSessionIT.java index e9f9458..0821744 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionIT.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jMultiSessionIT.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.log4j; +package org.lttng.ust.agent.integration.events.log4j; import static org.junit.Assume.assumeTrue; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.lttng.tools.ILttngSession.Domain; import org.lttng.tools.LttngToolsHelper; -import org.lttng.ust.agent.integration.MultiSessionITBase; +import org.lttng.ust.agent.integration.events.MultiSessionITBase; import org.lttng.ust.agent.log4j.LttngLogAppender; import org.lttng.ust.agent.utils.LttngUtils; diff --git a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jTestUtils.java b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jTestUtils.java similarity index 97% rename from lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jTestUtils.java rename to lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jTestUtils.java index c69f7bc..e7e645e 100644 --- a/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jTestUtils.java +++ b/lttng-ust-java-tests/src/test/java/org/lttng/ust/agent/integration/events/log4j/Log4jTestUtils.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.lttng.ust.agent.integration.log4j; +package org.lttng.ust.agent.integration.events.log4j; import java.io.IOException; -- 2.34.1