Remove junit.fdramework usage

5 files changed, 60 insertions, 43 deletions

diff --git a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
index 90e7d78acaf..b07363d7df2 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
@@ -3,15 +3,20 @@ package com.yahoo.fs4.test;
 
 import java.nio.ByteBuffer;
 
-import junit.framework.TestCase;
-
 import com.yahoo.fs4.HexByteIterator;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test of HexByteIterator
+ *
  * @author tonytv
  */
-public class HexByteIteratorTestCase extends TestCase {
+public class HexByteIteratorTestCase {
+
+    @Test
     public void testHexByteIterator() {
         int[] numbers = { 0x00, 0x01, 0xDE, 0xAD, 0xBE, 0xEF, 0xFF };
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
index dc052be727f..d2bdf2327ff 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
-import static junit.framework.TestCase.*;
+import static org.junit.Assert.*;
 
 
 /**
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
index 05e5997c8fb..bc086517264 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
@@ -6,19 +6,16 @@ import java.nio.charset.StandardCharsets;
 
 import com.yahoo.fs4.*;
 import com.yahoo.search.Query;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.TestCase.*;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.*;
 
 /**
  * Tests the Packet class.  Specifically made this unit test suite
  * for checking that queries that are too large for the buffer
  * are handled gracefully.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author Bjorn Borud
  */
 public class PacketTestCase {
 
@@ -222,4 +219,5 @@ public class PacketTestCase {
         buffer.flip();
         new MyBasicPacket().decode(buffer);
     }
+
 }
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
index a5712f625e1..edf117b1195 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
@@ -6,25 +6,28 @@ import com.yahoo.fs4.BasicPacket;
 import com.yahoo.fs4.DocumentInfo;
 import com.yahoo.fs4.PacketDecoder;
 import com.yahoo.fs4.QueryResultPacket;
+import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests encoding of query packages
  *
  * @author bratseth
  */
-public class QueryResultTestCase extends junit.framework.TestCase {
+public class QueryResultTestCase {
 
-    public QueryResultTestCase(String name) {
-        super(name);
-    }
+    private static final double delta = 0.00000001;
 
     private static GlobalId gid1 = new GlobalId(new byte[] {1,1,1,1,1,1,1,1,1,1,1,1});
     private static GlobalId gid2 = new GlobalId(new byte[] {2,2,2,2,2,2,2,2,2,2,2,2});
 
+    @Test
     public void testDecodeQueryResultX() {
-         byte[] packetData=new byte[] {
+         byte[] packetData = new byte[] {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
@@ -41,38 +44,39 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
                  2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37
          };
-        ByteBuffer buffer=ByteBuffer.allocate(200);
+        ByteBuffer buffer = ByteBuffer.allocate(200);
         buffer.put(packetData);
         buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
+        BasicPacket packet = PacketDecoder.decode(buffer);
         assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
+        QueryResultPacket result = (QueryResultPacket)packet;
 
         assertTrue(result.getMldFeature());
 
-        assertEquals(5,result.getTotalDocumentCount());
-        assertEquals(25,result.getMaxRank());
-        assertEquals(111,result.getDocstamp());
+        assertEquals(5, result.getTotalDocumentCount());
+        assertEquals(25, result.getMaxRank());
+        assertEquals(111, result.getDocstamp());
         assertEquals(89, result.getCoverageDocs());
         assertEquals(90, result.getActiveDocs());
         assertEquals(91, result.getSoonActiveDocs());
         assertEquals(1, result.getDegradedReason());
 
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        assertEquals(23.0,document1.getMetric());
-        assertEquals(7,document1.getPartId());
-        assertEquals(36,document1.getDistributionKey());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
-        assertEquals(21.0,document2.getMetric());
-        assertEquals(8,document2.getPartId());
-        assertEquals(37,document2.getDistributionKey());
+        assertEquals(2, result.getDocuments().size());
+        DocumentInfo document1 = result.getDocuments().get(0);
+        assertEquals(gid1, document1.getGlobalId());
+        assertEquals(23.0, document1.getMetric(), delta);
+        assertEquals(7, document1.getPartId());
+        assertEquals(36, document1.getDistributionKey());
+        DocumentInfo document2 = result.getDocuments().get(1);
+        assertEquals(gid2, document2.getGlobalId());
+        assertEquals(21.0, document2.getMetric(), delta);
+        assertEquals(8, document2.getPartId());
+        assertEquals(37, document2.getDistributionKey());
     }
 
+    @Test
     public void testDecodeQueryResultMoreHits() {
-         byte[] packetData=new byte[] {
+         byte[] packetData = new byte[] {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
@@ -90,19 +94,20 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
                  2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37
          };
-        ByteBuffer buffer=ByteBuffer.allocate(200);
+        ByteBuffer buffer = ByteBuffer.allocate(200);
         buffer.put(packetData);
         buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
+        BasicPacket packet = PacketDecoder.decode(buffer);
         assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
+        QueryResultPacket result = (QueryResultPacket)packet;
 
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
+        assertEquals(2, result.getDocuments().size());
+        DocumentInfo document1 = result.getDocuments().get(0);
+        assertEquals(gid1, document1.getGlobalId());
+        DocumentInfo document2 = result.getDocuments().get(1);
+        assertEquals(gid2, document2.getGlobalId());
         assertEquals(6, result.getNodesQueried());
         assertEquals(5, result.getNodesReplied());
     }
+
 }
diff --git a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
index 67f3586ac38..30e87a17704 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
@@ -1,17 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.cache.test;
 
-import junit.framework.TestCase;
-
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.statistics.Statistics;
 import com.yahoo.prelude.cache.Cache;
 import com.yahoo.prelude.cache.QueryCacheKey;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class CacheTestCase extends TestCase {
+public class CacheTestCase {
 
     private Result getSomeResult(Query q, String id) {
         Result r = new Result(q);
@@ -19,6 +20,7 @@ public class CacheTestCase extends TestCase {
         return r;
     }
 
+    @Test
     public void testBasicGet() {
         Cache<QueryCacheKey, Result> cache=new Cache<>(100*1024,3600, 100000, Statistics.nullImplementation);
         Query q = new Query("/std_xmls_a00?hits=5&offset=5&query=flowers+shop&tracelevel=4&objid=ffffffffffffffff");
@@ -37,6 +39,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get(qk), r2);
     }
 
+    @Test
     public void testPutTooLarge() {
         byte[] tenKB = new byte[10*1024];
         for (int i = 0 ; i <10*1024 ; i++) {
@@ -52,6 +55,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("foo"), sevenKB);
     }
 
+    @Test
     public void testInvalidate() {
         byte[] tenKB = new byte[10*1024];
         for (int i = 0 ; i <10*1024 ; i++) {
@@ -68,6 +72,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("bar"), tenKB);
     }
 
+    @Test
     public void testInvalidateLRU() {
         Cache cache=new Cache(10*1024,3600, 100*1024, Statistics.nullImplementation); // 10 MB
         byte[] fiveKB = new byte[5*1024];
@@ -103,6 +108,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("four"), fourKB);
     }
 
+    @Test
     public void testPutSameKey() {
         Cache cache=new Cache(10*1024,3600, 100*1024, Statistics.nullImplementation); // 10 MB
         byte[] fiveKB = new byte[5*1024];
@@ -128,6 +134,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("two"), twoKB);
     }
 
+    @Test
     public void testExpire() throws InterruptedException {
         Cache cache=new Cache(10*1024,50, 10000, Statistics.nullImplementation); // 10 KB, 50ms expire
         boolean success = false;
@@ -151,6 +158,7 @@ public class CacheTestCase extends TestCase {
         assertNull(cache.get("hey"));
     }
 
+    @Test
     public void testInsertSame() {
         Cache cache=new Cache(100*1024,500, 100000, Statistics.nullImplementation); // 100 KB, .5 sec expire
         Query q =  new Query("/std_xmls_a00?hits=5&offset=5&query=flowers+shop&tracelevel=4&objid=ffffffffffffffff");
@@ -164,6 +172,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(1, cache.size());
     }
 
+    @Test
     public void testMaxSize() {
         Cache cache=new Cache(20*1024,500, 3*1024, Statistics.nullImplementation);
         byte[] fourKB = new byte[4*1024];