clock.step(2L, ChronoUnit.HOURS)

PegaSysEng · Apr 30, 2019 · c64c680 · c64c680
1 parent b460f19
commit c64c680
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...rc/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java b/...rc/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java
@@ -29,6 +29,7 @@
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
 import tech.pegasys.pantheon.testutil.TestClock;
 
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalLong;
@@ -434,13 +435,15 @@ public void shouldEvictMultipleOldTransactions() {
 
   @Test
   public void shouldEvictSingleOldTransaction() {
-    final int maxTransactionRetentionHours = 1000;
+    final int maxTransactionRetentionHours = 1;
     final PendingTransactions transactions =
         new PendingTransactions(
             maxTransactionRetentionHours, MAX_TRANSACTIONS, clock, metricsSystem);
     transactions.addRemoteTransaction(transaction1);
     assertThat(transactions.size()).isEqualTo(1);
-    clock.stepMillis(2000);
+
+    clock.step(2L, ChronoUnit.HOURS);
+
     transactions.evictOldTransactions();
     assertThat(transactions.size()).isEqualTo(0);
   }

diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/TestClock.java b/testutil/src/main/java/tech/pegasys/pantheon/testutil/TestClock.java
@@ -16,6 +16,8 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.temporal.TemporalAmount;
+import java.time.temporal.TemporalUnit;
 
 public class TestClock extends Clock {
   public static Clock fixed() {
@@ -42,4 +44,8 @@ public Instant instant() {
   public void stepMillis(final long millis) {
     now = now.plusMillis(millis);
   }
+
+  public void step(final long a, final TemporalUnit unit) {
+    now = now.plus(a, unit);
+  }
 }