Inject timer from test classes instead of inheriting

1 files changed, 5 insertions, 4 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java
index 4dcd0a6f499..411f31875c4 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java
@@ -15,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class WantedStateTest extends FleetControllerTest {
 
     private Supervisor supervisor;
+    private final Timer timer = new FakeTimer();
 
     @BeforeEach
     public void setup() {
@@ -28,8 +29,8 @@ public class WantedStateTest extends FleetControllerTest {
 
     @Test
     void testSettingStorageNodeMaintenanceAndBack() throws Exception {
-        setUpFleetController(true, defaultOptions("mycluster"));
-        setUpVdsNodes(true);
+        setUpFleetController(timer, defaultOptions("mycluster"));
+        setUpVdsNodes(timer);
         waitForStableSystem();
 
         setWantedState(nodes.get(1), State.MAINTENANCE, null, supervisor);
@@ -41,8 +42,8 @@ public class WantedStateTest extends FleetControllerTest {
 
     @Test
     void testOverridingWantedStateOtherReason() throws Exception {
-        setUpFleetController(true, defaultOptions("mycluster"));
-        setUpVdsNodes(true);
+        setUpFleetController(timer, defaultOptions("mycluster"));
+        setUpVdsNodes(timer);
         waitForStableSystem();
 
         setWantedState(nodes.get(1), State.MAINTENANCE, "Foo", supervisor);