Add 'log4j2' domain tests to the Log4j 2.x agent

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

diff --git a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java
index bc8e631dcce4ba48a3b9adcae28dce328154f741..7c8470238e26474c24c696ebb02a201f4bd2122a 100644 (file)
--- a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java
+++ b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java
@@ -18,26 +18,25 @@
 
 package org.lttng.ust.agent.integration.context;
 
-import static org.junit.Assume.assumeTrue;
-
 import java.io.IOException;
 
 import org.apache.log4j.Appender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.lttng.tools.ILttngSession.Domain;
-import org.lttng.tools.LttngToolsHelper;
 import org.lttng.ust.agent.log4j.LttngLogAppender;
 import org.lttng.ust.agent.utils.Log4jTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
 
 /**
  * Enabled app contexts test for the LTTng-UST JUL log handler.
  */
+@Tag("agent:log4j")
+@Tag("domain:log4j")
 public class Log4jAppContextIT extends AppContextITBase {
 
     private static final Domain DOMAIN = Domain.LOG4J;
@@ -47,21 +46,17 @@ public class Log4jAppContextIT extends AppContextITBase {
     /**
      * Class setup
      */
-    @BeforeClass
-    public static void julClassSetup() {
-        /* Skip tests if we can't find the log4j library or lttng-tools */
-        assumeTrue(Log4jTestUtils.checkForLog4jLibrary());
-        assumeTrue(LttngUtils.checkForLttngTools(Domain.LOG4J));
-
-        LttngToolsHelper.destroyAllSessions();
+    @BeforeAll
+    public static void log4jClassSetup() {
+        Log4jTestUtils.testClassSetup();
     }
 
     /**
      * Class cleanup
      */
-    @AfterClass
-    public static void julClassCleanup() {
-        LttngToolsHelper.deleteAllTraces();
+    @AfterAll
+    public static void log4jClassCleanup() {
+        Log4jTestUtils.testClassCleanup();
     }
 
     /**
@@ -70,7 +65,7 @@ public class Log4jAppContextIT extends AppContextITBase {
      * @throws SecurityException
      * @throws IOException
      */
-    @Before
+    @BeforeEach
     public void julSetup() throws SecurityException, IOException {
         logger = Logger.getLogger(EVENT_NAME);
         logger.setLevel(Level.ALL);
@@ -82,7 +77,7 @@ public class Log4jAppContextIT extends AppContextITBase {
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void julTeardown() {
         logger.removeAppender((Appender) logHandler);
         logger = null;
@@ -93,6 +88,12 @@ public class Log4jAppContextIT extends AppContextITBase {
         return DOMAIN;
     }
 
+    @Override
+    protected boolean closeHandlers()
+    {
+        return true;
+    }
+
     @Override
     protected void sendEventsToLoggers() {
         Log4jTestUtils.send10Events(logger);