diff options
Diffstat (limited to 'config-model/src/test/java/com')
9 files changed, 71 insertions, 103 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index b1d90b07b9d..5ead9812b56 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -2480,7 +2480,7 @@ public class ModelProvisioningTest { private long protonMemorySize(ContentCluster cluster) { ProtonConfig.Builder b = new ProtonConfig.Builder(); - cluster.getSearch().getIndexed().getSearchNode(0).getConfig(b); + cluster.getSearch().getSearchCluster().getSearchNode(0).getConfig(b); return b.build().hwinfo().memory().size(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java index d3e62dae947..2879baf7b88 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java @@ -29,7 +29,7 @@ public class StreamingValidatorTest { new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/document_references_validation/") .create(); }); - assertTrue(exception.getMessage().contains("For search cluster 'content.ad', streaming schema 'ad': Attribute 'campaign_ref' has type 'Reference<campaign>'. " + + assertTrue(exception.getMessage().contains("For search cluster 'content', streaming schema 'ad': Attribute 'campaign_ref' has type 'Reference<campaign>'. " + "Document references and imported fields are not allowed in streaming search.")); } @@ -52,7 +52,7 @@ public class StreamingValidatorTest { "attribute { distance-metric: euclidean } }"); var warnings = filter(logger.warnings); assertEquals(1, warnings.size()); - assertEquals("For search cluster 'content.test', streaming schema 'test', SD field 'nn': hnsw index is not relevant and not supported, ignoring setting", + assertEquals("For search cluster 'content', streaming schema 'test', SD field 'nn': hnsw index is not relevant and not supported, ignoring setting", warnings.get(0)); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java index ee64ceb6969..28eabd18539 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StreamingSchemaClusterChangeValidatorTest.java @@ -92,9 +92,9 @@ public class StreamingSchemaClusterChangeValidatorTest { private static final String ATTRIBUTE_INT_FIELD = "field f1 type int { indexing: attribute | summary }"; private static final String ATTRIBUTE_FAST_ACCESS_INT_FIELD = "field f1 type int { indexing: attribute | summary \n attribute: fast-access }"; private static final List<ServiceInfo> FOO_SERVICE = - List.of(new ServiceInfo("searchnode", "null", null, null, "foo/search/0", "null")); + List.of(new ServiceInfo("searchnode", "null", null, null, "foo/search/cluster.foo/0", "null")); private static final List<ServiceInfo> BAR_SERVICE = - List.of(new ServiceInfo("searchnode2", "null", null, null, "bar/search/0", "null")); + List.of(new ServiceInfo("searchnode2", "null", null, null, "bar/search/cluster.bar/0", "null")); @Test void changing_field_type_requires_refeed() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java index e531087ebd6..91ba97817d6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java @@ -44,7 +44,7 @@ public abstract class ContentClusterFixture { } protected DocumentDatabase currentDb() { - return currentCluster.getSearch().getIndexed().getDocumentDbs().get(0); + return currentCluster.getSearch().getSearchCluster().getDocumentDbs().get(0); } protected NewDocumentType currentDocType() { @@ -52,7 +52,7 @@ public abstract class ContentClusterFixture { } protected DocumentDatabase nextDb() { - return nextCluster.getSearch().getIndexed().getDocumentDbs().get(0); + return nextCluster.getSearch().getSearchCluster().getDocumentDbs().get(0); } protected NewDocumentType nextDocType() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 440e7a92ea1..fac82f3e675 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -62,8 +62,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertTrue(s.getClusters().isEmpty()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof com.yahoo.vespa.model.content.engines.DummyPersistence.Factory); } @@ -82,8 +81,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertTrue(s.getClusters().isEmpty()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof ProtonEngine.Factory); @@ -107,8 +105,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertTrue(s.getClusters().isEmpty()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof ProtonEngine.Factory); @@ -129,9 +126,8 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertTrue(s.getClusters().isEmpty()); - assertNull(s.getIndexed()); + assertFalse(s.hasSearchCluster()); + assertNull(s.getSearchCluster()); assertNull(a.getRootGroup().getName()); assertNull(a.getRootGroup().getIndex()); @@ -150,11 +146,10 @@ public class ContentBuilderTest extends DomBuilderTest { ContentCluster c = CollectionUtil.first(m.getContentClusters().values()); ContentSearchCluster s = c.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertEquals(1, s.getClusters().size()); - assertNotNull(s.getIndexed()); - assertEquals("clu", s.getIndexed().getClusterName()); - assertEquals(7.3, s.getIndexed().getQueryTimeout(), 0.0); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); + assertEquals("clu", s.getSearchCluster().getClusterName()); + assertEquals(7.3, s.getSearchCluster().getQueryTimeout(), 0.0); assertTrue(c.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, c.getStorageCluster().getChildren().size()); @@ -175,7 +170,7 @@ public class ContentBuilderTest extends DomBuilderTest { String services = getServices("<node hostalias='mockhost' distribution-key='0'/>" + "<node hostalias='mockhost' distribution-key='1'/>"); VespaModel m = new VespaModelCreatorWithMockPkg(createAppWithMusic(getHosts(), services)).create(); - IndexedSearchCluster sc = m.getContentClusters().get("clu").getSearch().getIndexed(); + IndexedSearchCluster sc = m.getContentClusters().get("clu").getSearch().getSearchCluster(); assertEquals(2, sc.getSearchNodeCount()); } @@ -196,11 +191,9 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = cluster.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertEquals(1, s.getClusters().size()); - assertNull(s.getIndexed()); - SearchCluster sc = s.getClusters().get(musicClusterId + ".music"); - assertEquals(musicClusterId + ".music", sc.getClusterName()); + assertTrue(s.hasSearchCluster()); + SearchCluster sc = s.getSearchCluster(); + assertEquals(musicClusterId, sc.getClusterName()); assertEquals(musicClusterId, sc.getStorageRouteSpec()); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); @@ -236,24 +229,11 @@ public class ContentBuilderTest extends DomBuilderTest { " <node hostalias=\"mockhost\" distribution-key=\"0\"/>" + " </group>" + "</content>"); - ContentSearchCluster s; - - s = cluster.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertEquals(2, s.getClusters().size()); - assertNull(s.getIndexed()); - { - String id = musicClusterId + ".book"; - SearchCluster sc = s.getClusters().get(id); - assertEquals(id, sc.getClusterName()); - assertEquals(musicClusterId, sc.getStorageRouteSpec()); - } - { - String id = musicClusterId + ".music"; - SearchCluster sc = s.getClusters().get(id); - assertEquals(id, sc.getClusterName()); - assertEquals(musicClusterId, sc.getStorageRouteSpec()); - } + ContentSearchCluster s = cluster.getSearch(); + assertTrue(s.hasSearchCluster()); + assertEquals(2, s.getSearchCluster().getDocumentDbs().size()); + assertTrue(s.getSearchCluster().hasDocumentDB("book")); + assertTrue(s.getSearchCluster().hasDocumentDB("music")); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, cluster.getStorageCluster().getChildren().size()); @@ -276,10 +256,9 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertEquals(1, s.getClusters().size()); - assertNotNull(s.getIndexed()); - assertEquals("b", s.getIndexed().getClusterName()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); + assertEquals("b", s.getSearchCluster().getClusterName()); assertTrue(b.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, b.getStorageCluster().getChildren().size()); @@ -308,8 +287,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getMmapNoCoreLimit().isPresent()); assertEquals(200000, b.getRootGroup().getMmapNoCoreLimit().get().longValue()); @@ -334,8 +313,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(1, b.getStorageCluster().getChildren().size()); assertEquals(1, s.getSearchNodes().size()); @@ -363,8 +342,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>", new TestProperties().setEnvironmentVariables(List.of("MY_1_ENV=xyz abc", "MY_2_ENV=2"))); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(1, b.getStorageCluster().getChildren().size()); assertEquals(1, s.getSearchNodes().size()); @@ -389,8 +368,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getCoreOnOOM().isPresent()); assertTrue(b.getRootGroup().getCoreOnOOM().get()); @@ -414,8 +393,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); @@ -438,8 +417,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getMmapNoCoreLimit().isPresent()); @@ -462,8 +441,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); @@ -488,8 +467,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(4, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getNoVespaMalloc().isPresent()); assertEquals("proton", b.getRootGroup().getNoVespaMalloc().get()); @@ -522,8 +501,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(4, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getNoVespaMalloc().isPresent()); assertFalse(b.getRootGroup().getVespaMalloc().isPresent()); @@ -553,8 +532,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent()); assertEquals(0, b.getStorageCluster().getChildren().get("0").getAffinity().get().cpuSocket()); @@ -588,8 +567,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(6, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().useCpuSocketAffinity()); @@ -627,18 +606,17 @@ public class ContentBuilderTest extends DomBuilderTest { void requireBug5357273() { try { createContent( - " <content version='1.0' id='storage'>\n" + - " <redundancy>3</redundancy>\n" + - " <documents>" + - " <document type='music' mode='index'/>" + - " </documents>" + - " <group>\n" + - " <node hostalias='mockhost' distribution-key='0' />\n" + - " </group>\n" + - " <engine>\n" + - " <dummy/>\n" + - " </engine>\n" + - " </content>\n"); + """ + <content version='1.0' id='storage'> + <redundancy>3</redundancy> + <documents> <document type='music' mode='index'/> </documents> <group> + <node hostalias='mockhost' distribution-key='0' /> + </group> + <engine> + <dummy/> + </engine> + </content> + """); fail(); } catch (Exception e) { @@ -716,8 +694,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ProtonConfig.Builder builder = new ProtonConfig.Builder(); - content.getSearch().getIndexed().getSearchNode(0).cascadeConfig(builder); - content.getSearch().getIndexed().getSearchNode(0).addUserConfig(builder); + content.getSearch().getSearchCluster().getSearchNode(0).cascadeConfig(builder); + content.getSearch().getSearchCluster().getSearchNode(0).addUserConfig(builder); ProtonConfig config = new ProtonConfig(builder); assertEquals(1, config.search().mmap().options().size()); assertEquals(ProtonConfig.Search.Mmap.Options.POPULATE, config.search().mmap().options(0)); @@ -847,8 +825,8 @@ public class ContentBuilderTest extends DomBuilderTest { private ProtonConfig getProtonConfig(ContentCluster content) { ProtonConfig.Builder configBuilder = new ProtonConfig.Builder(); - content.getSearch().getIndexed().getSearchNode(0).cascadeConfig(configBuilder); - content.getSearch().getIndexed().getSearchNode(0).addUserConfig(configBuilder); + content.getSearch().getSearchCluster().getSearchNode(0).cascadeConfig(configBuilder); + content.getSearch().getSearchCluster().getSearchNode(0).addUserConfig(configBuilder); return new ProtonConfig(configBuilder); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java index 8f02cf7a6d4..02a7a946e17 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.container.search.searchchain; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.vespa.config.search.AttributesConfig; -import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.search.config.IndexInfoConfig; @@ -28,18 +27,13 @@ public class MockSearchClusters { @Override public void deriveFromSchemas(DeployState deployState) { } - @Override public List<DocumentDatabase> getDocumentDbs() {return List.of();} + @Override public List<DocumentDatabase> getDocumentDbs() { return List.of(); } @Override public void getConfig(AttributesConfig.Builder builder) {} @Override public void getConfig(DocumentdbInfoConfig.Builder builder) {} @Override public void getConfig(IndexInfoConfig.Builder builder) {} @Override public void getConfig(IlscriptsConfig.Builder builder) {} @Override public void getConfig(SchemaInfoConfig.Builder builder) {} - @Override - protected SearchCluster.IndexingMode getIndexingMode() { - return streaming ? SearchCluster.IndexingMode.STREAMING : SearchCluster.IndexingMode.REALTIME; - } - } public static SearchCluster mockSearchCluster(AbstractConfigProducerRoot root, String clusterName, int clusterIndex, boolean isStreaming) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index 6f9127779db..e9e96d8b0cf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -113,7 +113,7 @@ public class IndexedTest extends ContentBaseTest { VespaModelCreatorWithMockPkg creator = getIndexedVespaModelCreator(); VespaModel model = creator.create(); DeployState deployState = creator.deployState; - IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getIndexed(); + IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getSearchCluster(); assertEquals(3, cluster.getDocumentDbs().size()); NewDocumentType type1 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type1"); NewDocumentType type2 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type2"); @@ -163,7 +163,6 @@ public class IndexedTest extends ContentBaseTest { // "transactionlogserver"}; // DomContentBuilderTest.assertServices(h, expectedServices); ContentCluster s = model.getContentClusters().get("test"); - assertFalse(s.getSearch().hasIndexedCluster()); StorServerConfig.Builder builder = new StorServerConfig.Builder(); s.getStorageCluster().getConfig(builder); @@ -175,7 +174,6 @@ public class IndexedTest extends ContentBaseTest { VespaModel model = getStreamingVespaModel(); ContentCluster s = model.getContentClusters().get("test"); assertNotNull(s); - assertFalse(s.getSearch().hasIndexedCluster()); ClusterListConfig config = model.getConfig(ClusterListConfig.class, VespaModel.ROOT_CONFIGID); assertEquals(1, config.storage().size()); assertEquals("test", config.storage(0).name()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java index 0cdcf0534c2..8b83c941631 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java @@ -30,7 +30,7 @@ public class ClusterTest { " <query-timeout>1.1</query-timeout>", " <visibility-delay>2.3</visibility-delay>", "</search>")); - SearchCluster searchCluster = cluster.getSearch().getIndexed(); + SearchCluster searchCluster = cluster.getSearch().getSearchCluster(); assertNotNull(searchCluster); assertEquals(1.1, searchCluster.getQueryTimeout(), DELTA); assertEquals(2.3, searchCluster.getVisibilityDelay(), DELTA); 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 d3741405c15..b4c625a599b 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 @@ -309,7 +309,7 @@ public class DocumentDatabaseTestCase { var tester = new SchemaTester(); var model = tester.createModelWithMode(mode, sds); - DocumentdbInfoConfig dcfg = model.getConfig(DocumentdbInfoConfig.class, "test/search/cluster.test.type"); + DocumentdbInfoConfig dcfg = model.getConfig(DocumentdbInfoConfig.class, "test/search/cluster.test"); assertEquals(1, dcfg.documentdb().size()); DocumentdbInfoConfig.Documentdb db = dcfg.documentdb(0); assertEquals("type", db.name()); @@ -328,13 +328,11 @@ public class DocumentDatabaseTestCase { var tester = new SchemaTester(); var model = tester.createModel(sds, ""); DocumentdbInfoConfig indexed_cfg = model.getConfig(DocumentdbInfoConfig.class, "test/search/cluster.test"); - assertEquals(1, indexed_cfg.documentdb().size()); + assertEquals(2, indexed_cfg.documentdb().size()); var db = indexed_cfg.documentdb(0); assertEquals("a", db.name()); assertEquals(DocumentdbInfoConfig.Documentdb.Mode.INDEX, db.mode()); - DocumentdbInfoConfig streaming_cfg = model.getConfig(DocumentdbInfoConfig.class, "test/search/cluster.test.b"); - assertEquals(1, streaming_cfg.documentdb().size()); - db = streaming_cfg.documentdb(0); + db = indexed_cfg.documentdb(1); assertEquals("b", db.name()); assertEquals(DocumentdbInfoConfig.Documentdb.Mode.STREAMING, db.mode()); } |