Remove usage of junit.framework

5 files changed, 45 insertions, 8 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java
index 6dec91382b6..11d163373ac 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java
@@ -8,12 +8,16 @@ import com.yahoo.prelude.templates.test.TilingTestCase;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.result.Hit;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author bratseth
  */
-public class ArrayOutputTestCase extends junit.framework.TestCase {
+public class ArrayOutputTestCase {
 
+    @Test
     public void testArrayOutput() throws IOException {
         Result r=new Result(new Query("?query=ignored"));
         Hit hit=new Hit("test");
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
index 8ac18c119d8..68399e6bfc4 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
@@ -4,18 +4,24 @@ package com.yahoo.search.result.test;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.result.Coverage;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
-public class CoverageTestCase extends junit.framework.TestCase {
+public class CoverageTestCase {
 
+    @Test
     public void testZeroCoverage() {
         Coverage c = new Coverage(0L, 0, false, 0);
         assertEquals(0, c.getResultPercentage());
         assertEquals(0, c.getResultSets());
     }
 
+    @Test
     public void testActiveCoverage() {
         Coverage c = new Coverage(6, 5);
         assertEquals(5, c.getActive());
@@ -27,6 +33,7 @@ public class CoverageTestCase extends junit.framework.TestCase {
         assertEquals(13, c.getDocs());
     }
 
+    @Test
     public void testDefaultCoverage() {
         boolean create=true;
 
@@ -38,6 +45,7 @@ public class CoverageTestCase extends junit.framework.TestCase {
         assertEquals(0,r1.getCoverage(create).getResultSets());
     }
 
+    @Test
     public void testDefaultSearchScenario() {
         boolean create=true;
 
@@ -48,6 +56,7 @@ public class CoverageTestCase extends junit.framework.TestCase {
         assertEquals(0,federationSearcherResult.getCoverage(create).getResultSets());
     }
 
+    @Test
     public void testRequestingCoverageSearchScenario() {
         boolean create=true;
 
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java
index 7d18c64a531..a46b15b525c 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java
@@ -7,14 +7,21 @@ import java.util.NoSuchElementException;
 import com.yahoo.search.result.DeepHitIterator;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Ensure that the {@link DeepHitIterator} works as intended.
  *
- * @author  havardpe
+ * @author havardpe
  */
-public class DeepHitIteratorTestCase extends junit.framework.TestCase {
+public class DeepHitIteratorTestCase {
 
+    @Test
     public void testEmpty() {
         HitGroup hits = new HitGroup();
         Iterator<Hit> it = hits.deepIterator();
@@ -27,6 +34,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testRemove() {
         HitGroup hits = new HitGroup();
         hits.add(new Hit("foo"));
@@ -53,6 +61,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         assertFalse(it.hasNext());
     }
 
+    @Test
     public void testShallow() {
         HitGroup hits = new HitGroup();
         hits.add(new Hit("foo"));
@@ -69,6 +78,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         assertFalse(it.hasNext());
     }
 
+    @Test
     public void testDeep() {
         HitGroup grandParent = new HitGroup();
         grandParent.add(new Hit("a"));
@@ -103,6 +113,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         assertFalse(it.hasNext());
     }
 
+    @Test
     public void testFirstHitIsGroup() {
         HitGroup root = new HitGroup();
         HitGroup group = new HitGroup();
@@ -118,6 +129,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         assertFalse(it.hasNext());
     }
 
+    @Test
     public void testSecondHitIsGroup() {
         HitGroup root = new HitGroup();
         root.add(new Hit("foo"));
@@ -133,6 +145,7 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
         assertFalse(it.hasNext());
     }
 
+    @Test
     public void testOrder() {
         HitGroup root = new HitGroup();
         MyHitGroup group = new MyHitGroup();
@@ -169,4 +182,5 @@ public class DeepHitIteratorTestCase extends junit.framework.TestCase {
             return super.unorderedIterator();
         }
     }
+
 }
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java
index 29199cf3ef9..14e127ec72c 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java
@@ -4,16 +4,19 @@ package com.yahoo.search.result.test;
 import com.yahoo.prelude.templates.SearchRendererAdaptor;
 import com.yahoo.search.result.DefaultErrorHit;
 import com.yahoo.search.result.ErrorMessage;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.io.StringWriter;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author bratseth
  */
-public class DefaultErrorHitTestCase extends junit.framework.TestCase {
+public class DefaultErrorHitTestCase {
 
-    @SuppressWarnings("null")
+    @Test
     public void testErrorHitRenderingWithException() throws IOException {
         NullPointerException cause=null;
         try {
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
index 4a0e8a0a88c..01383ba29f2 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
@@ -3,12 +3,17 @@ package com.yahoo.search.result.test;
 
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author bratseth
  */
-public class FillingTestCase extends junit.framework.TestCase {
+public class FillingTestCase {
 
+    @Test
     public void testFillingAPIConsistency() {
         HitGroup group=new HitGroup();
         group.add(new Hit("hit:1"));
@@ -16,6 +21,7 @@ public class FillingTestCase extends junit.framework.TestCase {
         assertTrue(group.isFilled("summary"));
     }
 
+    @Test
     public void testFillingAPIConsistencyTwoPhase() {
         HitGroup group=new HitGroup();
         group.add(createNonFilled("hit:1"));
@@ -26,6 +32,7 @@ public class FillingTestCase extends junit.framework.TestCase {
         assertTrue(group.isFilled("summary"));  // consistent again
     }
 
+    @Test
     public void testFillingAPIConsistencyThreePhase() {
         HitGroup group=new HitGroup();
         group.add(createNonFilled("hit:1"));