Merge pull request #23555 from vespa-engine/bjorncs/more-junit5v8.26.15

Bjorncs/more junit5

1 files changed, 11 insertions, 8 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/EventLogTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/EventLogTest.java
index afbc50124e2..eee0cb41eeb 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/EventLogTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/EventLogTest.java
@@ -3,19 +3,22 @@ package com.yahoo.vespa.clustercontroller.core;
 
 import com.yahoo.vdslib.state.Node;
 import com.yahoo.vdslib.state.NodeType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import java.util.logging.Level;
 
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class EventLogTest {
     private final MetricUpdater metricUpdater = mock(MetricUpdater.class);
     private final NodeEvent nodeEvent = mock(NodeEvent.class);
@@ -33,7 +36,7 @@ public class EventLogTest {
     }
 
     @Test
-    public void testMetric() {
+    void testMetric() {
         initialize(metricUpdater);
 
         eventLog.addNodeOnlyEvent(nodeEvent, Level.INFO);
@@ -43,7 +46,7 @@ public class EventLogTest {
     }
 
     @Test
-    public void testNullMetricReporter() {
+    void testNullMetricReporter() {
         initialize(null);
 
         eventLog.addNodeOnlyEvent(nodeEvent, Level.INFO);
@@ -52,7 +55,7 @@ public class EventLogTest {
     }
 
     @Test
-    public void testNoEventsDoNotThrowException() {
+    void testNoEventsDoNotThrowException() {
         initialize(metricUpdater);
         StringBuilder builder = new StringBuilder();
         Node nonExistantNode = new Node(NodeType.DISTRIBUTOR, 0);