Add multi-session tests

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

diff --git a/src/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsTest.java b/src/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsTest.java
index a38d2e39f8e962bbf0b65123a4b2119990e4cf7b..771d94512db25cb59c61acb1f04221101eacd3dd 100644 (file)
--- a/src/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsTest.java
+++ b/src/org/lttng/ust/agent/integration/log4j/Log4jEnabledEventsTest.java
@@ -27,21 +27,21 @@ public class Log4jEnabledEventsTest extends EnabledEventsTest {
     private Logger loggerD;
 
     @BeforeClass
-    public static void julClassSetup() {
+    public static void log4jClassSetup() {
         /* Skip tests if we can't find the JNI library or lttng-tools */
         assumeTrue(TestUtils.checkForLog4jLibrary());
         assumeTrue(TestUtils.checkForLttngTools(Domain.LOG4J));
+
+        LttngSession.destroyAllSessions();
     }
 
     @AfterClass
-    public static void julClassCleanup() {
+    public static void log4jClassCleanup() {
         LttngSession.deleteAllTracee();
     }
 
     @Before
-    public void julSetup() throws SecurityException, IOException {
-        // TODO Wipe all existing LTTng sessions?
-
+    public void log4jSetup() throws SecurityException, IOException {
         loggerA = Logger.getLogger(EVENT_NAME_A);
         loggerB = Logger.getLogger(EVENT_NAME_B);
         loggerC = Logger.getLogger(EVENT_NAME_C);
@@ -62,7 +62,7 @@ public class Log4jEnabledEventsTest extends EnabledEventsTest {
     }
 
     @After
-    public void julTeardown() {
+    public void log4jTeardown() {
         loggerA.removeAppender((Appender) handlerA);
         loggerB.removeAppender((Appender) handlerB);
         loggerC.removeAppender((Appender) handlerC);