Improve readability

2 files changed, 28 insertions, 22 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
index 01e23c81971..a65af1e264e 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.concurrent.maintenance;
 
 import com.yahoo.concurrent.UncheckedTimeoutException;
+import com.yahoo.test.ManualClock;
 import org.junit.Test;
 
 import java.time.Duration;
@@ -23,29 +24,30 @@ public class MaintainerTest {
     public void staggering() {
         List<String> cluster = List.of("cfg1", "cfg2", "cfg3");
         Duration interval = Duration.ofMillis(300);
-        Instant now = Instant.ofEpochMilli(1000);
+        ManualClock clock = new ManualClock(Instant.ofEpochMilli(1000));
+
         // ∠( ᐛ 」∠)＿
-        class MaintainerWithBestHashE extends TestMaintainer { MaintainerWithBestHashE() { super(null, jobControl, new TestJobMetrics()); } }
-        class MaintainerWithBestHashF extends TestMaintainer { MaintainerWithBestHashF() { super(null, jobControl, new TestJobMetrics()); } }
-        class MaintainerWithBestHashG extends TestMaintainer { MaintainerWithBestHashG() { super(null, jobControl, new TestJobMetrics()); } }
-        Maintainer maintainer = new MaintainerWithBestHashF();
-        assertEquals(200, maintainer.staggeredDelay(interval, now, "cfg1", cluster).toMillis());
-        assertEquals(299, new MaintainerWithBestHashE().staggeredDelay(interval, now, "cfg2", cluster).toMillis());
-        assertEquals(0, maintainer.staggeredDelay(interval, now, "cfg2", cluster).toMillis());
-        assertEquals(1, new MaintainerWithBestHashG().staggeredDelay(interval, now, "cfg2", cluster).toMillis());
-        assertEquals(100, maintainer.staggeredDelay(interval, now, "cfg3", cluster).toMillis());
-
-        now = Instant.ofEpochMilli(1001);
-        assertEquals(199, maintainer.staggeredDelay(interval, now, "cfg1", cluster).toMillis());
-        assertEquals(299, maintainer.staggeredDelay(interval, now, "cfg2", cluster).toMillis());
-        assertEquals(99, maintainer.staggeredDelay(interval, now, "cfg3", cluster).toMillis());
-
-        now = Instant.ofEpochMilli(1101);
-        assertEquals(99, maintainer.staggeredDelay(interval, now, "cfg1", cluster).toMillis());
-        assertEquals(199, maintainer.staggeredDelay(interval, now, "cfg2", cluster).toMillis());
-        assertEquals(299, maintainer.staggeredDelay(interval, now, "cfg3", cluster).toMillis());
-
-        assertEquals(300, maintainer.staggeredDelay(interval, now, "cfg0", cluster).toMillis());
+        class MaintainerWithBestHashE extends TestMaintainer { MaintainerWithBestHashE() { super(jobControl, new TestJobMetrics(), clock); } }
+        class MaintainerWithBestHashF extends TestMaintainer { MaintainerWithBestHashF() { super(jobControl, new TestJobMetrics(), clock); } }
+        class MaintainerWithBestHashG extends TestMaintainer { MaintainerWithBestHashG() { super(jobControl, new TestJobMetrics(), clock); } }
+
+        assertEquals(200, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg1", cluster).toMillis());
+        assertEquals(299, new MaintainerWithBestHashE().staggeredDelay(interval, "cfg2", cluster).toMillis());
+        assertEquals(  0, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg2", cluster).toMillis());
+        assertEquals(  1, new MaintainerWithBestHashG().staggeredDelay(interval, "cfg2", cluster).toMillis());
+        assertEquals(100, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg3", cluster).toMillis());
+
+        clock.advance(Duration.ofMillis(1));
+        assertEquals(199, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg1", cluster).toMillis());
+        assertEquals(299, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg2", cluster).toMillis());
+        assertEquals( 99, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg3", cluster).toMillis());
+
+        clock.advance(Duration.ofMillis(100));
+        assertEquals( 99, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg1", cluster).toMillis());
+        assertEquals(199, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg2", cluster).toMillis());
+        assertEquals(299, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg3", cluster).toMillis());
+
+        assertEquals(300, new MaintainerWithBestHashF().staggeredDelay(interval, "cfg0", cluster).toMillis());
     }
 
     @Test
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
index 9e994312738..8c7ca1e18db 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
@@ -15,6 +15,10 @@ class TestMaintainer extends Maintainer {
     private double success = 1.0;
     private RuntimeException exceptionToThrow = null;
 
+    TestMaintainer(JobControl jobControl, JobMetrics jobMetrics, Clock clock) {
+        super(null, Duration.ofDays(1), clock, jobControl, jobMetrics, List.of(), false);
+    }
+
     TestMaintainer(String name, JobControl jobControl, JobMetrics jobMetrics) {
         super(name, Duration.ofDays(1), Clock.systemUTC(), jobControl, jobMetrics, List.of(), false);
     }