Simplify and remove some test methods

5 files changed, 16 insertions, 25 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
index 95b9d13cad5..11bdb6ec1c8 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
@@ -22,7 +22,7 @@ public class DistributionBitCountTest extends FleetControllerTest {
         for (int i = 0 ; i < 10; i++) {
             configuredNodes.add(new ConfiguredNode(i, false));
         }
-        var builder = defaultOptions("mycluster", configuredNodes);
+        var builder = defaultOptions(configuredNodes);
         builder.setDistributionBits(17);
         Timer timer = new RealTimer();
         setUpFleetController(timer, builder);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index 7bc6f18b887..fb59df7e433 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -74,29 +74,19 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     protected static FleetControllerOptions.Builder defaultOptions() {
-        return defaultOptions(DEFAULT_NODE_COUNT);
+        return defaultOptions(IntStream.range(0, DEFAULT_NODE_COUNT)
+                                      .mapToObj(i -> new ConfiguredNode(i, false))
+                                      .collect(Collectors.toSet()));
     }
 
-    protected static FleetControllerOptions.Builder defaultOptions(int nodeCount) {
-        return defaultOptions("mycluster", IntStream.range(0, nodeCount)
-                                                    .mapToObj(i -> new ConfiguredNode(i, false))
-                                                    .collect(Collectors.toSet()));
-    }
-
-    protected static FleetControllerOptions.Builder defaultOptions(String clusterName, Collection<ConfiguredNode> nodes) {
-        var builder = new FleetControllerOptions.Builder(clusterName, nodes);
+    protected static FleetControllerOptions.Builder defaultOptions(Collection<ConfiguredNode> nodes) {
+        var builder = new FleetControllerOptions.Builder("mycluster", nodes);
         builder.enableTwoPhaseClusterStateActivation(true); // Enable by default, tests can explicitly disable.
         builder.setStorageDistribution(DistributionBuilder.forFlatCluster(builder.nodes().size()));
         builder.setZooKeeperServerAddress("localhost:2181");
         return builder;
     }
 
-    protected void setUpSystem(FleetControllerOptions.Builder builder) throws Exception {
-        log.log(Level.FINE, "Setting up system");
-        setUpZooKeeperServer(builder);
-        builder.setSlobrokConnectionSpecs(getSlobrokConnectionSpecs(slobrok));
-    }
-
     protected void setUpZooKeeperServer(FleetControllerOptions.Builder builder) throws IOException {
         zooKeeperServer = new ZooKeeperTestServer();
         // Need to set zookeeper address again, as port number is not known until ZooKeeperTestServer has been created
@@ -149,7 +139,8 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     protected FleetControllerOptions setUpFleetController(Timer timer, FleetControllerOptions.Builder builder) throws Exception {
-        setUpSystem(builder);
+        setUpZooKeeperServer(builder);
+        builder.setSlobrokConnectionSpecs(getSlobrokConnectionSpecs(slobrok));
         options = builder.build();
         startFleetController(timer);
         return options;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
index 2c77767d6b4..e432efc1447 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
@@ -30,7 +30,7 @@ public class NodeSlobrokConfigurationMembershipTest extends FleetControllerTest
     }
 
     private FleetControllerOptions.Builder optionsForConfiguredNodes(Set<ConfiguredNode> configuredNodes) {
-        return defaultOptions("mycluster", configuredNodes)
+        return defaultOptions(configuredNodes)
                 .setMaxSlobrokDisconnectGracePeriod(60 * 1000)
                 .setNodeStateRequestTimeoutMS(10000 * 60 * 1000)
                 .setMaxTransitionTime(NodeType.DISTRIBUTOR, 0)
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
index f146d2468c8..e75ade7309c 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
@@ -131,7 +131,7 @@ public class RpcServerTest extends FleetControllerTest {
         Set<ConfiguredNode> configuredNodes = new TreeSet<>();
         for (int i = 0; i < 10; i++)
             configuredNodes.add(new ConfiguredNode(i, false));
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes);
+        FleetControllerOptions.Builder builder = defaultOptions(configuredNodes);
         builder.setMinRatioOfStorageNodesUp(0);
         builder.setMaxInitProgressTime(30000);
         builder.setStableStateTimePeriod(60000);
@@ -224,7 +224,7 @@ public class RpcServerTest extends FleetControllerTest {
         for (int i = 0; i < 4; i++)
             configuredNodes.add(new ConfiguredNode(i, false));
         configuredNodes.add(new ConfiguredNode(4, true)); // Last node is configured retired
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes)
+        FleetControllerOptions.Builder builder = defaultOptions(configuredNodes)
                 .setMinRatioOfStorageNodesUp(0)
                 .setMaxInitProgressTime(30000)
                 .setStableStateTimePeriod(60000);
@@ -257,7 +257,7 @@ public class RpcServerTest extends FleetControllerTest {
             List<ConfiguredNode> configuredNodes = new ArrayList<>();
             for (int i = 0; i < 5; i++)
                 configuredNodes.add(new ConfiguredNode(i, false));
-            FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes)
+            FleetControllerOptions.Builder builder = defaultOptions(configuredNodes)
                     .setMaxInitProgressTime(30000)
                     .setStableStateTimePeriod(60000);
             setUpFleetController(timer, builder);
@@ -332,7 +332,7 @@ public class RpcServerTest extends FleetControllerTest {
             List<ConfiguredNode> configuredNodes = new ArrayList<>();
             for (int i = 0; i < 5; i++)
                 configuredNodes.add(new ConfiguredNode(i, false));
-            FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes)
+            FleetControllerOptions.Builder builder = defaultOptions(configuredNodes)
                     .setMaxInitProgressTime(30000)
                     .setStableStateTimePeriod(60000);
             options = builder.build();
@@ -401,7 +401,7 @@ public class RpcServerTest extends FleetControllerTest {
     void testSetNodeState() throws Exception {
         Set<Integer> nodeIndexes = new TreeSet<>(List.of(4, 6, 9, 10, 14, 16, 21, 22, 23, 25));
         Set<ConfiguredNode> configuredNodes = nodeIndexes.stream().map(i -> new ConfiguredNode(i, false)).collect(Collectors.toSet());
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", configuredNodes);
+        FleetControllerOptions.Builder options = defaultOptions(configuredNodes);
         //options.setStorageDistribution(new Distribution(getDistConfig(nodeIndexes)));
         setUpFleetController(timer, options);
         setUpVdsNodes(timer, false, nodeIndexes);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
index ce840315c65..f2261794b75 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
@@ -421,7 +421,7 @@ public class StateChangeTest extends FleetControllerTest {
             nodes.add(new ConfiguredNode(i, retired));
         }
 
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", nodes)
+        FleetControllerOptions.Builder builder = defaultOptions(nodes)
                 .setMaxSlobrokDisconnectGracePeriod(60 * 1000);
 
         initialize(builder);
@@ -482,7 +482,7 @@ public class StateChangeTest extends FleetControllerTest {
             nodes.add(new ConfiguredNode(i, retired));
         }
 
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", nodes)
+        FleetControllerOptions.Builder builder = defaultOptions(nodes)
                 .setMaxSlobrokDisconnectGracePeriod(60 * 1000);
         initialize(builder);