1 files changed, 10 insertions, 10 deletions
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"));
     }