diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-10-10 11:54:36 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-10-10 11:54:36 +0200 |
commit | 30daa72c29711b188b7f2cd3c30a83255021d068 (patch) | |
tree | 6ee9c89f3d5360f0e02468e19c22072d0600e7f0 /container-search/src | |
parent | 9a464a5ccead9fa615c022aa4701fd36d4c0b251 (diff) |
Use appropriate stub methods
Diffstat (limited to 'container-search/src')
14 files changed, 14 insertions, 57 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java index e27450c1bb4..da93e0e845b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java @@ -81,10 +81,7 @@ public class FastSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Collections.emptyList()), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java index 31e4e09f051..45ae8241696 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java @@ -146,10 +146,7 @@ public class PartialFillTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private void doFill(Searcher searcher, Result result, String summaryClass) { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java index 0efec5521f1..79756d2eec4 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java @@ -417,10 +417,7 @@ public class FieldCollapsingSearcherTestCase { } private Execution createExecution(Searcher searcher, Map<Searcher, Searcher> chained) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher, chained), context); + return new Execution(chainedAsSearchChain(searcher, chained), Execution.Context.createContextStub()); } /** diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java index 3785933bddc..43911b33161 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java @@ -190,10 +190,7 @@ public class PosSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java index 6ca91253683..2a7e9da2992 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java @@ -136,10 +136,7 @@ public class QuotingSearcherTestCase { } private Execution createExecution(Searcher searcher, Map<Searcher, Searcher> chained) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher, chained), context); + return new Execution(chainedAsSearchChain(searcher, chained), Execution.Context.createContextStub()); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java index 4fd709ce246..5e3c4897d73 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java @@ -62,10 +62,7 @@ public class ValidatePredicateSearcherTestCase { index.addCommand(command); searchDefinition.addIndex(index); IndexFacts indexFacts = new IndexFacts(new IndexModel(searchDefinition)); - Execution.Context context = new Execution.Context(null, indexFacts, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(searcher, context).search(query); + return new Execution(searcher, Execution.Context.createContextStub(indexFacts)).search(query); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java index 292026e4fe9..84b8ef32871 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java @@ -110,10 +110,7 @@ public class ValidateSortingSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java index ab6d44aaca3..ac1791ae91a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java @@ -100,10 +100,7 @@ public class BacktrackingTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java index 69eb31ac33d..80c9e898302 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java @@ -128,10 +128,7 @@ public class ConfigurationTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java index 7bab9e115fa..b32752da070 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java @@ -172,10 +172,7 @@ public class InheritanceTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java index e17caf2b849..0e5d58a0a80 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java @@ -69,11 +69,7 @@ public abstract class RuleBaseAbstractTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), - Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java index 2840060ae86..f738f0ab38a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java @@ -178,10 +178,7 @@ public class SemanticSearcherTestCase extends RuleBaseAbstractTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java index 71b46e8235c..665121cc658 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java @@ -230,10 +230,7 @@ public class ValidateNearestNeighborTestCase { query.getRanking().getFeatures().put("query(qvector)", qTensor); SearchDefinition searchDefinition = new SearchDefinition("document"); IndexFacts indexFacts = new IndexFacts(new IndexModel(searchDefinition)); - Execution.Context context = new Execution.Context(null, indexFacts, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(searcher, context).search(query); + return new Execution(searcher, Execution.Context.createContextStub(indexFacts)).search(query); } } diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 8ecd823f371..dfcbb77b08e 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -106,10 +106,7 @@ public class ValidateMatchPhaseSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(Runnable::run), - new SimpleLinguistics(), Runnable::run); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { |