Supply and use appropriate stub methods

12 files changed, 32 insertions, 25 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 f424aceeffe..c507069b948 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
@@ -138,12 +138,17 @@ public class Execution extends com.yahoo.processing.execution.Execution {
 
         /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
         public static Context createContextStub() {
-            return createContextStub(null);
+            return createContextStub(null, null, null);
+        }
+
+        /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
+        public static Context createContextStub(SearchChainRegistry searchChainRegistry) {
+            return createContextStub(searchChainRegistry, null, null);
         }
 
         /** 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);
+            return createContextStub(null, indexFacts, null);
         }
 
         /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/
@@ -157,7 +162,9 @@ public class Execution extends com.yahoo.processing.execution.Execution {
         }
 
         /** 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) {
+        public static Context createContextStub(SearchChainRegistry searchChainRegistry,
+                                                IndexFacts indexFacts,
+                                                Linguistics linguistics) {
             return new Context(searchChainRegistry != null ? searchChainRegistry : new SearchChainRegistry(),
                                indexFacts != null ? indexFacts : new IndexFacts(),
                                null,
diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
index 06bea76dc39..b6bf6661a46 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
@@ -89,14 +89,14 @@ public class BlendingSearcherTestCase {
             query.setTimeout(10000);
             query.setOffset(query.getOffset());
             query.setHits(query.getHits());
-            Execution exec = new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry, null));
+            Execution exec = new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry));
             exec.context().populateFrom(execution.context());
             return exec.search(query);
         }
 
         @Override
         public void fill(Result result, String summaryClass, Execution execution) {
-            new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry, null)).fill(result, summaryClass);
+            new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry)).fill(result, summaryClass);
         }
 
         public boolean initialize() {
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
index d7c3217069c..8c7e5fd59c6 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
@@ -120,7 +120,7 @@ public class FederationSearcherTestCase {
         defaultProfile.freeze();
         Query q = new Query(QueryTestCase.httpEncode("?query=test"), defaultProfile.compile(null));
 
-        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q);
+        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q);
         assertNull(result.hits().getError());
         assertEquals("source:mySource1", result.hits().get(0).getId().stringValue());
         assertEquals("source:mySource2", result.hits().get(1).getId().stringValue());
@@ -132,7 +132,7 @@ public class FederationSearcherTestCase {
 
         Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1"));
 
-        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null));
+        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry));
         Result result = execution.search(q);
         assertNull(result.hits().getError());
         TwoSourceChecker lookForTraces = new TwoSourceChecker();
@@ -173,7 +173,7 @@ public class FederationSearcherTestCase {
 
         Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1&sources=source1"));
 
-        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null));
+        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry));
         Result result = execution.search(q);
         assertNull(result.hits().getError());
         TwoSourceChecker lookForTraces = new TwoSourceChecker();
@@ -188,7 +188,7 @@ public class FederationSearcherTestCase {
 
         Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1&sources=source1"));
 
-        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null));
+        Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry));
         Result result = execution.search(q);
         assertNull(result.hits().getError());
         TwoSourceChecker lookForTraces = new TwoSourceChecker();
@@ -235,7 +235,7 @@ public class FederationSearcherTestCase {
 
         Query q = new Query(QueryTestCase.httpEncode("?query=test&source.mySource1.presentation.summary=nalle&source.mySource1.customSourceProperty=foo&source.mySource2.custom.source.property=bar&source.mySource1.hits=13&source.mySource1.offset=1"));
 
-        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q);
+        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q);
         assertNull(result.hits().getError());
         return result;
     }
@@ -254,19 +254,19 @@ public class FederationSearcherTestCase {
         addChained(new QueryCheckSearcher(query), sourceName);
         addChained(new MockSearcher(), "mySource1");
         Chain<Searcher> mainChain = new Chain<>("default", createStrictFederationSearcher());
-        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query);
+        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query);
         HitGroup h = (HitGroup) result.hits().get(0);
         assertNull(h.getErrorHit());
         assertSame(QueryCheckSearcher.OK, h.get(0).getField(QueryCheckSearcher.STATUS));
 
         mainChain = new Chain<>("default", createFederationSearcher());
-        result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query);
+        result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query);
         h = (HitGroup) result.hits().get(0);
         assertSame(QueryCheckSearcher.FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY, h.getError().getDetailedMessage());
 
         query = new Query(QueryTestCase.httpEncode("?query=test&sources=" + sourceName + ",mySource1"));
         addChained(new QueryCheckSearcher(query), sourceName);
-        result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query);
+        result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query);
         h = (HitGroup) result.hits().get(0);
         assertEquals("source:" + sourceName, h.getId().stringValue());
         assertSame(QueryCheckSearcher.FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY, h.getError().getDetailedMessage());
@@ -281,7 +281,7 @@ public class FederationSearcherTestCase {
 
         Query q = new Query("?query=test");
 
-        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q);
+        Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q);
         assertNull(result.hits().getError());
         assertEquals("source:mySource1", result.hits().get(0).getId().stringValue());
         assertEquals("source:mySource2", result.hits().get(1).getId().stringValue());
@@ -333,7 +333,7 @@ public class FederationSearcherTestCase {
         QueryProfile profile = new QueryProfile("test");
         profile.set("source.news.provider", providerName, null);
         Query query = new Query(QueryTestCase.httpEncode("?query=test&model.sources=news"), profile.compile(null));
-        Result result = new Execution(registry.getComponent("default"), Execution.Context.createContextStub(registry, null)).search(query);
+        Result result = new Execution(registry.getComponent("default"), Execution.Context.createContextStub(registry)).search(query);
         assertEquals(1, result.hits().size());
         assertNotNull(result.hits().get(providerName + ":1"));
     }
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
index 7a9d5f3a4f0..15464362f41 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
@@ -68,7 +68,7 @@ class FederationTester {
 
     private Execution createExecution() {
         registry.freeze();
-        return new Execution(new Chain<Searcher>(buildFederationSearcher()), Execution.Context.createContextStub(registry, null));
+        return new Execution(new Chain<Searcher>(buildFederationSearcher()), Execution.Context.createContextStub(registry));
     }
 
     public void fill(Result result) {
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 0eaa87ee32f..bf204cf3d6b 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
@@ -61,7 +61,7 @@ public class SearchChainDispatcherSearcherTestCase {
 
         // Create a chain containing only the dispatcher
         Chain<Searcher> mainSearchChain = new Chain<>(searchChainDispatcher);
-        Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry, null));
+        Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry));
         utils = new QueryRewriteSearcherTestUtils(execution);
     }
 
@@ -152,7 +152,7 @@ public class SearchChainDispatcherSearcherTestCase {
 
         // Create a chain containing only the dispatcher
         Chain<Searcher> mainSearchChain = new Chain<>(searchers);
-        Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry, null));
+        Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry));
         new QueryRewriteSearcherTestUtils(execution);
 
         IntentModel intentModel = new IntentModel(
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java b/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java
index 7ac6ded7877..341e55df777 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java
@@ -71,7 +71,7 @@ public class VespaAsyncSearcherTest {
     @Test
     public void testAsyncExecution() {
         Chain<Searcher> chain = new Chain<>(new FirstSearcher(), new SecondSearcher());
-        Execution execution = new Execution(chain, Execution.Context.createContextStub(null));
+        Execution execution = new Execution(chain, Execution.Context.createContextStub());
         Query query = new Query();
         execution.search(query);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
index af4194562b0..129437a5429 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java
@@ -163,7 +163,7 @@ public class ExecutionTestCase {
     @Test
     public void testBasicFill() {
         Chain<Searcher> chain = new Chain<Searcher>(new FillableResultSearcher());
-        Execution execution = new Execution(chain, Execution.Context.createContextStub(null));
+        Execution execution = new Execution(chain, Execution.Context.createContextStub());
 
         Result result = execution.search(new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?presentation.summary=all")));
         assertNotNull(result.hits().get("a"));
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
index 573c8ca9790..9c36971f688 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
@@ -50,7 +50,7 @@ public class FutureDataTestCase {
 
         Query query = new Query();
         query.setTimeout(5000);
-        Result result = new Execution(main, Execution.Context.createContextStub(searchChainRegistry,null)).search(query);
+        Result result = new Execution(main, Execution.Context.createContextStub(searchChainRegistry)).search(query);
         assertNotNull(result);
 
         HitGroup syncGroup = (HitGroup)result.hits().get("source:sync");
diff --git a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java
index 8bcd0d3ec4c..b1093e54b68 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java
@@ -43,7 +43,7 @@ public class FieldFilterTestCase {
         mockBackend.addResult(query, result);
 
         searchChain = new Chain<Searcher>(new FieldFilter(), mockBackend);
-        context = Execution.Context.createContextStub(null);
+        context = Execution.Context.createContextStub();
         execution = new Execution(searchChain, context);
 
     }
diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
index 6c28ff5c439..3eb6f5e7e38 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java
@@ -33,7 +33,7 @@ public class UserInputTestCase {
     @Before
     public void setUp() throws Exception {
         searchChain = new Chain<>(new MinimalQueryInserter());
-        context = Execution.Context.createContextStub(null);
+        context = Execution.Context.createContextStub();
         execution = new Execution(searchChain, context);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
index c96175a0d92..0cf5ea75526 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
@@ -61,7 +61,7 @@ public class YqlFieldAndSourceTestCase {
                                                                .documentdb(buildDocumentdbArray()));
 
         searchChain = new Chain<>(new FieldFiller(config), mockBackend);
-        context = Execution.Context.createContextStub(null);
+        context = Execution.Context.createContextStub();
         execution = new Execution(searchChain, context);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
index 6c2ff66cd9c..c407945ee15 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
@@ -23,7 +23,7 @@ public class MetricsSearcherTestCase {
     private MetricsSearcher metricsSearcher = new MetricsSearcher();
     private MockBackend backend = new MockBackend();
     private Chain<Searcher> chain = new Chain<>(metricsSearcher, backend);
-    private Execution.Context context = Execution.Context.createContextStub(null);
+    private Execution.Context context = Execution.Context.createContextStub();
     private MetricsSearcher.Stats expStatsLt1 = new MetricsSearcher.Stats();
     private static final String LOADTYPE1 = "lt1";
     private MetricsSearcher.Stats expStatsLt2 = new MetricsSearcher.Stats();