Move the "LTTng control" to separate packages

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

diff --git a/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiTest.java b/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiTest.java
index 6430a92e490d26fdf7e37cc5da45c991533c85e3..0f473f96df78c71695c8e8b9da37f5addf38485e 100644 (file)
--- a/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiTest.java
+++ b/src/test/java/org/lttng/ust/agent/integration/log4j/Log4jLegacyApiTest.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.Assert.assertEquals;
@@ -16,12 +34,20 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.lttng.tools.ILttngSession;
+import org.lttng.tools.ILttngSession.Domain;
+import org.lttng.tools.LttngToolsHelper;
+import org.lttng.tools.utils.LttngUtils;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.LTTngAgent;
-import org.lttng.ust.agent.utils.LttngSession;
-import org.lttng.ust.agent.utils.LttngSession.Domain;
-import org.lttng.ust.agent.utils.MiscTestUtils;
+import org.lttng.ust.agent.utils.TestPrintRunner;
 
+/**
+ * Enabled events test for the LTTng-UST Log4j log handler, using the legacy
+ * API.
+ */
+@RunWith(TestPrintRunner.class)
 @SuppressWarnings("deprecation")
 public class Log4jLegacyApiTest {
 
@@ -30,25 +56,34 @@ public class Log4jLegacyApiTest {
     private static final String EVENT_NAME_A = "EventA";
     private static final String EVENT_NAME_B = "EventB";
 
-    private LttngSession session;
+    private ILttngSession session;
 
     private Logger loggerA;
     private Logger loggerB;
 
+    /**
+     * Class setup
+     */
     @BeforeClass
     public static void classSetup() {
         /* 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 cleanup
+     */
     @AfterClass
     public static void classCleanup() {
-        LttngSession.deleteAllTracee();
+        LttngToolsHelper.deleteAllTraces();
     }
 
+    /**
+     * Test setup
+     */
     @Before
     public void setup() {
         loggerA = Logger.getLogger(EVENT_NAME_A);
@@ -58,9 +93,12 @@ public class Log4jLegacyApiTest {
         loggerA.setLevel(Level.ALL);
         loggerB.setLevel(Level.ALL);
 
-        session = new LttngSession(null, DOMAIN);
+        session = ILttngSession.newCommandLineSession(null, DOMAIN);
     }
 
+    /**
+     * Test cleanup
+     */
     @After
     public void tearDown() {
         session.close();
@@ -71,6 +109,9 @@ public class Log4jLegacyApiTest {
         loggerB = null;
     }
 
+    /**
+     * Test tracing with no events enabled in the tracing session.
+     */
     @Test
     public void testNoEvents() {
         assertTrue(session.start());
@@ -88,6 +129,9 @@ public class Log4jLegacyApiTest {
         assertEquals(0, handler.getEventCount());
     }
 
+    /**
+     * Test tracing with all events enabled (-l -a) in the tracing session.
+     */
     @Test
     public void testAllEvents() {
         assertTrue(session.enableAllEvents());
@@ -106,6 +150,9 @@ public class Log4jLegacyApiTest {
         assertEquals(20, handler.getEventCount());
     }
 
+    /**
+     * Test tracing with a subset of events enabled in the tracing session.
+     */
     @Test
     public void testSomeEvents() {
         assertTrue(session.enableEvents(EVENT_NAME_A));