Add log4j2 agent tests

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

diff --git a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jMultiSessionIT.java b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jMultiSessionIT.java
index 00e71835a7b29846059fe0ab85c439140790a76a..dc654b0df696010334a85ac306d608b9e98621b6 100644 (file)
--- a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jMultiSessionIT.java
+++ b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jMultiSessionIT.java
@@ -18,8 +18,6 @@
 
 package org.lttng.ust.agent.integration.events;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 
 import org.apache.log4j.Appender;
@@ -30,11 +28,8 @@ 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.ust.agent.integration.events.MultiSessionITBase;
 import org.lttng.ust.agent.log4j.LttngLogAppender;
 import org.lttng.ust.agent.utils.Log4jTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
 
 /**
  * Log4j tests for multiple concurrent tracing sessions
@@ -53,19 +48,15 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
      */
     @BeforeClass
     public static void log4jClassSetup() {
-        /* Make sure we can find the JNI library and lttng-tools */
-        assertTrue(Log4jTestUtils.checkForLog4jLibrary());
-        assertTrue(LttngUtils.checkForLttngTools(Domain.LOG4J));
-
-        LttngToolsHelper.destroyAllSessions();
+        Log4jTestUtils.testClassSetup();
     }
 
     /**
-     * Class teardown
+     * Class cleanup
      */
     @AfterClass
     public static void log4jClassCleanup() {
-        LttngToolsHelper.deleteAllTraces();
+        Log4jTestUtils.testClassCleanup();
     }
 
        /**
@@ -120,6 +111,12 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
         return DOMAIN;
     }
 
+    @Override
+    protected boolean closeHandlers()
+    {
+        return true;
+    }
+
     @Override
     protected void sendEventsToLoggers() {
         Log4jTestUtils.send10Events(loggerA);