Supply and use appropriate stub methods

3 files changed, 4 insertions, 6 deletions

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);