X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust-java-tests-jul%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fevents%2FJulMultiSessionIT.java;h=d377b158bc4c4fee23acc413d14a9536f1ca7286;hb=HEAD;hp=0c860bbd8ace4f2e9e48b8588235d4194345c2a4;hpb=eca27046b6f32c55dc7ceccb0821431c9be9f3af;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulMultiSessionIT.java b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulMultiSessionIT.java
index 0c860bb..d377b15 100644
--- a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulMultiSessionIT.java
+++ b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/events/JulMultiSessionIT.java
@@ -23,10 +23,11 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.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.jul.LttngLogHandler;
 import org.lttng.ust.agent.utils.JulTestUtils;
@@ -34,6 +35,8 @@ import org.lttng.ust.agent.utils.JulTestUtils;
 /**
  * JUL tests for multiple concurrent tracing sessions
  */
+@Tag("agent:jul")
+@Tag("domain:jul")
 public class JulMultiSessionIT extends MultiSessionITBase {
 
     private static final Domain DOMAIN = Domain.JUL;
@@ -46,7 +49,7 @@ public class JulMultiSessionIT extends MultiSessionITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void julClassSetup() {
         JulTestUtils.testClassSetup();
     }
@@ -54,7 +57,7 @@ public class JulMultiSessionIT extends MultiSessionITBase {
     /**
      * Class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void julClassCleanup() {
         JulTestUtils.testClassCleanup();
     }
@@ -65,7 +68,7 @@ public class JulMultiSessionIT extends MultiSessionITBase {
      * @throws SecurityException
      * @throws IOException
      */
-    @Before
+    @BeforeEach
     public void julSetup() throws SecurityException, IOException {
         loggerA = Logger.getLogger(EVENT_NAME_A);
         loggerB = Logger.getLogger(EVENT_NAME_B);
@@ -91,7 +94,7 @@ public class JulMultiSessionIT extends MultiSessionITBase {
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void julTeardown() {
         loggerA.removeHandler((Handler) handlerA);
         loggerB.removeHandler((Handler) handlerB);
@@ -109,6 +112,12 @@ public class JulMultiSessionIT extends MultiSessionITBase {
         return DOMAIN;
     }
 
+    @Override
+    protected boolean closeHandlers()
+    {
+        return true;
+    }
+
     @Override
     protected void sendEventsToLoggers() {
         JulTestUtils.send10EventsTo(loggerA);