Move the "LTTng control" to separate packages

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

diff --git a/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsTest.java b/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsTest.java
index fb280f4b666db89d61b547e55ec23eac3158db4f..949e914a210e02adae0894bf9c2b0241e465a139 100644 (file)
--- a/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsTest.java
+++ b/src/test/java/org/lttng/ust/agent/integration/jul/JulEnabledEventsTest.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.jul;
 
 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.EnabledEventsTestBase;
 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;
 
+/**
+ * Enabled events test for the LTTng-UST JUL log handler.
+ */
 public class JulEnabledEventsTest extends EnabledEventsTestBase {
 
     private static final Domain DOMAIN = Domain.JUL;
@@ -26,20 +47,32 @@ public class JulEnabledEventsTest extends EnabledEventsTestBase {
     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);
@@ -61,6 +94,9 @@ public class JulEnabledEventsTest extends EnabledEventsTestBase {
         loggerC.addHandler((Handler) handlerC);
     }
 
+    /**
+     * Test teardown
+     */
     @After
     public void julTeardown() {
         loggerA.removeHandler((Handler) handlerA);