X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Flog4j%2FLog4jMultiSessionTest.java;h=ef0bae1a8f7c5ae23f0f50247a909128f9e0b58e;hb=45d1768cc5aa27806687d5378b4091dbef125e57;hp=31556b60317cf10813eb3e41001f6bc414aa1365;hpb=7dfd1adfc507b63e62004efd3a9a74ae7d1f0d3e;p=lttng-ust-java-tests.git diff --git a/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java b/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java index 31556b6..ef0bae1 100644 --- a/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java +++ b/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java @@ -29,11 +29,11 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.lttng.tools.ILttngSession.Domain; +import org.lttng.tools.LttngToolsHelper; +import org.lttng.tools.utils.LttngUtils; import org.lttng.ust.agent.integration.MultiSessionTestBase; import org.lttng.ust.agent.log4j.LttngLogAppender; -import org.lttng.ust.agent.utils.LttngSession; -import org.lttng.ust.agent.utils.LttngSession.Domain; -import org.lttng.ust.agent.utils.MiscTestUtils; /** * Log4j tests for multiple concurrent tracing sessions @@ -53,10 +53,10 @@ public class Log4jMultiSessionTest extends MultiSessionTestBase { @BeforeClass public static void log4jClassSetup() { /* Skip tests if we can't find the JNI library or lttng-tools */ - assumeTrue(MiscTestUtils.checkForLog4jLibrary()); - assumeTrue(MiscTestUtils.checkForLttngTools(Domain.LOG4J)); + assumeTrue(LttngUtils.checkForLog4jLibrary()); + assumeTrue(LttngUtils.checkForLttngTools(Domain.LOG4J)); - LttngSession.destroyAllSessions(); + LttngToolsHelper.destroyAllSessions(); } /** @@ -64,7 +64,7 @@ public class Log4jMultiSessionTest extends MultiSessionTestBase { */ @AfterClass public static void log4jClassCleanup() { - LttngSession.deleteAllTracee(); + LttngToolsHelper.deleteAllTraces(); } /**