Use appropriate stub methods

4 files changed, 7 insertions, 7 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
index 0d21bb54dc5..ae4c8de6c3f 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
@@ -52,7 +52,7 @@ public class QueryRewriteTestCase {
     public void testRankContributingTermsAreNotRemovedOnFullRecall() {
         Query query = new Query(QueryTestCase.httpEncode("?query=default:term1 OR default:term2 OR default:term3 OR sddocname:per&type=adv&recall=+id:1&restrict=per"));
         RecallSearcher searcher = new RecallSearcher();
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query);
         assertNull(result.hits().getError());
         assertNull(QueryCanonicalizer.canonicalize(query));
         assertRewritten(query, "AND (OR default:term1 default:term2 default:term3 sddocname:per) |id:1");
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java
index 5398f828820..409d01b5c46 100755
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java
@@ -41,7 +41,7 @@ public class RecallSearcherTestCase {
     public void testDenyRankItems() {
         RecallSearcher searcher = new RecallSearcher();
         Query query = new Query("?recall=foo");
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query);
         assertNotNull(result.hits().getError());
     }
 
@@ -60,7 +60,7 @@ public class RecallSearcherTestCase {
     private static void assertQueryTree(String query, List<String> ranked, List<String> unranked) {
         RecallSearcher searcher = new RecallSearcher();
         Query obj = new Query(query);
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(obj);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(obj);
         if (result.hits().getError() != null) {
             fail(result.hits().getError().toString());
         }
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 b6bf6661a46..01380a52a33 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
@@ -447,7 +447,7 @@ public class BlendingSearcherTestCase {
         BlendingSearcherWrapper searcher = setupFirstAndSecond();
         Query query = new Query("/search?query=banana&search=nonesuch");
 
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query);
         assertEquals(0, result.getConcreteHitCount());
         assertNotNull(result.hits().getError());
         ErrorMessage e = result.hits().getError();
@@ -462,7 +462,7 @@ public class BlendingSearcherTestCase {
         BlendingSearcherWrapper searcher = setupFirstAndSecond();
         Query query = new Query("/search?query=banana&search=nonesuch,orsuch");
 
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query);
         assertEquals(0, result.getConcreteHitCount());
         assertNotNull(result.hits().getError());
         ErrorMessage e = result.hits().getError();
@@ -477,7 +477,7 @@ public class BlendingSearcherTestCase {
         BlendingSearcherWrapper searcher = setupFirstAndSecond();
         Query query = new Query("/search?query=banana&search=first,nonesuch,second");
 
-        Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
+        Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query);
         assertEquals(3, result.getConcreteHitCount());
         assertEquals(300.0, result.hits().get(1).getRelevance().getScore(), delta);
         assertEquals(200.0, result.hits().get(2).getRelevance().getScore(), delta);
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java
index c754193ff72..91784c82800 100644
--- a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java
@@ -33,7 +33,7 @@ public class InputCheckingSearcherTestCase {
     @Before
     public void setUp() {
         execution = new Execution(new Chain<Searcher>(new InputCheckingSearcher(MetricReceiver.nullImplementation)),
-                                  Execution.Context.createContextStub(new IndexFacts()));
+                                  Execution.Context.createContextStub());
     }
 
     @After