Use setMockClock instead of rollMockClock(0) to resolve flaky tests.

bitcoinj · May 29, 2014 · 4df59ad · 4df59ad
1 parent 51b71a4
commit 4df59ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/com/google/bitcoin/core/Utils.java b/core/src/main/java/com/google/bitcoin/core/Utils.java
@@ -510,8 +510,8 @@ public static void setMockClock() {
     /**
      * Sets the mock clock to the given time (in seconds).
      */
-    public static void setMockClock(long mockClock) {
-        mockTime = new Date(mockClock * 1000);
+    public static void setMockClock(long mockClockSeconds) {
+        mockTime = new Date(mockClockSeconds * 1000);
     }
 
     /**

diff --git a/core/src/test/java/com/google/bitcoin/wallet/BasicKeyChainTest.java b/core/src/test/java/com/google/bitcoin/wallet/BasicKeyChainTest.java
@@ -61,7 +61,7 @@ public void onKeysAdded(List<ECKey> keys2) {
     @Test
     public void importKeys() {
         long now = Utils.currentTimeSeconds();
-        Utils.rollMockClock(0);
+        Utils.setMockClock(now);
         final ECKey key1 = new ECKey();
         Utils.rollMockClock(86400);
         final ECKey key2 = new ECKey();
@@ -185,7 +185,7 @@ public void cannotMixParams() throws Exception {
 
     @Test
     public void serializationUnencrypted() throws UnreadableWalletException {
-        Utils.rollMockClock(0);
+        Utils.setMockClock();
         Date now = Utils.now();
         final ECKey key1 = new ECKey();
         Utils.rollMockClock(5000);

diff --git a/core/src/test/java/com/google/bitcoin/wallet/KeyChainGroupTest.java b/core/src/test/java/com/google/bitcoin/wallet/KeyChainGroupTest.java
@@ -45,7 +45,7 @@ public class KeyChainGroupTest {
 
     public KeyChainGroupTest() {
         BriefLogFormatter.init();
-        Utils.rollMockClock(0);
+        Utils.setMockClock();
         group = new KeyChainGroup();
         group.setLookaheadSize(LOOKAHEAD_SIZE);   // Don't want slow tests.
         group.getActiveKeyChain();  // Force create a chain.