X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust-java-tests-jul%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FJulAppContextOrderingIT.java;h=69a1e7ef80ff978c4a81525dda6ed35aaef14faa;hb=HEAD;hp=1cef0d40e104497e9a364be340bd62583c8ef8ca;hpb=73fb67850f841baaa164b86a2e739917da4247e2;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
index 1cef0d4..69a1e7e 100644
--- a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
+++ b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
@@ -18,25 +18,26 @@
 
 package org.lttng.ust.agent.integration.context;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.junit.After;
-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.Tag;
 import org.lttng.tools.ILttngSession.Domain;
-import org.lttng.tools.LttngToolsHelper;
 import org.lttng.ust.agent.jul.LttngLogHandler;
 import org.lttng.ust.agent.utils.JulTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
 
 /**
  * Implementation of {@link AppContextOrderingITBase} for the JUL API.
  */
+@Tag("agent:jul")
+@Tag("domain:jul")
 public class JulAppContextOrderingIT extends AppContextOrderingITBase {
 
     private Logger logger;
@@ -44,19 +45,23 @@ public class JulAppContextOrderingIT extends AppContextOrderingITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void julClassSetup() {
-        /* Skip tests if we can't find the JNI library or lttng-tools */
-        assumeTrue(JulTestUtils.checkForJulLibrary());
-        assumeTrue(LttngUtils.checkForLttngTools(Domain.JUL));
+        JulTestUtils.testClassSetup();
+    }
 
-        LttngToolsHelper.destroyAllSessions();
+    /**
+     * Class cleanup
+     */
+    @AfterAll
+    public static void julClassCleanup() {
+        JulTestUtils.testClassCleanup();
     }
 
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void julTeardown() {
         logger.removeHandler((Handler) logHandler);
         logger = null;
@@ -78,7 +83,7 @@ public class JulAppContextOrderingIT extends AppContextOrderingITBase {
         try {
             logHandler = new LttngLogHandler();
         } catch (SecurityException | IOException e) {
-            fail();
+            fail(e.getMessage());
         }
         logger.addHandler((Handler) logHandler);
     }