X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-log4j2%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FLog4j2AppContextIT.java;fp=lttng-ust-java-tests-log4j2%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FLog4j2AppContextIT.java;h=7a00b4b2fe91eec78cb596f6076ec3164bc40d55;hb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;hp=f285b8956d0272e758bed6f7d3e82c3c65b357c7;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/Log4j2AppContextIT.java b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
index f285b89..7a00b4b 100644
--- a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
+++ b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
@@ -21,11 +21,10 @@ package org.lttng.ust.agent.integration.context;
 import java.io.IOException;
 
 import org.apache.logging.log4j.core.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.lttng.tools.ILttngSession.Domain;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.utils.Log4j2TestContext;
@@ -44,7 +43,7 @@ public class Log4j2AppContextIT extends AppContextITBase {
     /**
      * Class setup
      */
-    @BeforeClass
+    @BeforeAll
     public static void log4j2ClassSetup() {
         Log4j2TestUtils.testClassSetup();
     }
@@ -52,7 +51,7 @@ public class Log4j2AppContextIT extends AppContextITBase {
     /**
      * Class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void log4j2ClassCleanup() {
         Log4j2TestUtils.testClassCleanup();
     }
@@ -63,7 +62,8 @@ public class Log4j2AppContextIT extends AppContextITBase {
      * @throws SecurityException
      * @throws IOException
      */
-    @Before
+    @SuppressWarnings("resource")
+    @BeforeEach
     public void log4j2Setup() throws SecurityException, IOException {
         testContext = new Log4j2TestContext("log4j2.Log4j2AppContextIT.xml");
 
@@ -77,7 +77,7 @@ public class Log4j2AppContextIT extends AppContextITBase {
     /**
      * Test teardown
      */
-    @After
+    @AfterEach
     public void log4j2Teardown() {
         testContext.afterTest();
         logger = null;