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

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

diff --git a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulLoggerHierarchyListIT.java b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulLoggerHierarchyListIT.java
index 4254aafec7ef95b85ff6b8899aa6147afb9ebcff..9769798e44a0a70e9977e8bde99eeed780fe19cc 100644 (file)
--- a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulLoggerHierarchyListIT.java
+++ b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulLoggerHierarchyListIT.java
@@ -23,11 +23,11 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+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.jul.LttngLogHandler;
 import org.lttng.ust.agent.utils.JulTestUtils;
@@ -37,7 +37,8 @@ import org.lttng.ust.agent.utils.JulTestUtils;
  *
  * @author Alexandre Montplaisir
  */
-@RunWith(Parameterized.class)
+@Tag("agent:jul")
+@Tag("domain:jul")
 public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
 
     private Logger parentLogger;
@@ -46,29 +47,6 @@ public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
     private Handler parentHandler;
     private Handler childHandler;
 
-    /**
-     * Test constructor
-     *
-     * @param parentLoggerActive
-     *            Parent logger has been instantiated
-     * @param parentLoggerHasHandler
-     *            Parent logger has a LTTng handler attached to it
-     * @param childLoggerActive
-     *            Child logger has been instantiated
-     * @param childLoggerHasHandler
-     *            Child logger has a LTTng handler attached to it
-     */
-    public JulLoggerHierarchyListIT(boolean parentLoggerActive,
-            boolean parentLoggerHasHandler,
-            boolean childLoggerActive,
-            boolean childLoggerHasHandler) {
-        /* Set by parameters defined in the base class */
-        super(parentLoggerActive,
-                parentLoggerHasHandler,
-                childLoggerActive,
-                childLoggerHasHandler);
-    }
-
     // ------------------------------------------------------------------------
     // Maintenance
     // ------------------------------------------------------------------------
@@ -76,7 +54,7 @@ public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void julClassSetup() {
         JulTestUtils.testClassSetup();
     }
@@ -84,15 +62,31 @@ public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
     /**
      * Class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void julClassCleanup() {
         JulTestUtils.testClassCleanup();
     }
 
     /**
-     *
+     * Test setup
+     */
+    @SuppressWarnings("static-method")
+    @BeforeEach
+    public void setup() {
+        /*
+         * Kind of hackish, but it's the only way to ensure that loggers are
+         * really removed in-between tests, since LogManager does not provide a
+         * way to forcibly remove a logger, and it doesn't seem like it will any
+         * time soon, see http://bugs.java.com/view_bug.do?bug_id=4811930
+         */
+        LogManager.getLogManager().reset();
+        System.gc();
+    }
+
+    /**
+     * Test cleanup
      */
-    @After
+    @AfterEach
     public void cleanup() {
         if (parentLogger != null) {
             if (parentHandler != null) {
@@ -112,12 +106,6 @@ public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
             childLogger = null;
         }
 
-        /*
-         * Kind of hackish, but it's the only way to ensure that loggers are
-         * really removed in-between tests, since LogManager does not provide a
-         * way to forcibly remove a logger, and it doesn't seem like it will any
-         * time soon, see http://bugs.java.com/view_bug.do?bug_id=4811930
-         */
         LogManager.getLogManager().reset();
         System.gc();
     }
@@ -132,7 +120,10 @@ public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
     }
 
     @Override
-    protected void activateLoggers() throws IOException {
+    protected void activateLoggers(boolean parentLoggerActive,
+            boolean parentLoggerHasHandler,
+            boolean childLoggerActive,
+            boolean childLoggerHasHandler) throws IOException {
         if (parentLoggerActive) {
             parentLogger = Logger.getLogger(PARENT_LOGGER);
             if (parentLoggerHasHandler) {