diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2021-10-19 14:50:32 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2021-10-19 14:50:32 +0200 |
commit | 2dbd96bd9ff5e62bad6096761c58be96f2f4997b (patch) | |
tree | 5e75a2ece3866fdec83d7ce8baa558f821f6b6f9 /clustercontroller-core/src/test | |
parent | 4c1ca8d9b431c59895666256ad6e47193789b2b4 (diff) |
Fixes after review round
Diffstat (limited to 'clustercontroller-core/src/test')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java | 2 | ||||
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java | 6 | ||||
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java | 2 | ||||
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java | 2 | ||||
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java (renamed from clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java) | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java index 80f88c57cb3..a52370a0654 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java @@ -48,7 +48,7 @@ public class ClusterFeedBlockTest extends FleetControllerTest { nodes.add(new Node(NodeType.DISTRIBUTOR, i)); } - var context = new TestContext(options); + var context = new TestFleetControllerContext(options); communicator = new DummyCommunicator(nodes, timer); var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName); var eventLog = new EventLog(timer, metricUpdater); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java index 57468ffa0e7..35431703824 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java @@ -65,9 +65,9 @@ public class DatabaseHandlerTest { } DatabaseHandler createHandler() throws Exception { - Context context = mock(Context.class); - when(context.id()).thenReturn(new FleetControllerId("clusterName", 0)); - return new DatabaseHandler(context, mockDbFactory, mockTimer, databaseAddress, monitor); + FleetControllerContext fleetControllerContext = mock(FleetControllerContext.class); + when(fleetControllerContext.id()).thenReturn(new FleetControllerId("clusterName", 0)); + return new DatabaseHandler(fleetControllerContext, mockDbFactory, mockTimer, databaseAddress, monitor); } } 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 d9e20171681..d115f9f0060 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 @@ -157,7 +157,7 @@ public abstract class FleetControllerTest implements Waiter { FleetController createFleetController(boolean useFakeTimer, FleetControllerOptions options, boolean startThread, StatusPageServerInterface status) throws Exception { Objects.requireNonNull(status, "status server cannot be null"); - var context = new TestContext(options); + var context = new TestFleetControllerContext(options); Timer timer = useFakeTimer ? this.timer : new RealTimer(); var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName); var log = new EventLog(timer, metricUpdater); 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 e7aae087626..b601412ecc4 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 @@ -49,7 +49,7 @@ public class StateChangeTest extends FleetControllerTest { nodes.add(new Node(NodeType.DISTRIBUTOR, i)); } - var context = new TestContext(options); + var context = new TestFleetControllerContext(options); communicator = new DummyCommunicator(nodes, timer); var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName); eventLog = new EventLog(timer, metricUpdater); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java index 1a7c2659bd6..b9d8474affb 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java @@ -4,8 +4,8 @@ package com.yahoo.vespa.clustercontroller.core; /** * @author hakon */ -public class TestContext extends ContextImpl { - public TestContext(FleetControllerOptions options) { +public class TestFleetControllerContext extends FleetControllerContextImpl { + public TestFleetControllerContext(FleetControllerOptions options) { super(options); } |