diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-14 09:32:35 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-14 19:55:00 +0100 |
commit | 3c1d192192f903b0dffc81b2f3503830a705f0eb (patch) | |
tree | ba2c490cf64c36f7af94f00b72545597202b2194 /config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java | |
parent | b18fce14bf06de85aa9663ba182eb9db0f77d781 (diff) |
Revert "Revert "Balder/single searchcluster""
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java | 34 |
1 files changed, 9 insertions, 25 deletions
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 d3e69e64fe6..327b169a629 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 @@ -196,11 +196,10 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = cluster.getSearch(); - assertFalse(s.hasIndexedCluster()); + assertTrue(s.hasIndexedCluster()); assertEquals(1, s.getClusters().size()); - assertNull(s.getIndexed()); - SearchCluster sc = s.getClusters().get(musicClusterId + ".music"); - assertEquals(musicClusterId + ".music", sc.getClusterName()); + SearchCluster sc = s.getClusters().get(musicClusterId); + assertEquals(musicClusterId, sc.getClusterName()); assertEquals(musicClusterId, sc.getStorageRouteSpec()); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); @@ -236,24 +235,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.hasIndexedCluster()); + assertEquals(2, s.getIndexed().getDocumentDbs().size()); + assertTrue(s.getIndexed().hasDocumentDB("book")); + assertTrue(s.getIndexed().hasDocumentDB("music")); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, cluster.getStorageCluster().getChildren().size()); @@ -362,9 +348,7 @@ public class ContentBuilderTest extends DomBuilderTest { " <node hostalias=\"mockhost\" distribution-key=\"0\" />" + " </group>" + "</content>", new TestProperties().setEnvironmentVariables(List.of("MY_1_ENV=xyz abc", "MY_2_ENV=2"))); - ContentSearchCluster s; - - s = b.getSearch(); + ContentSearchCluster s = b.getSearch(); assertTrue(s.hasIndexedCluster()); assertNotNull(s.getIndexed()); assertEquals(1, b.getStorageCluster().getChildren().size()); |