1 files changed, 14 insertions, 13 deletions

diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/StdOutVisitorHandlerTest.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/StdOutVisitorHandlerTest.java
index 854d7ae9ad3..f109b0ad56b 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/StdOutVisitorHandlerTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/StdOutVisitorHandlerTest.java
@@ -2,33 +2,32 @@
 package com.yahoo.vespavisit;
 
 import com.yahoo.documentapi.VisitorDataHandler;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bjorncs
  */
-@RunWith(Parameterized.class)
 public class StdOutVisitorHandlerTest {
-    private final boolean jsonOutput;
+    private boolean jsonOutput;
 
-    public StdOutVisitorHandlerTest(boolean jsonOutput) {
+    public void initStdOutVisitorHandlerTest(boolean jsonOutput) {
         this.jsonOutput = jsonOutput;
     }
 
-    @Parameterized.Parameters(name = "jsonOutput={0}")
     public static Object[] data() {
-        return new Object[] { true, false};
+        return new Object[]{true, false};
     }
 
-    @Test
-    public void printing_ids_for_zero_documents_produces_empty_output() {
+    @MethodSource("data")
+    @ParameterizedTest(name = "jsonOutput={0}")
+    void printing_ids_for_zero_documents_produces_empty_output(boolean jsonOutput) {
+        initStdOutVisitorHandlerTest(jsonOutput);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         StdOutVisitorHandler visitorHandler =
                 new StdOutVisitorHandler(/*printIds*/true, false, false, false, false, false, 0, jsonOutput, new PrintStream(out, true));
@@ -38,8 +37,10 @@ public class StdOutVisitorHandlerTest {
         assertEquals("", output.trim());
     }
 
-    @Test
-    public void printing_zero_documents_produces_empty_output() {
+    @MethodSource("data")
+    @ParameterizedTest(name = "jsonOutput={0}")
+    void printing_zero_documents_produces_empty_output(boolean jsonOutput) {
+        initStdOutVisitorHandlerTest(jsonOutput);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         StdOutVisitorHandler visitorHandler =
                 new StdOutVisitorHandler(/*printIds*/false, false, false, false, false, false, 0, jsonOutput, new PrintStream(out, true));