1 files changed, 11 insertions, 62 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
index b9495d45e08..cb457cabf6c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
@@ -2,14 +2,13 @@
 package com.yahoo.vespa.model.content;
 
 import com.yahoo.config.model.test.MockRoot;
-import com.yahoo.vespa.config.content.DistributionConfig;
 import com.yahoo.vespa.config.content.StorDistributionConfig;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test for storage groups.
@@ -22,6 +21,7 @@ public class StorageGroupTest {
 
     @Test
     public void testSingleGroup() throws Exception {
+        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
         ContentCluster cluster = parse(
                 "<content id=\"storage\">\n" +
                         "  <documents/>" +
@@ -32,6 +32,8 @@ public class StorageGroupTest {
                         "</content>"
         );
 
+        cluster.getConfig(builder);
+
         assertEquals("content", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("clustertype"));
         assertEquals("storage", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("clustername"));
         assertEquals("0", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("index"));
@@ -40,8 +42,6 @@ public class StorageGroupTest {
         assertEquals("storage", cluster.getDistributorNodes().getChildren().get("0").getServicePropertyString("clustername"));
         assertEquals("0", cluster.getDistributorNodes().getChildren().get("0").getServicePropertyString("index"));
 
-        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
-        cluster.getConfig(builder);
         StorDistributionConfig config = new StorDistributionConfig(builder);
 
         assertEquals(1, config.group().size());
@@ -51,17 +51,6 @@ public class StorageGroupTest {
         assertEquals(0, config.group(0).nodes(0).index());
         assertEquals(1, config.group(0).nodes(1).index());
         //assertNotNull(cluster.getRootGroup().getNodes().get(0).getHost());
-
-        DistributionConfig.Builder distributionBuilder = new DistributionConfig.Builder();
-        cluster.getConfig(distributionBuilder);
-        DistributionConfig.Cluster clusterConfig = distributionBuilder.build().cluster("storage");
-
-        assertEquals(1, clusterConfig.group().size());
-        assertEquals("invalid", clusterConfig.group(0).index());
-        assertEquals("invalid", clusterConfig.group(0).name());
-        assertEquals(2, clusterConfig.group(0).nodes().size());
-        assertEquals(0, clusterConfig.group(0).nodes(0).index());
-        assertEquals(1, clusterConfig.group(0).nodes(1).index());
     }
 
     @Test
@@ -81,14 +70,15 @@ public class StorageGroupTest {
                             "  </group>\n" +
                             "</cluster>"
             );
-            fail();
+            assertTrue(false);
         } catch (Exception e) {
         }
     }
 
     @Test
     public void testNestedGroups() throws Exception {
-        ContentCluster cluster = parse(
+        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
+        parse(
                 "<content version=\"1.0\" id=\"storage\">\n" +
                         "  <redundancy>4</redundancy>" +
                         "  <documents/>" +
@@ -111,10 +101,8 @@ public class StorageGroupTest {
                         "    </group>\n" +
                         "  </group>\n" +
                         "</content>"
-        );
+        ).getConfig(builder);
 
-        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
-        cluster.getConfig(builder);
         StorDistributionConfig config = new StorDistributionConfig(builder);
 
         assertEquals(5, config.group().size());
@@ -140,39 +128,12 @@ public class StorageGroupTest {
         assertEquals(5, config.group(4).nodes(1).index());
 
         assertEquals("1|*", config.group(0).partitions());
-
-        DistributionConfig.Builder distributionBuilder = new DistributionConfig.Builder();
-        cluster.getConfig(distributionBuilder);
-        DistributionConfig.Cluster clusterConfig = distributionBuilder.build().cluster("storage");
-
-        assertEquals(5, clusterConfig.group().size());
-        assertEquals("invalid", clusterConfig.group(0).index());
-        assertEquals("0", clusterConfig.group(1).index());
-        assertEquals("1", clusterConfig.group(2).index());
-        assertEquals("1.0", clusterConfig.group(3).index());
-        assertEquals("1.1", clusterConfig.group(4).index());
-        assertEquals("invalid", clusterConfig.group(0).name());
-        assertEquals("sub1", clusterConfig.group(1).name());
-        assertEquals("sub2", clusterConfig.group(2).name());
-        assertEquals("sub3", clusterConfig.group(3).name());
-        assertEquals("sub4", clusterConfig.group(4).name());
-        assertEquals(2, clusterConfig.group(1).nodes().size());
-        assertEquals(0, clusterConfig.group(1).nodes(0).index());
-        assertEquals(1, clusterConfig.group(1).nodes(1).index());
-        assertEquals(0, clusterConfig.group(2).nodes().size());
-        assertEquals(2, clusterConfig.group(3).nodes().size());
-        assertEquals(2, clusterConfig.group(3).nodes(0).index());
-        assertEquals(3, clusterConfig.group(3).nodes(1).index());
-        assertEquals(2, clusterConfig.group(4).nodes().size());
-        assertEquals(4, clusterConfig.group(4).nodes(0).index());
-        assertEquals(5, clusterConfig.group(4).nodes(1).index());
-
-        assertEquals("1|*", clusterConfig.group(0).partitions());
     }
 
     @Test
     public void testGroupCapacity() throws Exception {
-        ContentCluster cluster = parse(
+        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
+        parse(
                 "<content version=\"1.0\" id=\"storage\">\n" +
                         "  <redundancy>2</redundancy>" +
                         "  <documents/>" +
@@ -188,25 +149,13 @@ public class StorageGroupTest {
                         "    </group>\n" +
                         "  </group>\n" +
                         "</content>"
-        );
+        ).getConfig(builder);
 
-        StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
-        cluster.getConfig(builder);
         StorDistributionConfig config = new StorDistributionConfig(builder);
 
         assertEquals(3, config.group().size());
         assertEquals(5.5, config.group(0).capacity(), 0.001);
         assertEquals(2, config.group(1).capacity(), 0.001);
         assertEquals(3.5, config.group(2).capacity(), 0.001);
-
-        DistributionConfig.Builder distributionBuilder = new DistributionConfig.Builder();
-        cluster.getConfig(distributionBuilder);
-        DistributionConfig.Cluster clusterConfig = distributionBuilder.build().cluster("storage");
-
-        assertEquals(3, clusterConfig.group().size());
-        assertEquals(5.5, clusterConfig.group(0).capacity(), 0.001);
-        assertEquals(2, clusterConfig.group(1).capacity(), 0.001);
-        assertEquals(3.5, clusterConfig.group(2).capacity(), 0.001);
     }
-
 }