From 2dbd96bd9ff5e62bad6096761c58be96f2f4997b Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Tue, 19 Oct 2021 14:50:32 +0200 Subject: Fixes after review round --- .../clustercontroller/core/ClusterFeedBlockTest.java | 2 +- .../clustercontroller/core/DatabaseHandlerTest.java | 6 +++--- .../clustercontroller/core/FleetControllerTest.java | 2 +- .../vespa/clustercontroller/core/StateChangeTest.java | 2 +- .../yahoo/vespa/clustercontroller/core/TestContext.java | 17 ----------------- .../core/TestFleetControllerContext.java | 17 +++++++++++++++++ 6 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java create mode 100644 clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java (limited to 'clustercontroller-core/src/test/java/com') 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/TestContext.java deleted file mode 100644 index 1a7c2659bd6..00000000000 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.core; - -/** - * @author hakon - */ -public class TestContext extends ContextImpl { - public TestContext(FleetControllerOptions options) { - super(options); - } - - @Override - protected String withLogPrefix(String message) { - // Include fleet controller index in prefix in tests, since many may be running - return id() + ": " + message; - } -} diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java new file mode 100644 index 00000000000..b9d8474affb --- /dev/null +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestFleetControllerContext.java @@ -0,0 +1,17 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.clustercontroller.core; + +/** + * @author hakon + */ +public class TestFleetControllerContext extends FleetControllerContextImpl { + public TestFleetControllerContext(FleetControllerOptions options) { + super(options); + } + + @Override + protected String withLogPrefix(String message) { + // Include fleet controller index in prefix in tests, since many may be running + return id() + ": " + message; + } +} -- cgit v1.2.3