Convert container-search to junit5

8 files changed, 138 insertions, 147 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java
index 66fdbdcb267..9889c479b84 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java
@@ -2,13 +2,13 @@
 package com.yahoo.search.querytransform;
 
 import com.yahoo.prelude.query.PredicateQueryItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigInteger;
 import java.util.Iterator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author magnarn
@@ -16,7 +16,7 @@ import static org.junit.Assert.fail;
 public class BooleanAttributeParserTest {
 
     @Test
-    public void requireThatParseHandlesAllFormats() {
+    void requireThatParseHandlesAllFormats() {
         assertParse(null, 0);
         assertParse("{}", 0);
         assertParse("{foo:bar}", 1);
@@ -37,7 +37,7 @@ public class BooleanAttributeParserTest {
     }
 
     @Test
-    public void requireThatIllegalStringsFail() {
+    void requireThatIllegalStringsFail() {
         assertException("{foo:[bar:[baz]}");
         assertException("{foo:[bar:baz}");
         assertException("{foo:bar:[0,1,2}");
@@ -60,7 +60,7 @@ public class BooleanAttributeParserTest {
     }
 
     @Test
-    public void requireThatTermsCanHaveBitmaps() {
+    void requireThatTermsCanHaveBitmaps() {
         PredicateQueryItem q = assertParse("{foo:bar:0x1}", 1);
         PredicateQueryItem.Entry[] features = new PredicateQueryItem.Entry[q.getFeatures().size()];
         q.getFeatures().toArray(features);
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java
index 599b0ca4443..247c96f0676 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java
@@ -8,12 +8,12 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test BooleanSearcher
@@ -27,13 +27,13 @@ public class BooleanSearcherTestCase {
                 Execution.Context.createContextStub());
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         exec = buildExec();
     }
 
     @Test
-    public void requireThatAttributeMapToSingleFeature() {
+    void requireThatAttributeMapToSingleFeature() {
         PredicateQueryItem item = buildPredicateQueryItem("{gender:female}", null);
         assertEquals(1, item.getFeatures().size());
         assertEquals(0, item.getRangeFeatures().size());
@@ -43,7 +43,7 @@ public class BooleanSearcherTestCase {
     }
 
     @Test
-    public void requireThatAttributeListMapToMultipleFeatures() {
+    void requireThatAttributeListMapToMultipleFeatures() {
         PredicateQueryItem item = buildPredicateQueryItem("{gender:[female,male]}", null);
         assertEquals(2, item.getFeatures().size());
         assertEquals(0, item.getRangeFeatures().size());
@@ -51,7 +51,7 @@ public class BooleanSearcherTestCase {
     }
 
     @Test
-    public void requireThatRangeAttributesMapToRangeTerm() {
+    void requireThatRangeAttributesMapToRangeTerm() {
         PredicateQueryItem item = buildPredicateQueryItem(null, "{age:25}");
         assertEquals(0, item.getFeatures().size());
         assertEquals(1, item.getRangeFeatures().size());
@@ -63,17 +63,17 @@ public class BooleanSearcherTestCase {
     }
 
     @Test
-    public void requireThatQueryWithoutBooleanPropertiesIsUnchanged() {
+    void requireThatQueryWithoutBooleanPropertiesIsUnchanged() {
         Query q = new Query("");
         q.getModel().getQueryTree().setRoot(new WordItem("foo", "otherfield"));
         Result r = exec.search(q);
 
-        WordItem root = (WordItem)r.getQuery().getModel().getQueryTree().getRoot();
+        WordItem root = (WordItem) r.getQuery().getModel().getQueryTree().getRoot();
         assertEquals("foo", root.getWord());
     }
 
     @Test
-    public void requireThatBooleanSearcherCanBuildPredicateQueryItem() {
+    void requireThatBooleanSearcherCanBuildPredicateQueryItem() {
         PredicateQueryItem root = buildPredicateQueryItem("{gender:female}", "{age:23:[2, 3, 5]}");
 
         Collection<PredicateQueryItem.Entry> features = root.getFeatures();
@@ -92,7 +92,7 @@ public class BooleanSearcherTestCase {
     }
 
     @Test
-    public void requireThatKeysAndValuesCanContainSpaces() {
+    void requireThatKeysAndValuesCanContainSpaces() {
         PredicateQueryItem item = buildPredicateQueryItem("{'My Key':'My Value'}", null);
         assertEquals(1, item.getFeatures().size());
         assertEquals(0, item.getRangeFeatures().size());
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java
index 025c3ff7a32..3a8442bc12d 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java
@@ -2,19 +2,16 @@
 package com.yahoo.search.querytransform;
 
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import com.yahoo.prelude.IndexModel;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import com.yahoo.prelude.SearchDefinition;
 import com.yahoo.prelude.query.SameElementItem;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.prelude.Index;
 import com.yahoo.prelude.IndexFacts;
@@ -69,7 +66,7 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void simple() {
+    void simple() {
         Query q = new Query();
         AndItem root = new AndItem();
         WordItem tmp;
@@ -92,7 +89,7 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void slightlyMoreComplexTree() {
+    void slightlyMoreComplexTree() {
         Query q = new Query();
         AndItem a0 = new AndItem();
         OrItem o0 = new OrItem();
@@ -148,7 +145,7 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void testWeightedSet() {
+    void testWeightedSet() {
         Query q = new Query();
         AndItem root = new AndItem();
         WeightedSetItem tmp;
@@ -170,11 +167,11 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void testDisableLowercasingWeightedSet() {
+    void testDisableLowercasingWeightedSet() {
         Execution execution = new Execution(new Chain<Searcher>(
-                new VespaLowercasingSearcher(new LowercasingConfig(
-                        new LowercasingConfig.Builder()
-                                .transform_weighted_sets(false)))),
+                        new VespaLowercasingSearcher(new LowercasingConfig(
+                                new LowercasingConfig.Builder()
+                                        .transform_weighted_sets(false)))),
                 Execution.Context.createContextStub(createIndexFacts()));
 
         Query q = new Query();
@@ -198,7 +195,7 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void testLowercasingWordAlternatives() {
+    void testLowercasingWordAlternatives() {
         Execution execution = new Execution(new Chain<Searcher>(new VespaLowercasingSearcher(new LowercasingConfig(
                 new LowercasingConfig.Builder().transform_weighted_sets(false)))), Execution.Context.createContextStub(createIndexFacts()));
 
@@ -221,7 +218,7 @@ public class LowercasingTestCase {
     }
 
     @Test
-    public void testLowercasingSameElement() {
+    void testLowercasingSameElement() {
         Query q = new Query();
         SameElementItem root = new SameElementItem(SARR);
         root.addItem(new WordItem("ABC", BAMSE, true));
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
index d2010ec852e..438f36b32a6 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
@@ -19,17 +19,14 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.ListIterator;
 
 import static com.yahoo.container.protect.Error.INVALID_QUERY_PARAMETER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Testing of WandSearcher.
@@ -88,17 +85,17 @@ public class WandSearcherTestCase {
         assertEquals(expWeight, wordItem.getWeight());
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         exec = buildExec();
     }
 
     @Test
-    public void requireThatVespaWandCanBeSpecified() {
+    void requireThatVespaWandCanBeSpecified() {
         Query q = buildDefaultQuery();
         Result r = exec.search(q);
 
-        WeakAndItem root = (WeakAndItem)TestUtils.getQueryTreeRoot(r);
+        WeakAndItem root = (WeakAndItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(100, root.getN());
         assertEquals(3, root.getItemCount());
         ListIterator<Item> itr = root.getItemIterator();
@@ -109,21 +106,21 @@ public class WandSearcherTestCase {
     }
 
     @Test
-    public void requireThatVespaWandHeapSizeCanBeSpecified() {
+    void requireThatVespaWandHeapSizeCanBeSpecified() {
         Query q = buildDefaultQuery(VESPA_FIELD, "50");
         Result r = exec.search(q);
 
-        WeakAndItem root = (WeakAndItem)TestUtils.getQueryTreeRoot(r);
+        WeakAndItem root = (WeakAndItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(50, root.getN());
     }
 
     @Test
-    public void requireThatWandCanBeSpecifiedTogetherWithNonAndQueryRoot() {
+    void requireThatWandCanBeSpecifiedTogetherWithNonAndQueryRoot() {
         Query q = buildDefaultQuery();
         q.getModel().getQueryTree().setRoot(new WordItem("foo", "otherfield"));
         Result r = exec.search(q);
 
-        AndItem root = (AndItem)TestUtils.getQueryTreeRoot(r);
+        AndItem root = (AndItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(2, root.getItemCount());
         ListIterator<Item> itr = root.getItemIterator();
         assertTrue(itr.next() instanceof WordItem);
@@ -132,7 +129,7 @@ public class WandSearcherTestCase {
     }
 
     @Test
-    public void requireThatWandCanBeSpecifiedTogetherWithAndQueryRoot() {
+    void requireThatWandCanBeSpecifiedTogetherWithAndQueryRoot() {
         Query q = buildDefaultQuery();
         {
             AndItem root = new AndItem();
@@ -142,7 +139,7 @@ public class WandSearcherTestCase {
         }
         Result r = exec.search(q);
 
-        AndItem root = (AndItem)TestUtils.getQueryTreeRoot(r);
+        AndItem root = (AndItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(3, root.getItemCount());
         ListIterator<Item> itr = root.getItemIterator();
         assertTrue(itr.next() instanceof WordItem);
@@ -153,42 +150,42 @@ public class WandSearcherTestCase {
 
 
     @Test
-    public void requireThatNothingIsAddedWithoutWandPropertiesSet() {
+    void requireThatNothingIsAddedWithoutWandPropertiesSet() {
         Query foo = new Query("");
         foo.getModel().getQueryTree().setRoot(new WordItem("foo", "otherfield"));
         Result r = exec.search(foo);
 
-        WordItem root = (WordItem)TestUtils.getQueryTreeRoot(r);
+        WordItem root = (WordItem) TestUtils.getQueryTreeRoot(r);
         assertEquals("foo", root.getWord());
     }
 
     @Test
-    public void requireThatErrorIsReturnedOnInvalidTokenList() {
+    void requireThatErrorIsReturnedOnInvalidTokenList() {
         Query q = buildQuery(VESPA_FIELD, "{a1,b:1}", null, null, null, null);
         Result r = exec.search(q);
 
         ErrorMessage msg = r.hits().getError();
         assertNotNull(msg);
         assertEquals(INVALID_QUERY_PARAMETER.code, msg.getCode());
-        assertEquals("'{a1,b:1}' is not a legal sparse vector string: Expected ':' starting at position 3 but was ','",msg.getDetailedMessage());
+        assertEquals("'{a1,b:1}' is not a legal sparse vector string: Expected ':' starting at position 3 but was ','", msg.getDetailedMessage());
     }
 
     @Test
-    public void requireThatErrorIsReturnedOnUnknownField() {
+    void requireThatErrorIsReturnedOnUnknownField() {
         Query q = buildDefaultQuery("unknown", "50");
         Result r = exec.search(q);
         ErrorMessage msg = r.hits().getError();
         assertNotNull(msg);
         assertEquals(INVALID_QUERY_PARAMETER.code, msg.getCode());
-        assertEquals("Field 'unknown' was not found in index facts for search definitions [test]",msg.getDetailedMessage());
+        assertEquals("Field 'unknown' was not found in index facts for search definitions [test]", msg.getDetailedMessage());
     }
 
     @Test
-    public void requireThatVespaOrCanBeSpecified() {
+    void requireThatVespaOrCanBeSpecified() {
         Query q = buildQuery(VESPA_FIELD, "{a:1,b:2,c:3}", null, "or", null, null);
         Result r = exec.search(q);
 
-        OrItem root = (OrItem)TestUtils.getQueryTreeRoot(r);
+        OrItem root = (OrItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(3, root.getItemCount());
         ListIterator<Item> itr = root.getItemIterator();
         assertWordItem("a", VESPA_FIELD, 1, itr.next());
@@ -205,11 +202,11 @@ public class WandSearcherTestCase {
     }
 
     @Test
-    public void requireThatDefaultParallelWandCanBeSpecified() {
+    void requireThatDefaultParallelWandCanBeSpecified() {
         Query q = buildQuery(VESPA_FIELD, "{a:1,b:2,c:3}", null, "parallel", null, null);
         Result r = exec.search(q);
 
-        WandItem root = (WandItem)TestUtils.getQueryTreeRoot(r);
+        WandItem root = (WandItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(VESPA_FIELD, root.getIndexName());
         assertEquals(100, root.getTargetNumHits());
         assertEquals(0.0, root.getScoreThreshold(), delta);
@@ -218,11 +215,11 @@ public class WandSearcherTestCase {
     }
 
     @Test
-    public void requireThatParallelWandCanBeSpecified() {
+    void requireThatParallelWandCanBeSpecified() {
         Query q = buildQuery(VESPA_FIELD, "{a:1,b:2,c:3}", "50", "parallel", "70.5", "2.3");
         Result r = exec.search(q);
 
-        WandItem root = (WandItem)TestUtils.getQueryTreeRoot(r);
+        WandItem root = (WandItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(VESPA_FIELD, root.getIndexName());
         assertEquals(50, root.getTargetNumHits());
         assertEquals(70.5, root.getScoreThreshold(), delta);
@@ -231,11 +228,11 @@ public class WandSearcherTestCase {
     }
 
     @Test
-    public void requireThatDotProductCanBeSpecified() {
+    void requireThatDotProductCanBeSpecified() {
         Query q = buildQuery(VESPA_FIELD, "{a:1,b:2,c:3}", null, "dotProduct", null, null);
         Result r = exec.search(q);
 
-        DotProductItem root = (DotProductItem)TestUtils.getQueryTreeRoot(r);
+        DotProductItem root = (DotProductItem) TestUtils.getQueryTreeRoot(r);
         assertEquals(VESPA_FIELD, root.getIndexName());
         assertWeightedSetItem(root);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
index 54f6bcd4c23..30d06510409 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/WeakAndReplacementSearcherTestCase.java
@@ -8,11 +8,11 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.IntStream;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class WeakAndReplacementSearcherTestCase {
 
@@ -42,20 +42,18 @@ public class WeakAndReplacementSearcherTestCase {
     }
 
 
-
-
     @Test
-    public void requireOrItemsToBeReplaced() {
+    void requireOrItemsToBeReplaced() {
         Query query = buildDefaultQuery(true);
         Result result = buildExec().search(query);
         Item root = TestUtils.getQueryTreeRoot(result);
         assertFalse(orItemsExist(root));
         assertTrue(root instanceof WeakAndItem);
-        assertEquals(N, ((WeakAndItem)root).getN());
+        assertEquals(N, ((WeakAndItem) root).getN());
     }
 
     @Test
-    public void requireQueryPropertyToWork() {
+    void requireQueryPropertyToWork() {
         Query query = buildDefaultQuery(false);
         Item preRoot = query.getModel().getQueryTree().getRoot();
         Result result = buildExec().search(query);
@@ -65,7 +63,7 @@ public class WeakAndReplacementSearcherTestCase {
     }
 
     @Test
-    public void requireDoNothingOnNoOrItems() {
+    void requireDoNothingOnNoOrItems() {
         Query query = new Query();
         query.properties().set(WEAKAND_REPLACE, true);
         AndItem andItem = new AndItem();
@@ -78,7 +76,7 @@ public class WeakAndReplacementSearcherTestCase {
     }
 
     @Test
-    public void requireChildrenAreTheSame() {
+    void requireChildrenAreTheSame() {
         Query query = new Query();
         query.properties().set(WEAKAND_REPLACE, true);
         OrItem preRoot = new OrItem();
@@ -87,7 +85,7 @@ public class WeakAndReplacementSearcherTestCase {
 
         query.getModel().getQueryTree().setRoot(preRoot);
         Result result = buildExec().search(query);
-        WeakAndItem root = (WeakAndItem)TestUtils.getQueryTreeRoot(result);
+        WeakAndItem root = (WeakAndItem) TestUtils.getQueryTreeRoot(result);
         assertEquals(preRoot.getItem(0), root.getItem(0));
         assertEquals(preRoot.getItem(1), root.getItem(1));
     }
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
index 460ae1f641c..8dccf7d0f38 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
@@ -33,12 +33,10 @@ import com.yahoo.search.querytransform.NGramSearcher;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.yahoo.search.searchchain.Execution.Context.createContextStub;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -103,7 +101,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testMixedDocTypes() {
+    void testMixedDocTypes() {
         {
             Query q = new Query("?query=abc&restrict=song");
             createMixedSetupExecution().search(q);
@@ -127,7 +125,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testMixedClusters() {
+    void testMixedClusters() {
         {
             Query q = new Query("?query=abc&search=songOnly");
             createMixedSetupExecution().search(q);
@@ -151,42 +149,42 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testNGramRewritingMixedQuery() {
+    void testNGramRewritingMixedQuery() {
         Query q = new Query("?query=foo+gram3:engul+test:bar");
         createExecution().search(q);
         assertEquals("WEAKAND(100) foo (AND gram3:eng gram3:ngu gram3:gul) test:bar", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingNGramOnly() {
+    void testNGramRewritingNGramOnly() {
         Query q = new Query("?query=gram3:engul");
         createExecution().search(q);
         assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul)", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewriting2NGramsOnly() {
+    void testNGramRewriting2NGramsOnly() {
         Query q = new Query("?query=gram3:engul+gram2:123");
         createExecution().search(q);
         assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul) (AND gram2:12 gram2:23)", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingShortOnly() {
+    void testNGramRewritingShortOnly() {
         Query q = new Query("?query=gram3:en");
         createExecution().search(q);
         assertEquals("WEAKAND(100) gram3:en", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingShortInMixes() {
+    void testNGramRewritingShortInMixes() {
         Query q = new Query("?query=test:a+gram3:en");
         createExecution().search(q);
         assertEquals("WEAKAND(100) test:a gram3:en", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingPhrase() {
+    void testNGramRewritingPhrase() {
         Query q = new Query("?query=gram3:%22engul+a+holi%22");
         createExecution().search(q);
         assertEquals("WEAKAND(100) gram3:\"eng ngu gul a hol oli\"", q.getModel().getQueryTree().toString());
@@ -197,19 +195,19 @@ public class NGramSearcherTestCase {
      * so the ngram rewriter cannot know to keep the grams as a phrase in this case.
      */
     @Test
-    public void testNGramRewritingPhraseSingleTerm() {
+    void testNGramRewritingPhraseSingleTerm() {
         Query q = new Query("?query=gram3:%22engul%22");
         createExecution().search(q);
         assertEquals("WEAKAND(100) (AND gram3:eng gram3:ngu gram3:gul)", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingAdditionalTermInfo() {
+    void testNGramRewritingAdditionalTermInfo() {
         Query q = new Query("?query=gram3:engul!50+foo+gram2:123!150");
         createExecution().search(q);
-        WeakAndItem root = (WeakAndItem)q.getModel().getQueryTree().getRoot();
-        AndItem gram3And = (AndItem)root.getItem(0);
-        AndItem gram2And = (AndItem)root.getItem(2);
+        WeakAndItem root = (WeakAndItem) q.getModel().getQueryTree().getRoot();
+        AndItem gram3And = (AndItem) root.getItem(0);
+        AndItem gram2And = (AndItem) root.getItem(2);
 
         assertExtraTermInfo(50, "engul", gram3And.getItem(0));
         assertExtraTermInfo(50, "engul", gram3And.getItem(1));
@@ -227,21 +225,21 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testNGramRewritingExplicitDefault() {
+    void testNGramRewritingExplicitDefault() {
         Query q = new Query("?query=default:engul");
         createExecution().search(q);
-        assertEquals("WEAKAND(100) (AND default:eng default:ngu default:gul)" ,q.getModel().getQueryTree().toString());
+        assertEquals("WEAKAND(100) (AND default:eng default:ngu default:gul)", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testNGramRewritingImplicitDefault() {
+    void testNGramRewritingImplicitDefault() {
         Query q = new Query("?query=engul");
         createExecution().search(q);
         assertEquals("WEAKAND(100) (AND eng ngu gul)", q.getModel().getQueryTree().toString());
     }
 
     @Test
-    public void testGramsWithSegmentation() {
+    void testGramsWithSegmentation() {
         Searcher searcher = createSearcher();
         assertGramsWithSegmentation(new Chain<>(searcher));
         assertGramsWithSegmentation(new Chain<>(new CJKSearcher(), searcher));
@@ -259,7 +257,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testGramsWithSegmentationSingleSegment() {
+    void testGramsWithSegmentationSingleSegment() {
         Searcher searcher = createSearcher();
         assertGramsWithSegmentationSingleSegment(new Chain<>(searcher));
         assertGramsWithSegmentationSingleSegment(new Chain<>(new CJKSearcher(), searcher));
@@ -277,7 +275,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testGramsWithSegmentationSubstringSegmented() {
+    void testGramsWithSegmentationSubstringSegmented() {
         Searcher searcher = createSearcher();
         assertGramsWithSegmentationSubstringSegmented(new Chain<>(searcher));
         assertGramsWithSegmentationSubstringSegmented(new Chain<>(new CJKSearcher(), searcher));
@@ -296,7 +294,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testGramsWithSegmentationMixed() {
+    void testGramsWithSegmentationMixed() {
         Searcher searcher = createSearcher();
         assertGramsWithSegmentationMixed(new Chain<>(searcher));
         assertGramsWithSegmentationMixed(new Chain<>(new CJKSearcher(), searcher));
@@ -315,7 +313,7 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testGramsWithSegmentationMixedAndPhrases() {
+    void testGramsWithSegmentationMixedAndPhrases() {
         Searcher searcher = createSearcher();
         assertGramsWithSegmentationMixedAndPhrases(new Chain<>(searcher));
         assertGramsWithSegmentationMixedAndPhrases(new Chain<>(new CJKSearcher(), searcher));
@@ -334,19 +332,20 @@ public class NGramSearcherTestCase {
     }
 
     @Test
-    public void testNGramRecombining() {
+    void testNGramRecombining() {
         Query q = new Query("?query=ignored");
         Result r = new Execution(new Chain<>(createSearcher(), new MockBackend1()), createContextStub(createIndexFacts())).search(q);
         Hit h1 = r.hits().get("hit1");
         assertEquals("Should be untouched,\u001feven if containing \u001f",
-                     h1.getField("test").toString());
+                h1.getField("test").toString());
         assertTrue(h1.getField("test") instanceof String);
 
-        assertEquals("Blue red Ed A",h1.getField("gram2").toString());
+        assertEquals("Blue red Ed A", h1.getField("gram2").toString());
         assertTrue(h1.getField("gram2") instanceof XMLString);
 
-        assertEquals("Separators on borders work","Blue red ed a\u001f",
-                     h1.getField("gram3").toString());
+        assertEquals("Blue red ed a\u001f",
+                h1.getField("gram3").toString(),
+                "Separators on borders work");
         assertTrue(h1.getField("gram3") instanceof String);
 
         Hit h2 = r.hits().get("hit2");
@@ -356,7 +355,7 @@ public class NGramSearcherTestCase {
         Hit h3 = r.hits().get("hit3");
         assertEquals("\u001ffin\u001f \u001fen\u001f \u001fa\u001f", h3.getField("gram2").toString());
         assertEquals("#Logging in #Java is like that \"Judean P\u001fopul\u001far Front\" scene from \"Life of Brian\".",
-                     h3.getField("gram3").toString());
+                h3.getField("gram3").toString());
     }
 
     private Item parseQuery(String query, Query.Type type) {
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java
index df6cd046b74..927a891a797 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java
@@ -19,12 +19,12 @@ import com.yahoo.search.query.parser.ParserEnvironment;
 import com.yahoo.search.query.parser.ParserFactory;
 import com.yahoo.search.querytransform.RangeQueryOptimizer;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.Iterator;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -35,9 +35,9 @@ public class RangeQueryOptimizerTestCase {
     private static IndexFacts indexFacts = createIndexFacts();
 
     @Test
-    public void testRangeOptimizing() {
+    void testRangeOptimizing() {
         assertOptimized("s:<15", "s:<15");
-        assertOptimized("AND a s:[1999;2002]","a AND s:[1999;2002]");
+        assertOptimized("AND a s:[1999;2002]", "a AND s:[1999;2002]");
         assertOptimized("AND s:<10;15>", "s:<15 AND s:>10");
         assertOptimized("AND s:give s:5 s:me", "s:give s:5 s:me");
         assertOptimized("AND s:[;15> b:<10;]", "s:<15 AND b:>10");
@@ -59,7 +59,7 @@ public class RangeQueryOptimizerTestCase {
     }
 
     @Test
-    public void testRangeOptimizingCarriesOverItemAttributesWhenNotOptimized() {
+    void testRangeOptimizingCarriesOverItemAttributesWhenNotOptimized() {
         Query query = new Query();
         AndItem root = new AndItem();
         query.getModel().getQueryTree().setRoot(root);
@@ -69,14 +69,14 @@ public class RangeQueryOptimizerTestCase {
         intItem.setRanked(false);
         root.addItem(intItem);
         assertOptimized("Not optimized", "AND |s:<15;]!500", query);
-        IntItem transformedIntItem = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(0);
-        assertTrue("Filter was carried over", transformedIntItem.isFilter());
-        assertFalse("Ranked was carried over", transformedIntItem.isRanked());
-        assertEquals("Weight was carried over", 500, transformedIntItem.getWeight());
+        IntItem transformedIntItem = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(0);
+        assertTrue(transformedIntItem.isFilter(), "Filter was carried over");
+        assertFalse(transformedIntItem.isRanked(), "Ranked was carried over");
+        assertEquals(500, transformedIntItem.getWeight(), "Weight was carried over");
     }
 
     @Test
-    public void testRangeOptimizingCarriesOverItemAttributesWhenOptimized() {
+    void testRangeOptimizingCarriesOverItemAttributesWhenOptimized() {
         Query query = new Query();
         AndItem root = new AndItem();
         query.getModel().getQueryTree().setRoot(root);
@@ -94,14 +94,14 @@ public class RangeQueryOptimizerTestCase {
         root.addItem(intItem2);
 
         assertOptimized("Optimized", "AND |s:<15;30>!500", query);
-        IntItem transformedIntItem = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(0);
-        assertTrue("Filter was carried over", transformedIntItem.isFilter());
-        assertFalse("Ranked was carried over", transformedIntItem.isRanked());
-        assertEquals("Weight was carried over", 500, transformedIntItem.getWeight());
+        IntItem transformedIntItem = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(0);
+        assertTrue(transformedIntItem.isFilter(), "Filter was carried over");
+        assertFalse(transformedIntItem.isRanked(), "Ranked was carried over");
+        assertEquals(500, transformedIntItem.getWeight(), "Weight was carried over");
     }
 
     @Test
-    public void testNoRangeOptimizingWhenAttributesAreIncompatible() {
+    void testNoRangeOptimizingWhenAttributesAreIncompatible() {
         Query query = new Query();
         AndItem root = new AndItem();
         query.getModel().getQueryTree().setRoot(root);
@@ -120,19 +120,19 @@ public class RangeQueryOptimizerTestCase {
 
         assertOptimized("Not optimized", "AND |s:<15;]!500 s:[;30>!500", query);
 
-        IntItem transformedIntItem1 = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(0);
-        assertTrue("Filter was carried over", transformedIntItem1.isFilter());
-        assertFalse("Ranked was carried over", transformedIntItem1.isRanked());
-        assertEquals("Weight was carried over", 500, transformedIntItem1.getWeight());
+        IntItem transformedIntItem1 = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(0);
+        assertTrue(transformedIntItem1.isFilter(), "Filter was carried over");
+        assertFalse(transformedIntItem1.isRanked(), "Ranked was carried over");
+        assertEquals(500, transformedIntItem1.getWeight(), "Weight was carried over");
 
-        IntItem transformedIntItem2 = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(1);
-        assertFalse("Filter was carried over", transformedIntItem2.isFilter());
-        assertFalse("Ranked was carried over", transformedIntItem2.isRanked());
-        assertEquals("Weight was carried over", 500, transformedIntItem2.getWeight());
+        IntItem transformedIntItem2 = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(1);
+        assertFalse(transformedIntItem2.isFilter(), "Filter was carried over");
+        assertFalse(transformedIntItem2.isRanked(), "Ranked was carried over");
+        assertEquals(500, transformedIntItem2.getWeight(), "Weight was carried over");
     }
 
     @Test
-    public void testDifferentCompatibleRangesPerFieldAreOptimizedSeparately() {
+    void testDifferentCompatibleRangesPerFieldAreOptimizedSeparately() {
         Query query = new Query();
         AndItem root = new AndItem();
         query.getModel().getQueryTree().setRoot(root);
@@ -155,21 +155,21 @@ public class RangeQueryOptimizerTestCase {
 
         assertOptimized("Optimized", "AND s:<15;30> s:<100;150>", query);
 
-        IntItem transformedIntItem1 = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(0);
-        assertFalse("Ranked was carried over", transformedIntItem1.isRanked());
+        IntItem transformedIntItem1 = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(0);
+        assertFalse(transformedIntItem1.isRanked(), "Ranked was carried over");
 
-        IntItem transformedIntItem2 = (IntItem)((AndItem)query.getModel().getQueryTree().getRoot()).getItem(1);
-        assertTrue("Ranked was carried over", transformedIntItem2.isRanked());
+        IntItem transformedIntItem2 = (IntItem) ((AndItem) query.getModel().getQueryTree().getRoot()).getItem(1);
+        assertTrue(transformedIntItem2.isRanked(), "Ranked was carried over");
     }
 
     @Test
-    public void assertOptmimizedYQLQuery() {
+    void assertOptmimizedYQLQuery() {
         Query query = new Query("/?query=select%20%2A%20from%20sources%20%2A%20where%20%28range%28s%2C%20100000%2C%20100000%29%20OR%20range%28t%2C%20-20000000000L%2C%20-20000000000L%29%20OR%20range%28t%2C%2030%2C%2030%29%29%3B&type=yql");
         assertOptimized("YQL usage of the IntItem API works", "OR s:100000 t:-20000000000 t:30", query);
     }
 
     @Test
-    public void testTracing() {
+    void testTracing() {
         Query notOptimized = new Query("/?tracelevel=2");
         notOptimized.getModel().getQueryTree().setRoot(parseQuery("s:<15"));
         assertOptimized("", "s:<15", notOptimized);
@@ -200,7 +200,7 @@ public class RangeQueryOptimizerTestCase {
     private Query assertOptimized(String explanation, String expected, Query query) {
         Chain<Searcher> chain = new Chain<>("test", new RangeQueryOptimizer());
         new Execution(chain, Execution.Context.createContextStub(indexFacts)).search(query);
-        assertEquals(explanation, expected, query.getModel().getQueryTree().getRoot().toString());
+        assertEquals(expected, query.getModel().getQueryTree().getRoot().toString(), explanation);
         return query;
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
index ccdb612b9ba..3b9c2651bf6 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
@@ -13,9 +13,9 @@ import com.yahoo.search.grouping.GroupingQueryParser;
 import com.yahoo.search.query.properties.DefaultProperties;
 import com.yahoo.search.querytransform.SortingDegrader;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -23,7 +23,7 @@ import static org.junit.Assert.*;
 public class SortingDegraderTestCase {
 
     @Test
-    public void testDegradingAscending() {
+    void testDegradingAscending() {
         Query query = new Query("?ranking.sorting=%2ba1%20-a2");
         execute(query);
         assertEquals("a1", query.getRanking().getMatchPhase().getAttribute());
@@ -33,7 +33,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingDescending() {
+    void testDegradingDescending() {
         Query query = new Query("?ranking.sorting=-a1%20-a2");
         execute(query);
         assertEquals("a1", query.getRanking().getMatchPhase().getAttribute());
@@ -42,7 +42,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingNonDefaultMaxHits() {
+    void testDegradingNonDefaultMaxHits() {
         Query query = new Query("?ranking.sorting=-a1%20-a2&ranking.matchPhase.maxHits=37");
         execute(query);
         assertEquals("a1", query.getRanking().getMatchPhase().getAttribute());
@@ -51,7 +51,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingNonDefaultMaxFilterCoverage() {
+    void testDegradingNonDefaultMaxFilterCoverage() {
         Query query = new Query("?ranking.sorting=-a1%20-a2&ranking.matchPhase.maxFilterCoverage=0.37");
         execute(query);
         assertEquals("a1", query.getRanking().getMatchPhase().getAttribute());
@@ -60,7 +60,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingNonDefaultIllegalMaxFilterCoverage() {
+    void testDegradingNonDefaultIllegalMaxFilterCoverage() {
         try {
             Query query = new Query("?ranking.sorting=-a1%20-a2&ranking.matchPhase.maxFilterCoverage=37");
             assertTrue(false);
@@ -75,7 +75,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testNoDegradingWhenGrouping() {
+    void testNoDegradingWhenGrouping() {
         Query query = new Query("?ranking.sorting=%2ba1%20-a2&select=all(group(a1)%20each(output(a1)))");
         execute(query);
         assertNull(query.getRanking().getMatchPhase().getAttribute());
@@ -83,28 +83,28 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testNoDegradingWhenNonFastSearchAttribute() {
+    void testNoDegradingWhenNonFastSearchAttribute() {
         Query query = new Query("?ranking.sorting=%2bnonFastSearchAttribute%20-a2");
         execute(query);
         assertNull(query.getRanking().getMatchPhase().getAttribute());
     }
 
     @Test
-    public void testNoDegradingWhenNonNumericalAttribute() {
+    void testNoDegradingWhenNonNumericalAttribute() {
         Query query = new Query("?ranking.sorting=%2bstringAttribute%20-a2");
         execute(query);
         assertNull(query.getRanking().getMatchPhase().getAttribute());
     }
 
     @Test
-    public void testNoDegradingWhenTurnedOff() {
+    void testNoDegradingWhenTurnedOff() {
         Query query = new Query("?ranking.sorting=-a1%20-a2&sorting.degrading=false");
         execute(query);
         assertNull(query.getRanking().getMatchPhase().getAttribute());
     }
 
     @Test
-    public void testAccessAllDegradingParametersInQuery() {
+    void testAccessAllDegradingParametersInQuery() {
         Query query = new Query("?ranking.matchPhase.maxHits=555&ranking.matchPhase.attribute=foo&ranking.matchPhase.ascending=true");
         execute(query);
 
@@ -118,7 +118,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingWithLargeMaxHits() {
+    void testDegradingWithLargeMaxHits() {
         Query query = new Query("?ranking.sorting=%2ba1%20-a2");
         query.properties().set(DefaultProperties.MAX_HITS, 13 * 1000);
         query.properties().set(DefaultProperties.MAX_OFFSET, 8 * 1000);
@@ -129,7 +129,7 @@ public class SortingDegraderTestCase {
     }
 
     @Test
-    public void testDegradingWithoutPaginationSupport() {
+    void testDegradingWithoutPaginationSupport() {
         Query query = new Query("?ranking.sorting=%2ba1%20-a2&hits=7&offset=1");
         query.properties().set(DefaultProperties.MAX_HITS, 13 * 1000);
         query.properties().set(DefaultProperties.MAX_OFFSET, 8 * 1000);