diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo')
3 files changed, 9 insertions, 23 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index 4adbce3add9..1668edd081f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -488,7 +488,6 @@ public class ClusterSearcherTestCase { return new ClusterSearcher(new ComponentId("test-id"), new InThreadExecutorService(), - qrSearchersConfig.build(), clusterConfig.build(), documentDbConfig.build(), new SchemaInfo(List.of(schema.build()), List.of()), 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 7b0e1867650..b889119171e 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 @@ -3,7 +3,6 @@ package com.yahoo.prelude.searcher.test; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.container.QrSearchersConfig; import com.yahoo.prelude.searcher.ValidateSortingSearcher; import com.yahoo.search.Query; import com.yahoo.search.Result; @@ -30,14 +29,10 @@ public class ValidateSortingSearcherTestCase { @SuppressWarnings("deprecation") public ValidateSortingSearcherTestCase() { - QrSearchersConfig.Builder qrsCfg = new QrSearchersConfig.Builder(); - qrsCfg.searchcluster(new QrSearchersConfig.Searchcluster.Builder().name("giraffes")); - ClusterConfig.Builder clusterCfg = new ClusterConfig.Builder(). - clusterId(0). - clusterName("test"); + ClusterConfig.Builder clusterCfg = new ClusterConfig.Builder() + .clusterName("giraffes"); String attributesCfg = "file:src/test/java/com/yahoo/prelude/searcher/test/validate_sorting.cfg"; - searcher = new ValidateSortingSearcher(new QrSearchersConfig(qrsCfg), - new ClusterConfig(clusterCfg), + searcher = new ValidateSortingSearcher(new ClusterConfig(clusterCfg), ConfigGetter.getConfig(AttributesConfig.class, attributesCfg)); } @@ -82,7 +77,6 @@ public class ValidateSortingSearcherTestCase { return transform(QueryTestCase.httpEncode(sorting), null); } - @SuppressWarnings("deprecation") private String transform(String sorting, String language) { String q = "/?query=a"; if (sorting != null) { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java index fbab022c084..edce8112f21 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java @@ -2,7 +2,6 @@ package com.yahoo.search.grouping; import com.yahoo.vespa.config.search.AttributesConfig; -import com.yahoo.container.QrSearchersConfig; import com.yahoo.search.Query; import com.yahoo.search.config.ClusterConfig; import com.yahoo.search.grouping.request.GroupingOperation; @@ -191,17 +190,11 @@ public class GroupingValidatorTestCase { } private static void validateGrouping(String clusterName, AttributesConfig attributesConfig, Query query) { - QrSearchersConfig.Builder qrsConfig = new QrSearchersConfig.Builder().searchcluster( - new QrSearchersConfig.Searchcluster.Builder() - .indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.REALTIME) - .name(clusterName)); - ClusterConfig.Builder clusterConfig = new ClusterConfig.Builder(). - clusterId(0). - clusterName("test"); - new Execution( - new GroupingValidator(new QrSearchersConfig(qrsConfig), - new ClusterConfig(clusterConfig), - attributesConfig), - Execution.Context.createContextStub()).search(query); + ClusterConfig.Builder clusterConfig = new ClusterConfig.Builder() + .clusterName(clusterName) + .indexMode(ClusterConfig.IndexMode.Enum.INDEX); + new Execution(new GroupingValidator(clusterConfig.build(), attributesConfig), + Execution.Context.createContextStub()) + .search(query); } } |