X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-log4j2%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FLog4j2AppContextOrderingIT.java;h=a015f13ec05990b2ec1120b4c1e1047f7ad9fa5c;hb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;hp=9189f82a2fb4f3203a6424b04329c851ec6076dc;hpb=7bd5724a34cb45dabe914c1ee2ec83964ce1d455;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextOrderingIT.java b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextOrderingIT.java
index 9189f82..a015f13 100644
--- a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextOrderingIT.java
+++ b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextOrderingIT.java
@@ -20,9 +20,9 @@ package org.lttng.ust.agent.integration.context;
 
 
 import org.apache.logging.log4j.core.Logger;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.lttng.tools.ILttngSession.Domain;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.utils.Log4j2TestContext;
@@ -39,7 +39,7 @@ public class Log4j2AppContextOrderingIT extends AppContextOrderingITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void log4j2ClassSetup() {
         Log4j2TestUtils.testClassSetup();
     }
@@ -47,7 +47,7 @@ public class Log4j2AppContextOrderingIT extends AppContextOrderingITBase {
     /**
      * Class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void log4j2ClassCleanup() {
         Log4j2TestUtils.testClassCleanup();
     }
@@ -55,7 +55,7 @@ public class Log4j2AppContextOrderingIT extends AppContextOrderingITBase {
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void log4j2Teardown() {
         logger = null;
         logHandler = null;
@@ -68,6 +68,7 @@ public class Log4j2AppContextOrderingIT extends AppContextOrderingITBase {
         return Domain.LOG4J;
     }
 
+    @SuppressWarnings("resource")
     @Override
     protected void registerAgent() {
         testContext = new Log4j2TestContext("log4j2.Log4j2AppContextOrderingIT.xml");