Move the "LTTng control" to separate packages

[lttng-ust-java-tests.git] / src / test / java / org / lttng / ust / agent / integration / log4j / Log4jMultiSessionTest.java

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 64a44edf840f35d5e70902c98ea0bee0cb71eec0..ef0bae1a8f7c5ae23f0f50247a909128f9e0b58e 100644 (file)
--- a/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java
+++ b/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jMultiSessionTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2015, EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 package org.lttng.ust.agent.integration.log4j;
 
 import static org.junit.Assume.assumeTrue;
@@ -11,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.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
+ */
 public class Log4jMultiSessionTest extends MultiSessionTestBase {
 
     private static final Domain DOMAIN = Domain.LOG4J;
@@ -26,20 +47,32 @@ public class Log4jMultiSessionTest extends MultiSessionTestBase {
     private Logger loggerC;
     private Logger loggerD;
 
+    /**
+     * Class setup
+     */
     @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();
     }
 
+    /**
+     * Class teardown
+     */
     @AfterClass
     public static void log4jClassCleanup() {
-        LttngSession.deleteAllTracee();
+        LttngToolsHelper.deleteAllTraces();
     }
 
+       /**
+        * Test setup
+        *
+        * @throws SecurityException
+        * @throws IOException
+        */
     @Before
     public void log4jSetup() throws SecurityException, IOException {
         // TODO Wipe all existing LTTng sessions?
@@ -65,6 +98,9 @@ public class Log4jMultiSessionTest extends MultiSessionTestBase {
         loggerD.addAppender((Appender) handlerD);
     }
 
+    /**
+     * Test teardown
+     */
     @After
     public void log4jTeardown() {
         loggerA.removeAppender((Appender) handlerA);