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 / 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 dc654b0df696010334a85ac306d608b9e98621b6..3b0943fbaa59b1d7f5993856e467346427f49671 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
@@ -23,10 +23,11 @@ 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.ust.agent.log4j.LttngLogAppender;
 import org.lttng.ust.agent.utils.Log4jTestUtils;
@@ -34,6 +35,8 @@ import org.lttng.ust.agent.utils.Log4jTestUtils;
 /**
  * Log4j tests for multiple concurrent tracing sessions
  */
+@Tag("agent:log4j")
+@Tag("domain:log4j")
 public class Log4jMultiSessionIT extends MultiSessionITBase {
 
     private static final Domain DOMAIN = Domain.LOG4J;
@@ -46,7 +49,7 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void log4jClassSetup() {
         Log4jTestUtils.testClassSetup();
     }
@@ -54,7 +57,7 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
     /**
      * Class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void log4jClassCleanup() {
         Log4jTestUtils.testClassCleanup();
     }
@@ -65,7 +68,7 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
         * @throws SecurityException
         * @throws IOException
         */
-    @Before
+    @BeforeEach
     public void log4jSetup() throws SecurityException, IOException {
         // TODO Wipe all existing LTTng sessions?
 
@@ -93,7 +96,7 @@ public class Log4jMultiSessionIT extends MultiSessionITBase {
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void log4jTeardown() {
         loggerA.removeAppender((Appender) handlerA);
         loggerB.removeAppender((Appender) handlerB);