diff options
-rw-r--r-- | testutil/src/main/java/com/yahoo/test/ManualClock.java | 13 | ||||
-rw-r--r-- | vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentOperationExecutorTest.java | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/testutil/src/main/java/com/yahoo/test/ManualClock.java b/testutil/src/main/java/com/yahoo/test/ManualClock.java index ffef6895c38..ba7d9698d72 100644 --- a/testutil/src/main/java/com/yahoo/test/ManualClock.java +++ b/testutil/src/main/java/com/yahoo/test/ManualClock.java @@ -9,6 +9,7 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAmount; +import java.util.concurrent.atomic.AtomicReference; /** * A clock which initially has the time of its creation but can only be advanced by calling advance @@ -17,7 +18,7 @@ import java.time.temporal.TemporalAmount; */ public class ManualClock extends Clock { - private Instant currentTime = Instant.now(); + private AtomicReference<Instant> currentTime = new AtomicReference<>(Instant.now()); @Inject public ManualClock() {} @@ -27,19 +28,19 @@ public class ManualClock extends Clock { } public ManualClock(Instant currentTime) { - this.currentTime = currentTime; + setInstant(currentTime); } public void advance(TemporalAmount temporal) { - currentTime = currentTime.plus(temporal); + currentTime.updateAndGet(time -> time.plus(temporal)); } public void setInstant(Instant time) { - currentTime = time; + currentTime.set(time); } @Override - public Instant instant() { return currentTime; } + public Instant instant() { return currentTime.get(); } @Override public ZoneId getZone() { return null; } @@ -48,7 +49,7 @@ public class ManualClock extends Clock { public Clock withZone(ZoneId zone) { return null; } @Override - public long millis() { return currentTime.toEpochMilli(); } + public long millis() { return instant().toEpochMilli(); } public static Instant at(String utcIsoTime) { return LocalDateTime.parse(utcIsoTime, DateTimeFormatter.ISO_DATE_TIME).atZone(ZoneOffset.UTC).toInstant(); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentOperationExecutorTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentOperationExecutorTest.java index 6a10d38d0b7..ea34091879b 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentOperationExecutorTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/DocumentOperationExecutorTest.java @@ -203,15 +203,15 @@ public class DocumentOperationExecutorTest { clock.advance(Duration.ofMillis(20)); executor.put(new DocumentPut(doc2), parameters(), operationContext()); executor.notifyMaintainers(); - assertEquals(List.of(), received); assertEquals(List.of(), errors); + assertEquals(List.of(), received); clock.advance(Duration.ofMillis(990)); executor.notifyMaintainers(); // Let doc1 time out. phaser.arrive(); // Let doc2 arrive. - phaser.arriveAndAwaitAdvance(); // Wait for responses to be delivered. <3 Phaser <3 - assertEquals(List.of(doc2), received); + phaser.arriveAndAwaitAdvance(); // Wait for responses to be delivered. assertEquals(List.of(TIMEOUT), errors); + assertEquals(List.of(doc2), received); session().setResultType(Result.ResultType.TRANSIENT_ERROR); executor.put(new DocumentPut(doc3), parameters(), operationContext()); @@ -219,16 +219,16 @@ public class DocumentOperationExecutorTest { executor.notifyMaintainers(); // Retry throttled operation. clock.advance(Duration.ofMillis(20)); executor.notifyMaintainers(); // Time out throttled operation. - assertEquals(List.of(doc2), received); assertEquals(List.of(TIMEOUT, TIMEOUT), errors); + assertEquals(List.of(doc2), received); session().setResultType(Result.ResultType.SUCCESS); clock.advance(Duration.ofMillis(20)); executor.notifyMaintainers(); // Retry not attempted since operation already timed out. phaser.arrive(); phaser.arriveAndAwaitAdvance(); - assertEquals(List.of(doc2), received); assertEquals(List.of(TIMEOUT, TIMEOUT), errors); + assertEquals(List.of(doc2), received); } @Test |