diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-05-05 11:49:45 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-05-05 11:49:45 +0200 |
commit | 27e019f602da01ac331a535b7fbfd49190f1b761 (patch) | |
tree | 617cf1cc81e098f269e168b0c758f1e7ab8d2eda /config-model/src | |
parent | aa912c89d527a07ec136ed5a8ef5973569cef78a (diff) |
Refactor tests
Diffstat (limited to 'config-model/src')
3 files changed, 34 insertions, 19 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java index 2082028e654..671a9f6660d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java @@ -156,7 +156,7 @@ public class DocumentDatabaseTestCase { assertEquals(attributeField, acfg.attribute(0).name()); assertEquals(attributeField+"_nfa", acfg.attribute(1).name()); RankProfilesConfig rcfg = model.getConfig(RankProfilesConfig.class, configId); - assertEquals(7, rcfg.rankprofile().size()); + assertEquals(6, rcfg.rankprofile().size()); } @Test @@ -211,9 +211,16 @@ public class DocumentDatabaseTestCase { @Test public void requireThatRelevantConfigIsAvailableForClusterSearcher() { + String inputsProfile = + " rank-profile inputs {" + + " inputs {" + + " query(foo) tensor<float>(x[10])" + + " query(bar) tensor(key{},x[1000])" + + " }" + + " }"; List<String> schemas = List.of("type1", "type2"); var tester = new SchemaTester(); - VespaModel model = tester.createModel(schemas); + VespaModel model = tester.createModelWithRankProfile(inputsProfile, schemas); String searcherId = "container/searchchains/chain/test/component/com.yahoo.prelude.cluster.ClusterSearcher"; { // documentdb-info config diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java index 239bab63904..d92561f3123 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTestCase.java @@ -14,9 +14,16 @@ public class SchemaInfoTestCase { /** Schema-info should contain all schemas, independent of clusters. */ @Test public void requireThatSchemaInfoIsAvailable() { + String inputs = + " rank-profile inputs {" + + " inputs {" + + " query(foo) tensor<float>(x[10])" + + " query(bar) tensor(key{},x[1000])" + + " }" + + " }"; List<String> schemas = List.of("type1", "type2"); var tester = new SchemaTester(); - var model = tester.createModel(schemas); + var model = tester.createModelWithRankProfile(inputs, schemas); assertSchemaInfo("container/searchchains/chain/test/component/com.yahoo.prelude.cluster.ClusterSearcher", model, tester); assertSchemaInfo("container", model, tester); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java index cc0202f5dfd..7a077c1a0aa 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaTester.java @@ -81,7 +81,7 @@ public class SchemaTester { void assertSingleSD(String mode) { List<String> sds = List.of("type1"); VespaModel model = new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(sds, mode), - generateSchemas(sds)).create(); + generateSchemas("", sds)).create(); IndexedSearchCluster indexedSearchCluster = (IndexedSearchCluster)model.getSearchClusters().get(0); ContentSearchCluster contentSearchCluster = model.getContentClusters().get("test").getSearch(); assertEquals(1, indexedSearchCluster.getDocumentDbs().size()); @@ -95,7 +95,13 @@ public class SchemaTester { VespaModel createModel(List<String> schemas) { return new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(schemas, "index"), - generateSchemas(schemas)).create(); + generateSchemas("", schemas)).create(); + } + + VespaModel createModelWithRankProfile(String rankProfile, List<String> schemas) { + return new VespaModelCreatorWithMockPkg(vespaHosts, + createVespaServices(schemas, "index"), + generateSchemas(rankProfile, schemas)).create(); } VespaModel createModel(List<DocType> nameAndModes, String xmlTuning) { @@ -105,14 +111,14 @@ public class SchemaTester { VespaModel createModelWithMode(String mode, List<String> schemas) { return new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(schemas, mode), - generateSchemas(schemas)).create(); + generateSchemas("", schemas)).create(); } VespaModel createModelWithMode(String mode, List<String> schemas, DeployState.Builder builder) { return new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(schemas, mode), - generateSchemas(schemas)).create(builder); + generateSchemas("", schemas)).create(builder); } VespaModel createModel(List<DocType> nameAndModes, String xmlTuning, DeployState.Builder builder) { @@ -121,11 +127,11 @@ public class SchemaTester { sds.add(nameAndMode.getType()); } var creator = new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServicesXml(nameAndModes, xmlTuning), - generateSchemas(sds)); + generateSchemas("", sds)); return builder != null ? creator.create(builder) : creator.create(); } - public static String generateSchema(String name, String field1, String field2) { + public static String generateSchema(String name, String field1, String field2, String rankProfile) { return "schema " + name + " {" + " document " + name + " {" + " field " + field1 + " type string {\n" + @@ -153,24 +159,19 @@ public class SchemaTester { " first-phase { expression: attribute(" + field2 + ") }\n" + " rank-features: attribute(" + field2 + ")" + " }" + - " rank-profile inputs {" + - " inputs {" + - " query(foo) tensor<float>(x[10])" + - " query(bar) tensor(key{},x[1000])" + - " }" + - " }" + + rankProfile + "}"; } - public static List<String> generateSchemas(String ... sdNames) { - return generateSchemas(Arrays.asList(sdNames)); + public static List<String> generateSchemas(String rankProfile, String ... sdNames) { + return generateSchemas(rankProfile, Arrays.asList(sdNames)); } - public static List<String> generateSchemas(List<String> sdNames) { + public static List<String> generateSchemas(String rankProfile, List<String> sdNames) { List<String> sds = new ArrayList<>(); int i = 0; for (String sdName : sdNames) { - sds.add(generateSchema(sdName, "f" + (i + 1), "f" + (i + 2))); + sds.add(generateSchema(sdName, "f" + (i + 1), "f" + (i + 2), rankProfile)); i = i + 2; } return sds; |