Move test code to test class

2 files changed, 44 insertions, 41 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
index 9d41b1c0153..58208cb453b 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.StateRestAPI;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRequest;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.server.JsonWriter;
+import com.yahoo.vespa.config.content.StorDistributionConfig;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -51,7 +52,7 @@ public abstract class StateRestApiTest {
     }
 
     protected void setUp(boolean dontInitializeNode2) throws Exception {
-        Distribution distribution = new Distribution(Distribution.getSimpleGroupConfig(2, 10));
+        Distribution distribution = new Distribution(getSimpleGroupConfig(2, 10));
         jsonWriter.setDefaultPathPrefix("/cluster/v2");
         {
             Set<ConfiguredNode> nodes = FleetControllerTest.toNodes(0, 1, 2, 3);
@@ -94,7 +95,7 @@ public abstract class StateRestApiTest {
 
     protected void setUpMusicGroup(int nodeCount, String node1StateString) {
         books = null;
-        Distribution distribution = new Distribution(Distribution.getSimpleGroupConfig(2, nodeCount));
+        Distribution distribution = new Distribution(getSimpleGroupConfig(2, nodeCount));
         jsonWriter.setDefaultPathPrefix("/cluster/v2");
         ContentCluster cluster = new ContentCluster("music", distribution.getNodes(), distribution);
         initializeCluster(cluster, distribution.getNodes());
@@ -167,4 +168,45 @@ public abstract class StateRestApiTest {
                 "    }\n" +
                 "}";
     }
+
+    private static String getSimpleGroupConfig(int redundancy, int nodeCount) {
+        return getSimpleGroupConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.Enum.MODULO_BID);
+    }
+
+    // TODO: Use config builder instead of creating raw: config
+    private static String getSimpleGroupConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("raw:redundancy ").append(redundancy).append("\n").append("group[4]\n");
+
+        int group = 0;
+        sb.append("group[" + group + "].index \"invalid\"\n")
+          .append("group[" + group + "].name \"invalid\"\n")
+          .append("group[" + group + "].partitions \"1|*\"\n");
+
+        ++group;
+        sb.append("group[" + group + "].index \"0\"\n")
+          .append("group[" + group + "].name \"east\"\n")
+          .append("group[" + group + "].partitions \"*\"\n");
+
+        ++group;
+        sb.append("group[" + group + "].index \"0.0\"\n")
+          .append("group[" + group + "].name \"g1\"\n")
+          .append("group[" + group + "].partitions \"*\"\n")
+          .append("group[" + group + "].nodes[").append((nodeCount + 1) / 2).append("]\n");
+        for (int i=0; i<nodeCount; i += 2) {
+            sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n");
+        }
+
+        ++group;
+        sb.append("group[" + group + "].index \"0.1\"\n")
+          .append("group[" + group + "].name \"g2\"\n")
+          .append("group[" + group + "].partitions \"*\"\n")
+          .append("group[" + group + "].nodes[").append(nodeCount / 2).append("]\n");
+        for (int i=1; i<nodeCount; i += 2) {
+            sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n");
+        }
+        sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n");
+        return sb.toString();
+    }
+
 }
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
index bafe56e92ae..0e8e755c236 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
@@ -526,43 +526,4 @@ public class Distribution {
         return sb.toString();
     }
 
-    public static String getSimpleGroupConfig(int redundancy, int nodeCount) {
-        return getSimpleGroupConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.Enum.MODULO_BID);
-    }
-
-    private static String getSimpleGroupConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("raw:redundancy ").append(redundancy).append("\n").append("group[4]\n");
-
-        int group = 0;
-        sb.append("group[" + group + "].index \"invalid\"\n")
-          .append("group[" + group + "].name \"invalid\"\n")
-          .append("group[" + group + "].partitions \"1|*\"\n");
-
-        ++group;
-        sb.append("group[" + group + "].index \"0\"\n")
-          .append("group[" + group + "].name \"east\"\n")
-          .append("group[" + group + "].partitions \"*\"\n");
-
-        ++group;
-        sb.append("group[" + group + "].index \"0.0\"\n")
-          .append("group[" + group + "].name \"g1\"\n")
-          .append("group[" + group + "].partitions \"*\"\n")
-          .append("group[" + group + "].nodes[").append((nodeCount + 1) / 2).append("]\n");
-        for (int i=0; i<nodeCount; i += 2) {
-            sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n");
-        }
-
-        ++group;
-        sb.append("group[" + group + "].index \"0.1\"\n")
-          .append("group[" + group + "].name \"g2\"\n")
-          .append("group[" + group + "].partitions \"*\"\n")
-          .append("group[" + group + "].nodes[").append(nodeCount / 2).append("]\n");
-        for (int i=1; i<nodeCount; i += 2) {
-            sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n");
-        }
-        sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n");
-        return sb.toString();
-    }
-
 }