Merge pull request #11778 from vespa-engine/mpolden/test-jdisc-cluster

Test combined with jdisc tag 

1 files changed, 28 insertions, 25 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 812199b29e2..6461ae1aaa4 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
@@ -238,31 +238,34 @@ public class ModelProvisioningTest {
 
     @Test
     public void testCombinedCluster() {
-        String xmlWithNodes =
-                "<?xml version='1.0' encoding='utf-8' ?>" +
-                "<services>" +
-                "  <container version='1.0' id='container1'>" +
-                "     <search/>" +
-                "     <nodes of='content1'/>" +
-                "  </container>" +
-                "  <content version='1.0' id='content1'>" +
-                "     <redundancy>2</redundancy>" +
-                "     <documents>" +
-                "       <document type='type1' mode='index'/>" +
-                "     </documents>" +
-                "     <nodes count='2'/>" +
-                "   </content>" +
-                "</services>";
-        VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(2);
-        VespaModel model = tester.createModel(xmlWithNodes, true);
-
-        assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size());
-        assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size());
-        assertEquals("Heap size is lowered with combined clusters", 
-                     17, physicalMemoryPercentage(model.getContainerClusters().get("container1")));
-        assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model);
-        assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Type.combined, model);
+        var containerElements = Set.of("jdisc", "container");
+        for (var containerElement : containerElements) {
+            String xmlWithNodes =
+                    "<?xml version='1.0' encoding='utf-8' ?>" +
+                    "<services>" +
+                    "  <" + containerElement + " version='1.0' id='container1'>" +
+                    "     <search/>" +
+                    "     <nodes of='content1'/>" +
+                    "  </" + containerElement + ">" +
+                    "  <content version='1.0' id='content1'>" +
+                    "     <redundancy>2</redundancy>" +
+                    "     <documents>" +
+                    "       <document type='type1' mode='index'/>" +
+                    "     </documents>" +
+                    "     <nodes count='2'/>" +
+                    "   </content>" +
+                    "</services>";
+            VespaModelTester tester = new VespaModelTester();
+            tester.addHosts(2);
+            VespaModel model = tester.createModel(xmlWithNodes, true);
+
+            assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size());
+            assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size());
+            assertEquals("Heap size is lowered with combined clusters",
+                         17, physicalMemoryPercentage(model.getContainerClusters().get("container1")));
+            assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model);
+            assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Type.combined, model);
+        }
     }
 
     @Test