Supply and use appropriate stub methods

8 files changed, 18 insertions, 16 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index 862f7625383..f424aceeffe 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -136,22 +136,27 @@ public class Execution extends com.yahoo.processing.execution.Execution {
             this(searchChainRegistry, indexFacts, tokenRegistry, rendererRegistry, linguistics, Runnable::run);
         }
 
-        /** Create a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
         public static Context createContextStub() {
             return createContextStub(null);
         }
 
-        /** Create a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
         public static Context createContextStub(IndexFacts indexFacts) {
             return createContextStub(null, indexFacts);
         }
 
-        /** Create a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
         public static Context createContextStub(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts) {
             return createContextStub(searchChainRegistry, indexFacts, null);
         }
 
-        /** Create a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        public static Context createContextStub(IndexFacts indexFacts, Linguistics linguistics) {
+            return createContextStub(null, indexFacts, linguistics);
+        }
+
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
         public static Context createContextStub(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts, Linguistics linguistics) {
             return new Context(searchChainRegistry != null ? searchChainRegistry : new SearchChainRegistry(),
                                indexFacts != null ? indexFacts : new IndexFacts(),
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
index 0c4bd4498c6..b3b96299b90 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
@@ -65,7 +65,7 @@ public class CJKSearcherTestCase {
         query.getModel().getQueryTree().setRoot(root);
 
         new Execution(new Chain<Searcher>(new CJKSearcher()),
-                      Execution.Context.createContextStub(null, indexFacts, linguistics)).search(query);
+                      Execution.Context.createContextStub(indexFacts, linguistics)).search(query);
         assertEquals(expected, query.getModel().getQueryTree().getRoot().toString());
     }
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java
index 324d06db060..dbdd3345719 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java
@@ -124,7 +124,7 @@ public class NormalizingSearcherTestCase {
 
     private Execution createExecution() {
         return new Execution(new NormalizingSearcher(linguistics),
-                             Execution.Context.createContextStub(null, createIndexFacts(), linguistics));
+                             Execution.Context.createContextStub(createIndexFacts(), linguistics));
     }
 
     private IndexFacts createIndexFacts() {
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
index 4b36dc52ba1..571991d7696 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
@@ -106,7 +106,7 @@ public class StemmingSearcherTestCase {
 
         Query q = new Query(QueryTestCase.httpEncode("?query=cars"));
         new Execution(new Chain<Searcher>(new StemmingSearcher(linguistics)),
-                      Execution.Context.createContextStub(null, indexFacts, linguistics)).search(q);
+                      Execution.Context.createContextStub(indexFacts, linguistics)).search(q);
         assertEquals("cars", q.getModel().getQueryTree().getRoot().toString());
     }
 
@@ -145,7 +145,7 @@ public class StemmingSearcherTestCase {
     }
 
     private Execution.Context newExecutionContext() {
-        return Execution.Context.createContextStub(null, indexFacts, linguistics);
+        return Execution.Context.createContextStub(indexFacts, linguistics);
     }
 
     private Execution newExecution() {
diff --git a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java
index 5c72436ec2d..526f520a583 100644
--- a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java
@@ -359,8 +359,7 @@ public class QueryTestCase {
 
     private Query newQueryFromEncoded(String encodedQueryString, Language language, Linguistics linguistics) {
         Query query = new Query(encodedQueryString);
-        query.getModel().setExecution(new Execution(Execution.Context.createContextStub(null,
-                                                                                        createIndexFacts(),
+        query.getModel().setExecution(new Execution(Execution.Context.createContextStub(createIndexFacts(),
                                                                                         linguistics)));
         query.getModel().setLanguage(language);
         return query;
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index e3f7786a52e..4b94df17fe0 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -1094,7 +1094,7 @@ public class QueryTestCase {
         }
         IndexFacts indexFacts = new IndexFacts(new IndexModel(sd));
         MockLinguistics mockLinguistics = new MockLinguistics();
-        q.getModel().setExecution(new Execution(Execution.Context.createContextStub(null, indexFacts, mockLinguistics)));
+        q.getModel().setExecution(new Execution(Execution.Context.createContextStub(indexFacts, mockLinguistics)));
         q.getModel().getQueryTree(); // cause parsing
         assertEquals(expectedDetectionText, mockLinguistics.detector.lastDetectionText);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
index 9d4b4c5735a..09d1dc71249 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
@@ -42,7 +42,7 @@ public class MinimalQueryInserterTestCase {
     @Before
     public void setUp() throws Exception {
         searchChain = new Chain<>(new MinimalQueryInserter());
-        context = Execution.Context.createContextStub(null, null, new SimpleLinguistics());
+        context = Execution.Context.createContextStub();
         execution = new Execution(searchChain, context);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
index 0728c5c5721..1010c43c2be 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
@@ -1001,7 +1001,7 @@ public class YqlParserTestCase {
 
             // Cause parsing :-\
             Chain<Searcher> searchChain = new Chain<>(new MinimalQueryInserter());
-            Execution.Context context = Execution.Context.createContextStub(null, null, new SimpleLinguistics());
+            Execution.Context context = Execution.Context.createContextStub();
             Execution execution = new Execution(searchChain, context);
             execution.search(query);
 
@@ -1077,9 +1077,7 @@ public class YqlParserTestCase {
         test.addIndex(hostField);
 
         Chain<Searcher> searchChain = new Chain<>(new MinimalQueryInserter());
-        Execution.Context context = Execution.Context.createContextStub(null,
-                                                                        new IndexFacts(new IndexModel(test)),
-                                                                        new SimpleLinguistics());
+        Execution.Context context = Execution.Context.createContextStub(new IndexFacts(new IndexModel(test)));
         Execution execution = new Execution(searchChain, context);
         execution.search(query);