aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-08-17 11:10:59 +0200
committerHarald Musum <musum@yahooinc.com>2022-08-22 23:06:35 +0200
commit0df88ab1244567c33dab5ee344984b8a95301a78 (patch)
treef87a87a120c3bb28e3da95de2b028f707cf0659e /clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
parentb409eb7c17d06744954a64495e4c6d0e21638dd5 (diff)
Remove duplicated code
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java')
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java14
1 files changed, 1 insertions, 13 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
index f8d41405e85..66669e8b481 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java
@@ -9,13 +9,10 @@ import com.yahoo.vdslib.state.NodeState;
import com.yahoo.vdslib.state.NodeType;
import com.yahoo.vdslib.state.State;
import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import static org.mockito.Mockito.mock;
@@ -24,7 +21,6 @@ public class ClusterFixture {
public final ContentCluster cluster;
public final Distribution distribution;
public final FakeTimer timer;
- private final EventLogInterface eventLog;
final StateChangeHandler nodeStateChangeHandler;
private final ClusterStateGenerator.Params params = new ClusterStateGenerator.Params();
@@ -32,9 +28,8 @@ public class ClusterFixture {
this.cluster = cluster;
this.distribution = distribution;
this.timer = new FakeTimer();
- this.eventLog = mock(EventLogInterface.class);
var context = new FleetControllerContextImpl(new FleetControllerId(cluster.getName(), 0));
- this.nodeStateChangeHandler = new StateChangeHandler(context, timer, eventLog);
+ this.nodeStateChangeHandler = new StateChangeHandler(context, timer, mock(EventLogInterface.class));
this.params.cluster(this.cluster);
}
@@ -150,13 +145,6 @@ public class ClusterFixture {
return this;
}
- static Map<NodeType, Integer> buildTransitionTimeMap(int distributorTransitionTime, int storageTransitionTime) {
- Map<NodeType, Integer> maxTransitionTime = new TreeMap<>();
- maxTransitionTime.put(NodeType.DISTRIBUTOR, distributorTransitionTime);
- maxTransitionTime.put(NodeType.STORAGE, storageTransitionTime);
- return maxTransitionTime;
- }
-
void disableTransientMaintenanceModeOnDown() {
this.params.transitionTimes(0);
}