X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-common%2Fsrc%2Fmain%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FAppContextOrderingITBase.java;h=2ced54606d1449de23999c7354d97947f3fbd63c;hb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;hp=d567c18b986c13e0db5c78f9f0b51ee3875a748f;hpb=7bd5724a34cb45dabe914c1ee2ec83964ce1d455;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/context/AppContextOrderingITBase.java b/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/context/AppContextOrderingITBase.java
index d567c18..2ced546 100644
--- a/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/context/AppContextOrderingITBase.java
+++ b/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/context/AppContextOrderingITBase.java
@@ -18,26 +18,26 @@
 
 package org.lttng.ust.agent.integration.context;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.lttng.tools.ILttngSession;
 import org.lttng.tools.LttngToolsHelper;
 import org.lttng.tools.ILttngSession.Domain;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.context.ContextInfoManager;
 import org.lttng.ust.agent.context.IContextInfoRetriever;
-import org.lttng.ust.agent.utils.TestPrintRunner;
+import org.lttng.ust.agent.utils.TestPrintExtension;
 
 /**
  * To obtain application contexts in a trace, three steps are required:
@@ -51,7 +51,7 @@ import org.lttng.ust.agent.utils.TestPrintRunner;
  * These three steps however can occur in any order ; this means there are 6
  * possible cases. The goal of this class is to test all these cases.
  */
-@RunWith(TestPrintRunner.class)
+@ExtendWith(TestPrintExtension.class)
 public abstract class AppContextOrderingITBase {
 
     protected static final String EVENT_NAME = "EventName";
@@ -72,7 +72,7 @@ public abstract class AppContextOrderingITBase {
     /**
      * Base test setup
      */
-    @Before
+    @BeforeEach
     public void testSetup() {
         try {
             cim = ContextInfoManager.getInstance();
@@ -86,7 +86,7 @@ public abstract class AppContextOrderingITBase {
     /**
      * Base test cleanup
      */
-    @After
+    @AfterEach
     public void testCleanup() {
         session.close();
         assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME));
@@ -95,7 +95,7 @@ public abstract class AppContextOrderingITBase {
     /**
      * Base class cleanup
      */
-    @AfterClass
+    @AfterAll
     public static void julClassCleanup() {
         LttngToolsHelper.deleteAllTraces();
     }