Migrate to Junit 5 Jupiter

[lttng-ust-java-tests.git] / lttng-ust-java-tests-jul / src / test / java / org / lttng / ust / agent / benchmarks / jul / handler / lttng / old / OldLttngJulHandlerTracingEnabledBenchmark.java

diff --git a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/benchmarks/jul/handler/lttng/old/OldLttngJulHandlerTracingEnabledBenchmark.java b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/benchmarks/jul/handler/lttng/old/OldLttngJulHandlerTracingEnabledBenchmark.java
index a36578be8ebfca40963011c6292f8d2885de38c4..a9985c4f3ef36d440879b6cb6401736ab4b8779e 100644 (file)
--- a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/benchmarks/jul/handler/lttng/old/OldLttngJulHandlerTracingEnabledBenchmark.java
+++ b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/benchmarks/jul/handler/lttng/old/OldLttngJulHandlerTracingEnabledBenchmark.java
@@ -18,13 +18,13 @@
 
 package org.lttng.ust.agent.benchmarks.jul.handler.lttng.old;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Field;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.lttng.tools.ILttngSession;
 import org.lttng.tools.ILttngSession.Domain;
 import org.lttng.ust.agent.LTTngAgent;
@@ -39,15 +39,16 @@ import org.lttng.ust.agent.jul.LttngLogHandler;
 public class OldLttngJulHandlerTracingEnabledBenchmark extends JulHandlerBenchmarkBase {
 
     private ILttngSession session;
+    private LTTngAgent agent;
     private LttngLogHandler agentHandler;
 
 
     /**
      * Test setup
      */
-    @Before
+    @BeforeEach
     public void testSetup() {
-        LTTngAgent agentInstance = LTTngAgent.getLTTngAgent();
+        agent = LTTngAgent.getLTTngAgent();
 
         /*
          * The "old API" works by attaching a handler managed by the agent to
@@ -61,12 +62,12 @@ public class OldLttngJulHandlerTracingEnabledBenchmark extends JulHandlerBenchma
         try {
             Field julHandlerField = LTTngAgent.class.getDeclaredField("julHandler");
             julHandlerField.setAccessible(true);
-            agentHandler = (LttngLogHandler) julHandlerField.get(agentInstance);
+            agentHandler = (LttngLogHandler) julHandlerField.get(agent);
 
             logger.addHandler(agentHandler);
 
         } catch (ReflectiveOperationException e) {
-            fail();
+            fail(e.getMessage());
         }
 
         session = ILttngSession.createSession(null, Domain.JUL);
@@ -77,12 +78,12 @@ public class OldLttngJulHandlerTracingEnabledBenchmark extends JulHandlerBenchma
     /**
      * Test cleanup
      */
-    @After
+    @AfterEach
     public void testTeardown() {
         assertTrue(session.stop());
         session.close();
 
         logger.removeHandler(agentHandler);
-        LTTngAgent.dispose();
+        agent.dispose();
     }
 }