Convert container-search to junit5

7 files changed, 280 insertions, 278 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
index 72b77377bf2..e502cf538aa 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
@@ -1,12 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query.rewrite;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import com.yahoo.prelude.query.WeakAndItem;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import com.yahoo.prelude.query.AndItem;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import com.yahoo.prelude.query.CompositeItem;
 import com.yahoo.prelude.query.Item;
 import com.yahoo.language.process.SpecialTokenRegistry;
@@ -25,7 +26,7 @@ public class RewriterFeaturesTestCase {
     private static final String ASCII_ELLIPSIS = "...";
 
     @Test
-    public final void testConvertStringToQTree() {
+    final void testConvertStringToQTree() {
         Execution placeholder = new Execution(Context.createContextStub());
         SpecialTokenRegistry tokenRegistry = new SpecialTokenRegistry(
                 new SpecialtokensConfig(
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
index d9a3603bdaf..668d070b3e2 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
@@ -8,8 +8,8 @@ import com.yahoo.search.searchchain.*;
 import com.yahoo.search.query.rewrite.*;
 import com.yahoo.search.query.rewrite.rewriters.*;
 import com.yahoo.search.query.rewrite.RewritesConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Cases for GenericExpansionRewriter
@@ -29,7 +29,7 @@ public class GenericExpansionRewriterTestCase {
      * Load the GenericExpansionRewriterSearcher and prepare the
      * execution object
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(CONFIG_PATH);
         HashMap<String, File> fileList = new HashMap<>();
@@ -44,149 +44,149 @@ public class GenericExpansionRewriterTestCase {
      * MaxRewrites=3, PartialPhraseMatch is on, type=adv case
      */
     @Test
-    public void testPartialPhraseMaxRewriteAdvType() {
+    void testPartialPhraseMaxRewriteAdvType() {
         utils.assertRewrittenQuery("?query=(modern new york city travel phone number) OR (travel agency) OR travel&type=adv&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=3",
-                                   "query 'OR (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
-                                   "(AND new york city travel)) (OR pn (AND phone number))) ta (AND travel agency) " +
-                                   "tr travel'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=3",
+                "query 'OR (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
+                        "(AND new york city travel)) (OR pn (AND phone number))) ta (AND travel agency) " +
+                        "tr travel'");
     }
 
     /**
      * PartialPhraseMatch is off, type=adv case
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteAdvType() {
+    void testPartialPhraseNoMaxRewriteAdvType() {
         utils.assertRewrittenQuery("?query=(modern new york city travel phone number) OR (travel agency) OR travel&type=adv&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'OR (AND modern new york city travel phone number) " +
-                                   "ta (AND travel agency) tr travel'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'OR (AND modern new york city travel phone number) " +
+                        "ta (AND travel agency) tr travel'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, type=adv, added filter case
      */
     @Test
-    public void testFullPhraseNoMaxRewriteAdvTypeFilter() {
+    void testFullPhraseNoMaxRewriteAdvTypeFilter() {
         utils.assertRewrittenQuery("?query=ca OR (modern new york city travel phone number) OR (travel agency) OR travel&" +
-                                   "type=adv&filter=citystate:santa clara ca&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'RANK (OR california ca (AND modern new york city travel phone number) " +
-                                   "ta (AND travel agency) tr travel) |citystate:santa |clara |ca'");
+                "type=adv&filter=citystate:santa clara ca&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'RANK (OR california ca (AND modern new york city travel phone number) " +
+                        "ta (AND travel agency) tr travel) |citystate:santa |clara |ca'");
     }
 
     /**
      * MaxRewrites=0 (i.e No MaxRewrites), PartialPhraseMatch is on, type=adv, added filter case
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteAdvTypeFilter() {
+    void testPartialPhraseNoMaxRewriteAdvTypeFilter() {
         utils.assertRewrittenQuery("?query=ca OR (modern new york city travel phone number) OR (travel agency) OR travel&" +
-                                   "type=adv&filter=citystate:santa clara ca&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=0",
-                                   "query 'RANK (OR california ca (AND modern (OR \"rewrite11 rewrite12\" " +
-                                   "rewrite2 rewrite3 rewrite4 rewrite5 (AND new york city travel)) " +
-                                   "(OR pn (AND phone number))) ta (AND travel agency) tr travel) " +
-                                   "|citystate:santa |clara |ca'");
+                "type=adv&filter=citystate:santa clara ca&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=0",
+                "query 'RANK (OR california ca (AND modern (OR \"rewrite11 rewrite12\" " +
+                        "rewrite2 rewrite3 rewrite4 rewrite5 (AND new york city travel)) " +
+                        "(OR pn (AND phone number))) ta (AND travel agency) tr travel) " +
+                        "|citystate:santa |clara |ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, single word, added filter case
      */
     @Test
-    public void testFullPhraseNoMaxRewriteSingleWordFilter() {
+    void testFullPhraseNoMaxRewriteSingleWordFilter() {
         utils.assertRewrittenQuery("?query=ca&type=all&" +
-                                   "filter=citystate:santa clara ca&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
+                "filter=citystate:santa clara ca&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is on, single word, added filter case
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteSingleWordFilter() {
+    void testPartialPhraseNoMaxRewriteSingleWordFilter() {
         utils.assertRewrittenQuery("?query=ca&type=all&" +
-                                   "filter=citystate:santa clara ca&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
+                "filter=citystate:santa clara ca&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, multi word, added filter case
      */
     @Test
-    public void testFullPhraseNoMaxRewriteMultiWordFilter() {
+    void testFullPhraseNoMaxRewriteMultiWordFilter() {
         utils.assertRewrittenQuery("?query=travel agency&type=all&" +
-                                   "filter=citystate:santa clara ca&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'RANK (OR ta (AND travel agency)) |citystate:santa |clara |ca'");
+                "filter=citystate:santa clara ca&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'RANK (OR ta (AND travel agency)) |citystate:santa |clara |ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is on, multi word, added filter case
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteMultiWordFilter() {
+    void testPartialPhraseNoMaxRewriteMultiWordFilter() {
         utils.assertRewrittenQuery("?query=modern new york city travel phone number&" +
-                                   "filter=citystate:santa clara ca&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'RANK (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
-                                   "rewrite4 rewrite5 (AND new york city travel)) (OR pn (AND phone number))) " +
-                                   "|citystate:santa |clara |ca'");
+                "filter=citystate:santa clara ca&type=all&" +
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'RANK (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
+                        "rewrite4 rewrite5 (AND new york city travel)) (OR pn (AND phone number))) " +
+                        "|citystate:santa |clara |ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, single word
      */
     @Test
-    public void testFullPhraseNoMaxRewriteSingleWord() {
+    void testFullPhraseNoMaxRewriteSingleWord() {
         utils.assertRewrittenQuery("?query=ca&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'OR california ca'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'OR california ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is on, single word
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteSingleWord() {
+    void testPartialPhraseNoMaxRewriteSingleWord() {
         utils.assertRewrittenQuery("?query=ca&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'OR california ca'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'OR california ca'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, multi word
      */
     @Test
-    public void testFullPhraseNoMaxRewriteMultiWord() {
+    void testFullPhraseNoMaxRewriteMultiWord() {
         utils.assertRewrittenQuery("?query=travel agency&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'OR ta (AND travel agency)'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'OR ta (AND travel agency)'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is off, multi word, no full match
      */
     @Test
-    public void testFullPhraseNoMaxRewriteMultiWordNoMatch() {
+    void testFullPhraseNoMaxRewriteMultiWordNoMatch() {
         utils.assertRewrittenQuery("?query=nyc travel agency&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
-                                   "query 'AND nyc travel agency'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
+                "query 'AND nyc travel agency'");
     }
 
     /**
      * No MaxRewrites, PartialPhraseMatch is on, multi word
      */
     @Test
-    public void testPartialPhraseNoMaxRewriteMultiWord() {
+    void testPartialPhraseNoMaxRewriteMultiWord() {
         utils.assertRewrittenQuery("?query=modern new york city travel phone number&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 rewrite4 rewrite5 "+
-                                   "(AND new york city travel)) (OR pn (AND phone number))'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 rewrite4 rewrite5 " +
+                        "(AND new york city travel)) (OR pn (AND phone number))'");
     }
 
     /**
@@ -195,10 +195,10 @@ public class GenericExpansionRewriterTestCase {
      * Should rewrite travel but not travel agency in this case
      */
     @Test
-    public void testPartialPhraseMultiWordRankTree() {
+    void testPartialPhraseMultiWordRankTree() {
         utils.assertRewrittenQuery("?query=travel RANK agency&type=adv&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'RANK (OR tr travel) agency'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'RANK (OR tr travel) agency'");
     }
 
     /**
@@ -207,10 +207,10 @@ public class GenericExpansionRewriterTestCase {
      * Should rewrite travel but not travel agency in this case
      */
     @Test
-    public void testFullPhraseMultiWordRankTree() {
+    void testFullPhraseMultiWordRankTree() {
         utils.assertRewrittenQuery("?query=travel RANK agency&type=adv&" +
-                                   REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
-                                   "query 'RANK (OR tr travel) agency'");
+                REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
+                "query 'RANK (OR tr travel) agency'");
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
index 6c9f9c248ea..36eb06a3a92 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
@@ -6,10 +6,10 @@ import com.yahoo.search.searchchain.*;
 import com.yahoo.search.intent.model.*;
 import com.yahoo.search.query.rewrite.*;
 import com.yahoo.search.query.rewrite.rewriters.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test Cases for MisspellRewriter
@@ -25,7 +25,7 @@ public class MisspellRewriterTestCase {
      * Load the QueryRewriteSearcher and prepare the
      * execution object
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         MisspellRewriter searcher = new MisspellRewriter();
         Execution execution = QueryRewriteSearcherTestUtils.createExecutionObj(searcher);
@@ -37,18 +37,18 @@ public class MisspellRewriterTestCase {
      * QLAS returns spell correction: qss_rw=0.9 qss_sugg=1.0
      */
     @Test
-    public void testQSSRewriteQSSSuggestWithRewrite() {
+    void testQSSRewriteQSSSuggestWithRewrite() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("will smith rw", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith sugg", 1.0,
-                                                             false, true));
+                utils.createInterpretation("will smith rw", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith sugg", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg)'",
-                                   intentModel);
+                REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
+                "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg)'",
+                intentModel);
     }
 
     /**
@@ -56,19 +56,19 @@ public class MisspellRewriterTestCase {
      * QLAS returns spell correction: qss_rw=0.9 qss_rw=0.9 qss_sugg=1.0
      */
     @Test
-    public void testQSSRewriteWithRewrite() {
+    void testQSSRewriteWithRewrite() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("will smith rw1", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith rw2", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith sugg", 1.0,
-                                                             false, true));
+                utils.createInterpretation("will smith rw1", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith rw2", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith sugg", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith rw1)'",
-                                   intentModel);
+                REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true",
+                "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith rw1)'",
+                intentModel);
     }
 
     /**
@@ -76,19 +76,19 @@ public class MisspellRewriterTestCase {
      * QLAS returns spell correction: qss_rw=1.0 qss_sugg=0.9 qss_sugg=0.8
      */
     @Test
-    public void testQSSSuggWithRewrite() {
+    void testQSSSuggWithRewrite() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("will smith rw", 1.0,
-                                                             true, false),
-                                  utils.createInterpretation("will smith sugg1", 0.9,
-                                                             false, true),
-                                  utils.createInterpretation("will smith sugg2", 0.8,
-                                                             false, true));
+                utils.createInterpretation("will smith rw", 1.0,
+                        true, false),
+                utils.createInterpretation("will smith sugg1", 0.9,
+                        false, true),
+                utils.createInterpretation("will smith sugg2", 0.8,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg1)'",
-                                   intentModel);
+                REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
+                "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg1)'",
+                intentModel);
     }
 
     /**
@@ -96,16 +96,16 @@ public class MisspellRewriterTestCase {
      * QLAS returns spell correction: qss_rw=1.0 qss_sugg=1.0
      */
     @Test
-    public void testFeautureOffWithRewrite() {
+    void testFeautureOffWithRewrite() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("will smith rw", 1.0,
-                                                             true, false),
-                                  utils.createInterpretation("will smith sugg", 1.0,
-                                                             false, true));
+                utils.createInterpretation("will smith rw", 1.0,
+                        true, false),
+                utils.createInterpretation("will smith sugg", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith",
-                                   "query 'WEAKAND(100) willl smith'",
-                                   intentModel);
+                "query 'WEAKAND(100) willl smith'",
+                intentModel);
     }
 
     /**
@@ -113,18 +113,18 @@ public class MisspellRewriterTestCase {
      * QLAS returns no spell correction
      */
     @Test
-    public void testQSSRewriteQSSSuggWithoutRewrite() {
+    void testQSSRewriteQSSSuggWithoutRewrite() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("use diff query for testing", 1.0,
-                                                             false, false),
-                                  utils.createInterpretation("use diff query for testing", 1.0,
-                                                             false, false));
+                utils.createInterpretation("use diff query for testing", 1.0,
+                        false, false),
+                utils.createInterpretation("use diff query for testing", 1.0,
+                        false, false));
 
         utils.assertRewrittenQuery("?query=will+smith&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'WEAKAND(100) will smith'",
-                                   intentModel);
+                REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
+                "query 'WEAKAND(100) will smith'",
+                intentModel);
     }
 
     /**
@@ -132,7 +132,7 @@ public class MisspellRewriterTestCase {
      * It should throw exception
      */
     @Test
-    public void testNullIntentModelException() {
+    void testNullIntentModelException() {
         try {
             RewriterUtils.getSpellCorrected(new Query("willl smith"), true, true);
             fail();
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
index c99ddcd6c62..98a93a572e9 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
@@ -8,8 +8,8 @@ import com.yahoo.search.searchchain.*;
 import com.yahoo.search.query.rewrite.*;
 import com.yahoo.search.query.rewrite.rewriters.*;
 import com.yahoo.search.query.rewrite.RewritesConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Cases for NameRewriter
@@ -29,7 +29,7 @@ public class NameRewriterTestCase {
      * Load the NameRewriterSearcher and prepare the
      * execution object
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(CONFIG_PATH);
         HashMap<String, File> fileList = new HashMap<>();
@@ -44,29 +44,29 @@ public class NameRewriterTestCase {
      * RewritesAsEquiv and OriginalAsUnit are on
      */
     @Test
-    public void testRewritesAsEquivAndOriginalAsUnit() {
+    void testRewritesAsEquivAndOriginalAsUnit() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
-                                   "query 'OR \"will smith\" (AND will smith movies) " +
-                                   "(AND will smith news) (AND will smith imdb) " +
-                                   "(AND will smith lyrics) (AND will smith dead) " +
-                                   "(AND will smith nfl) (AND will smith new movie hancock) " +
-                                   "(AND will smith biography)'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
+                "query 'OR \"will smith\" (AND will smith movies) " +
+                        "(AND will smith news) (AND will smith imdb) " +
+                        "(AND will smith lyrics) (AND will smith dead) " +
+                        "(AND will smith nfl) (AND will smith new movie hancock) " +
+                        "(AND will smith biography)'");
     }
 
     /**
      * RewritesAsEquiv is on
      */
     @Test
-    public void testRewritesAsEquiv() {
+    void testRewritesAsEquiv() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
-                                   "query 'OR (AND will smith) (AND will smith movies) " +
-                                   "(AND will smith news) (AND will smith imdb) " +
-                                   "(AND will smith lyrics) (AND will smith dead) " +
-                                   "(AND will smith nfl) (AND will smith new movie hancock) " +
-                                   "(AND will smith biography)'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
+                "query 'OR (AND will smith) (AND will smith movies) " +
+                        "(AND will smith news) (AND will smith imdb) " +
+                        "(AND will smith lyrics) (AND will smith dead) " +
+                        "(AND will smith nfl) (AND will smith new movie hancock) " +
+                        "(AND will smith biography)'");
     }
 
     /**
@@ -74,57 +74,57 @@ public class NameRewriterTestCase {
      * Should not rewrite
      */
     @Test
-    public void testComplextQueryRewritesAsEquiv() {
+    void testComplextQueryRewritesAsEquiv() {
         utils.assertRewrittenQuery("?query=((will smith) OR (willl smith)) AND (tom cruise)&type=adv&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
-                                   "query 'AND (OR (AND will smith) (AND willl smith)) (AND tom cruise)'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
+                "query 'AND (OR (AND will smith) (AND willl smith)) (AND tom cruise)'");
     }
 
     /**
      * Single word query for RewritesAsEquiv and OriginalAsUnit on case
      */
     @Test
-    public void testSingleWordForRewritesAsEquivAndOriginalAsUnit() {
+    void testSingleWordForRewritesAsEquivAndOriginalAsUnit() {
         utils.assertRewrittenQuery("?query=obama&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
-                                   "query 'OR obama (AND obama \"nobel peace prize\") " +
-                                   "(AND obama wiki) (AND obama nobel prize) " +
-                                   "(AND obama nobel peace prize) (AND obama wears mom jeans) " +
-                                   "(AND obama sucks) (AND obama news) (AND malia obama) " +
-                                   "(AND obama speech) (AND obama nobel) (AND obama wikipedia) " +
-                                   "(AND barack obama biography) (AND obama snl) " +
-                                   "(AND obama peace prize) (AND michelle obama) (AND barack obama)'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
+                "query 'OR obama (AND obama \"nobel peace prize\") " +
+                        "(AND obama wiki) (AND obama nobel prize) " +
+                        "(AND obama nobel peace prize) (AND obama wears mom jeans) " +
+                        "(AND obama sucks) (AND obama news) (AND malia obama) " +
+                        "(AND obama speech) (AND obama nobel) (AND obama wikipedia) " +
+                        "(AND barack obama biography) (AND obama snl) " +
+                        "(AND obama peace prize) (AND michelle obama) (AND barack obama)'");
     }
 
     /**
      * RewritesAsUnitEquiv and OriginalAsUnitEquiv are on
      */
     @Test
-    public void testRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
+    void testRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
-                                   "=true",
-                                   "query 'OR (AND will smith) \"will smith\" \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
+                "=true",
+                "query 'OR (AND will smith) \"will smith\" \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'");
     }
 
     /**
      * Single word query for RewritesAsUnitEquiv and OriginalAsUnitEquiv on case
      */
     @Test
-    public void testSingleWordForRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
+    void testSingleWordForRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
         utils.assertRewrittenQuery("?query=obama&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
-                                   "=true",
-                                   "query 'OR obama \"obama nobel peace prize\" \"obama wiki\" \"obama nobel prize\" \"obama nobel peace prize\" \"obama wears mom jeans\" \"obama sucks\" \"obama news\" \"malia obama\" \"obama speech\" \"obama nobel\" \"obama wikipedia\" \"barack obama biography\" \"obama snl\" \"obama peace prize\" \"michelle obama\" \"barack obama\"'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
+                "=true",
+                "query 'OR obama \"obama nobel peace prize\" \"obama wiki\" \"obama nobel prize\" \"obama nobel peace prize\" \"obama wears mom jeans\" \"obama sucks\" \"obama news\" \"malia obama\" \"obama speech\" \"obama nobel\" \"obama wikipedia\" \"barack obama biography\" \"obama snl\" \"obama peace prize\" \"michelle obama\" \"barack obama\"'");
     }
 
     /**
@@ -132,11 +132,11 @@ public class NameRewriterTestCase {
      * for RewritesAsEquiv and OriginalAsUnit on case
      */
     @Test
-    public void testBoostingQueryForRewritesAsEquivAndOriginalAsUnit() {
+    void testBoostingQueryForRewritesAsEquivAndOriginalAsUnit() {
         utils.assertRewrittenQuery("?query=angelina jolie&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
-                                   "query '\"angelina jolie\"'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
+                "query '\"angelina jolie\"'");
     }
 
     /**
@@ -144,39 +144,39 @@ public class NameRewriterTestCase {
      * RewritesAsEquiv and OriginalAsUnit on case
      */
     @Test
-    public void testFSANoMatchForRewritesAsEquivAndOriginalAsUnit() {
+    void testFSANoMatchForRewritesAsEquivAndOriginalAsUnit() {
         utils.assertRewrittenQuery("?query=tom cruise&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
-                                   "query 'AND tom cruise'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
+                "query 'AND tom cruise'");
     }
 
     /**
      * RewritesAsUnitEquiv is on
      */
     @Test
-    public void testRewritesAsUnitEquiv() {
+    void testRewritesAsUnitEquiv() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true",
-                                   "query 'OR (AND will smith) \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true",
+                "query 'OR (AND will smith) \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'");
     }
 
     /**
      * RewritesAsUnitEquiv is on and MaxRewrites is set to 2
      */
     @Test
-    public void testRewritesAsUnitEquivAndMaxRewrites() {
+    void testRewritesAsUnitEquivAndMaxRewrites() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=2",
-                                   "query 'OR (AND will smith) \"will smith movies\" " +
-                                   "\"will smith news\"'");
+                REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=2",
+                "query 'OR (AND will smith) \"will smith movies\" " +
+                        "\"will smith news\"'");
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
index 8906dbfa386..4848483688e 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
@@ -10,8 +10,8 @@ import com.yahoo.search.intent.model.*;
 import com.yahoo.search.query.rewrite.RewritesConfig;
 import com.yahoo.search.query.rewrite.*;
 import com.yahoo.search.query.rewrite.rewriters.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Generic Test Cases for QueryRewriteSearcher
@@ -36,7 +36,7 @@ public class QueryRewriteSearcherTestCase {
      * Load the QueryRewriteSearcher and prepare the
      * execution object
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         // Instantiate Name Rewriter
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(NAME_REWRITER_CONFIG_PATH);
@@ -61,7 +61,7 @@ public class QueryRewriteSearcherTestCase {
      * Query will be passed to next rewriter
      */
     @Test
-    public void testInvalidFSAConfigPath() {
+    void testInvalidFSAConfigPath() {
         // Instantiate Name Rewriter with fake FSA path
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(FAKE_FSA_CONFIG_PATH);
         HashMap<String, File> fileList = new HashMap<>();
@@ -80,9 +80,9 @@ public class QueryRewriteSearcherTestCase {
         QueryRewriteSearcherTestUtils utilsWithFakePath = new QueryRewriteSearcherTestUtils(execution);
 
         utilsWithFakePath.assertRewrittenQuery("?query=will smith&type=all&" +
-                                               NAME_REWRITER_NAME + "." +
-                                               RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true",
-                                               "query 'AND will smith'");
+                NAME_REWRITER_NAME + "." +
+                RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true",
+                "query 'AND will smith'");
     }
 
     /**
@@ -90,19 +90,19 @@ public class QueryRewriteSearcherTestCase {
      * It should skip to the next rewriter
      */
     @Test
-    public void testExceptionInRewriter() {
+    void testExceptionInRewriter() {
         utils.assertRewrittenQuery("?query=will smith&type=all&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
-                                   "query 'OR (AND will smith) " +
-                                   "\"will smith\" \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'");
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
+                "query 'OR (AND will smith) " +
+                        "\"will smith\" \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'");
     }
 
     /**
@@ -110,26 +110,26 @@ public class QueryRewriteSearcherTestCase {
      * Query will be rewritten twice
      */
     @Test
-    public void testTwoRewritersInChain() {
+    void testTwoRewritersInChain() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("wills smith", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith", 1.0,
-                                                             false, true));
+                utils.createInterpretation("wills smith", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&type=all&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith) " +
-                                   "\"will smith\" \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'",
-                                   intentModel);
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
+                "query 'OR (AND willl smith) (AND will smith) " +
+                        "\"will smith\" \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'",
+                intentModel);
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java
index c12a3fb0e14..960eea5bba7 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java
@@ -13,10 +13,11 @@ import com.yahoo.text.interpretation.Interpretation;
 import com.yahoo.text.interpretation.Annotations;
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.component.chain.Chain;
-import org.junit.Assert;
 
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test utilities for QueryRewriteSearcher
  *
@@ -73,7 +74,7 @@ public class QueryRewriteSearcherTestUtils {
     public void assertRewrittenQuery(String origQuery, String finalQuery) {
         Query query = new Query(QueryTestCase.httpEncode(origQuery));
         Result result = execution.search(query);
-        Assert.assertEquals(finalQuery, result.getQuery().toString());
+        assertEquals(finalQuery, result.getQuery().toString());
     }
 
     /**
@@ -89,7 +90,7 @@ public class QueryRewriteSearcherTestUtils {
         Query query = new Query(origQuery);
         intentModel.setTo(query);
         Result result = execution.search(query);
-        Assert.assertEquals(finalQuery, result.getQuery().toString());
+        assertEquals(finalQuery, result.getQuery().toString());
     }
 
     /**
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
index 96626738c35..56797768f56 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
@@ -12,8 +12,8 @@ import com.yahoo.search.searchchain.SearchChainRegistry;
 import com.yahoo.search.query.rewrite.RewritesConfig;
 import com.yahoo.search.intent.model.*;
 import com.yahoo.component.chain.Chain;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Cases for SearchChainDispatcherSearcher
@@ -35,7 +35,7 @@ public class SearchChainDispatcherSearcherTestCase {
      * Load the QueryRewriteSearcher and prepare the
      * execution object
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         // Instantiate Name Rewriter
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(NAME_REWRITER_CONFIG_PATH);
@@ -70,26 +70,26 @@ public class SearchChainDispatcherSearcherTestCase {
      * Query will be rewritten twice
      */
     @Test
-    public void testMarketChain() {
+    void testMarketChain() {
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("wills smith", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith", 1.0,
-                                                             false, true));
+                utils.createInterpretation("wills smith", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith) " +
-                                   "\"will smith\" \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'",
-                                   intentModel);
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
+                "query 'OR (AND willl smith) (AND will smith) " +
+                        "\"will smith\" \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'",
+                intentModel);
     }
 
     /**
@@ -97,13 +97,13 @@ public class SearchChainDispatcherSearcherTestCase {
      * Query will be passed to next rewriter
      */
     @Test
-    public void testInvalidMarketChain() {
+    void testInvalidMarketChain() {
         utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=abc&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true",
-                                   "query 'AND will smith'");
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true",
+                "query 'AND will smith'");
     }
 
     /**
@@ -111,13 +111,13 @@ public class SearchChainDispatcherSearcherTestCase {
      * Query will be passed to next rewriter
      */
     @Test
-    public void testEmptyMarketChain() {
+    void testEmptyMarketChain() {
         utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true",
-                                   "query 'AND will smith'");
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true",
+                "query 'AND will smith'");
     }
 
     /**
@@ -125,7 +125,7 @@ public class SearchChainDispatcherSearcherTestCase {
      * should be executed
      */
     @Test
-    public void testChainContinuation() {
+    void testChainContinuation() {
         // Instantiate Name Rewriter
         RewritesConfig config = QueryRewriteSearcherTestUtils.createConfigObj(NAME_REWRITER_CONFIG_PATH);
         HashMap<String, File> fileList = new HashMap<>();
@@ -156,24 +156,24 @@ public class SearchChainDispatcherSearcherTestCase {
         new QueryRewriteSearcherTestUtils(execution);
 
         IntentModel intentModel = new IntentModel(
-                                  utils.createInterpretation("wills smith", 0.9,
-                                                             true, false),
-                                  utils.createInterpretation("will smith", 1.0,
-                                                             false, true));
+                utils.createInterpretation("wills smith", 0.9,
+                        true, false),
+                utils.createInterpretation("will smith", 1.0,
+                        false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
-                                   MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
-                                   "=true&" +
-                                   NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith) " +
-                                   "\"will smith\" \"will smith movies\" " +
-                                   "\"will smith news\" \"will smith imdb\" " +
-                                   "\"will smith lyrics\" \"will smith dead\" " +
-                                   "\"will smith nfl\" \"will smith new movie hancock\" " +
-                                   "\"will smith biography\"'",
-                                   intentModel);
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
+                MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
+                "=true&" +
+                NAME_REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV + "=true",
+                "query 'OR (AND willl smith) (AND will smith) " +
+                        "\"will smith\" \"will smith movies\" " +
+                        "\"will smith news\" \"will smith imdb\" " +
+                        "\"will smith lyrics\" \"will smith dead\" " +
+                        "\"will smith nfl\" \"will smith new movie hancock\" " +
+                        "\"will smith biography\"'",
+                intentModel);
     }
 
 }