Revert "Revert "Single searchcluster take 3""

1 files changed, 9 insertions, 32 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..a4a5f4cb4df 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
@@ -63,7 +63,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof com.yahoo.vespa.model.content.engines.DummyPersistence.Factory);
     }
@@ -83,7 +82,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
@@ -108,7 +106,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
@@ -130,7 +127,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
         assertNull(s.getIndexed());
 
         assertNull(a.getRootGroup().getName());
@@ -151,7 +147,6 @@ 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);
@@ -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.hasIndexedCluster());
+        SearchCluster sc = s.getIndexed();
+        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.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());
@@ -277,7 +257,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
-        assertEquals(1, s.getClusters().size());
         assertNotNull(s.getIndexed());
         assertEquals("b", s.getIndexed().getClusterName());
 
@@ -362,9 +341,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());