Use new junit API

2 files changed, 10 insertions, 8 deletions

diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/BenchmarkProgressPrinterTest.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/BenchmarkProgressPrinterTest.java
index b02d012f5bb..69372e5b1f7 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/BenchmarkProgressPrinterTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/BenchmarkProgressPrinterTest.java
@@ -6,14 +6,14 @@ import com.yahoo.concurrent.Timer;
 import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage;
 import com.yahoo.messagebus.EmptyReply;
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-/**
- */
-public class BenchmarkProgressPrinterTest extends TestCase {
+import static org.junit.Assert.assertTrue;
+
+public class BenchmarkProgressPrinterTest {
 
     class DummyTimer implements Timer {
         long ms;
@@ -21,6 +21,7 @@ public class BenchmarkProgressPrinterTest extends TestCase {
         public long milliTime() { return ms; }
     }
 
+    @Test
     public void testSimple() {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         DummyTimer timer = new DummyTimer();
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/ProgressPrinterTest.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/ProgressPrinterTest.java
index 26d2ff77a0f..29154b0892a 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/ProgressPrinterTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/ProgressPrinterTest.java
@@ -7,14 +7,14 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentIgnoredReply;
 import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage;
 import com.yahoo.messagebus.EmptyReply;
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-/**
- */
-public class ProgressPrinterTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+
+public class ProgressPrinterTest {
 
     class DummyTimer implements Timer {
         long ms;
@@ -22,6 +22,7 @@ public class ProgressPrinterTest extends TestCase {
         public long milliTime() { return ms; }
     }
 
+    @Test
     public void testSimple() {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         DummyTimer timer = new DummyTimer();