Move the "LTTng control" to separate packages

[lttng-ust-java-tests.git] / src / test / java / org / lttng / ust / agent / integration / jul / JulMultiSessionTest.java

diff --git a/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionTest.java b/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionTest.java
index d59e636dd8f7ad8977fe56b39edddadb2d4f269d..25a9cabc5cc082f571ac9897ee07b28611134f4f 100644 (file)
--- a/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionTest.java
+++ b/src/test/java/org/lttng/ust/agent/integration/jul/JulMultiSessionTest.java
@@ -29,12 +29,15 @@ 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.jul.LttngLogHandler;
-import org.lttng.ust.agent.utils.LttngSession;
-import org.lttng.ust.agent.utils.LttngSession.Domain;
-import org.lttng.ust.agent.utils.MiscTestUtils;
 
+/**
+ * JUL tests for multiple concurrent tracing sessions
+ */
 public class JulMultiSessionTest extends MultiSessionTestBase {
 
     private static final Domain DOMAIN = Domain.JUL;
@@ -44,20 +47,32 @@ public class JulMultiSessionTest extends MultiSessionTestBase {
     private Logger loggerC;
     private Logger loggerD;
 
+    /**
+     * Class setup
+     */
     @BeforeClass
     public static void julClassSetup() {
         /* Skip tests if we can't find the JNI library or lttng-tools */
-        assumeTrue(MiscTestUtils.checkForJulLibrary());
-        assumeTrue(MiscTestUtils.checkForLttngTools(Domain.JUL));
+        assumeTrue(LttngUtils.checkForJulLibrary());
+        assumeTrue(LttngUtils.checkForLttngTools(Domain.JUL));
 
-        LttngSession.destroyAllSessions();
+        LttngToolsHelper.destroyAllSessions();
     }
 
+    /**
+     * Class cleanup
+     */
     @AfterClass
     public static void julClassCleanup() {
-        LttngSession.deleteAllTracee();
+        LttngToolsHelper.deleteAllTraces();
     }
 
+    /**
+     * Test setup
+     *
+     * @throws SecurityException
+     * @throws IOException
+     */
     @Before
     public void julSetup() throws SecurityException, IOException {
         loggerA = Logger.getLogger(EVENT_NAME_A);
@@ -81,6 +96,9 @@ public class JulMultiSessionTest extends MultiSessionTestBase {
         loggerD.addHandler((Handler) handlerD);
     }
 
+    /**
+     * Test teardown
+     */
     @After
     public void julTeardown() {
         loggerA.removeHandler((Handler) handlerA);