Avoid having two almost equal methods, collapse into one

2 files changed, 9 insertions, 21 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
index 666b4f63801..a66294851b8 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
@@ -1,12 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.core;
 
-import com.yahoo.jrt.ErrorCode;
-import com.yahoo.jrt.Request;
-import com.yahoo.jrt.Spec;
-import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
-import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
 import com.yahoo.vdslib.state.Node;
 import com.yahoo.vdslib.state.NodeState;
@@ -21,7 +16,6 @@ import java.util.TreeMap;
 import java.util.logging.Logger;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ExtendWith(CleanupZookeeperLogsOnSuccess.class)
 public class DatabaseTest extends FleetControllerTest {
@@ -156,18 +150,8 @@ public class DatabaseTest extends FleetControllerTest {
         }
     }
 
-    // Note: different semantics than FleetControllerTest.setWantedState
     private void setWantedState(Node n, NodeState ns, Map<Node, NodeState> wantedStates) {
-        int rpcPort = fleetController().getRpcPort();
-        Target connection = supervisor.connect(new Spec("localhost", rpcPort));
-        assertTrue(connection.isValid());
-
-        Request req = new Request("setNodeState");
-        req.parameters().add(new StringValue("storage/cluster.mycluster/" + n.getType().toString() + "/" + n.getIndex()));
-        req.parameters().add(new StringValue(ns.serialize(true)));
-        connection.invokeSync(req, timeout());
-        assertEquals(ErrorCode.NONE, req.errorCode(), req.toString());
-        assertTrue(req.checkReturnTypes("s"), req.toString());
+        setWantedState(ns, ns.getDescription(), "storage/cluster.mycluster/" + n.getType().toString() + "/" + n.getIndex(), supervisor);
         wantedStates.put(n, ns);
     }
 
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 e8b56cbc142..242d936357d 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
@@ -298,12 +298,16 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     void setWantedState(DummyVdsNode node, State state, String reason, Supervisor supervisor) {
-        NodeState ns = new NodeState(node.getType(), state);
-        if (reason != null) ns.setDescription(reason);
+        setWantedState(new NodeState(node.getType(), state), reason, node.getSlobrokName(), supervisor);
+    }
+
+    void setWantedState(NodeState nodeState, String reason, String slobrokName, Supervisor supervisor) {
+        if (reason != null) nodeState.setDescription(reason);
         Target connection = supervisor.connect(new Spec("localhost", fleetController().getRpcPort()));
+
         Request req = new Request("setNodeState");
-        req.parameters().add(new StringValue(node.getSlobrokName()));
-        req.parameters().add(new StringValue(ns.serialize()));
+        req.parameters().add(new StringValue(slobrokName));
+        req.parameters().add(new StringValue(nodeState.serialize()));
         connection.invokeSync(req, timeout());
         if (req.isError()) {
             fail("Failed to invoke setNodeState(): " + req.errorCode() + ": " + req.errorMessage());