Merge pull request lukas-krecan#19 from lukas-krecan/check-times

lukas-krecan · web-flow · commit 1b578126bd80 · 2017-05-09T07:48:38.000+02:00
Checking that lockAtMost is not before lockAtLeast
diff --git a/shedlock-core/src/main/java/net/javacrumbs/shedlock/core/LockConfiguration.java b/shedlock-core/src/main/java/net/javacrumbs/shedlock/core/LockConfiguration.java
@@ -42,6 +42,12 @@ public LockConfiguration(String name, Instant lockUntil, Instant lockAtLeastUnti
         this.name = Objects.requireNonNull(name);
         this.lockAtMostUntil = Objects.requireNonNull(lockUntil);
         this.lockAtLeastUntil = Objects.requireNonNull(lockAtLeastUntil);
+        if (lockAtLeastUntil.isAfter(lockAtMostUntil)) {
+            throw new IllegalArgumentException("lockAtMost is before lockAtLeast for lock '" + name + "'.");
+        }
+        if (lockAtMostUntil.isBefore(Instant.now())) {
+            throw new IllegalArgumentException("lockAtMost is in the past for lock '" + name + "'.");
+        }
     }
 
     public String getName() {
diff --git a/shedlock-provider-zookeeper-curator/src/test/java/net/javacrumbs/shedlock/provider/zookeeper/curator/ZookeeperCuratorLockProviderIntegrationTest.java b/shedlock-provider-zookeeper-curator/src/test/java/net/javacrumbs/shedlock/provider/zookeeper/curator/ZookeeperCuratorLockProviderIntegrationTest.java
@@ -82,8 +82,8 @@ public void shouldRemoveLockWhenClientStops() throws InterruptedException {
     @Test
     @Override
     public void shouldLockAtLeastFor() throws InterruptedException {
-        LockConfiguration configWithGracePeriod = lockConfig(LOCK_NAME1, 0, LOCK_AT_LEAST_FOR);
-        assertThatThrownBy(() -> getLockProvider().lock(configWithGracePeriod)).isInstanceOf(UnsupportedOperationException.class);
+        LockConfiguration configWithAtLeastFor = lockConfig(LOCK_NAME1, LOCK_AT_LEAST_FOR, LOCK_AT_LEAST_FOR);
+        assertThatThrownBy(() -> getLockProvider().lock(configWithAtLeastFor)).isInstanceOf(UnsupportedOperationException.class);
     }
 
     @Override
diff --git a/shedlock-spring/src/test/java/net/javacrumbs/shedlock/spring/SpringLockConfigurationExtractorTest.java b/shedlock-spring/src/test/java/net/javacrumbs/shedlock/spring/SpringLockConfigurationExtractorTest.java
@@ -36,7 +36,7 @@
 
 public class SpringLockConfigurationExtractorTest {
     public static final Duration DEFAULT_LOCK_TIME = Duration.of(30, ChronoUnit.MINUTES);
-    public static final Duration DEFAULT_LOCK_AT_LEAST_FOR = Duration.of(5, ChronoUnit.MINUTES);
+    public static final Duration DEFAULT_LOCK_AT_LEAST_FOR = Duration.of(5, ChronoUnit.MILLIS);
     private final SpringLockConfigurationExtractor extractor = new SpringLockConfigurationExtractor(DEFAULT_LOCK_TIME, DEFAULT_LOCK_AT_LEAST_FOR);
 
 
diff --git a/shedlock-test-support/src/main/java/net/javacrumbs/shedlock/test/support/AbstractLockProviderIntegrationTest.java b/shedlock-test-support/src/main/java/net/javacrumbs/shedlock/test/support/AbstractLockProviderIntegrationTest.java
@@ -24,15 +24,15 @@
 import java.time.Instant;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.Thread.sleep;
-import static java.time.temporal.ChronoUnit.MILLIS;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static java.time.temporal.ChronoUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class AbstractLockProviderIntegrationTest {
     protected static final String LOCK_NAME1 = "name";
-    public static final Duration LOCK_AT_LEAST_FOR = Duration.of(1000, MILLIS);
+    public static final Duration LOCK_AT_LEAST_FOR = Duration.of(5, SECONDS);
 
     protected abstract LockProvider getLockProvider();
 
@@ -85,7 +85,7 @@ public void shouldLockTwiceInARow() {
 
     @Test
     public void shouldTimeout() throws InterruptedException {
-        LockConfiguration configWithShortTimeout = lockConfig(LOCK_NAME1, 2, Duration.ZERO);
+        LockConfiguration configWithShortTimeout = lockConfig(LOCK_NAME1, Duration.ofMillis(2), Duration.ZERO);
         Optional<SimpleLock> lock1 = getLockProvider().lock(configWithShortTimeout);
         assertThat(lock1).isNotEmpty();
 
@@ -114,7 +114,7 @@ public void fuzzTestShouldPass() throws ExecutionException, InterruptedException
 
     @Test
     public void shouldLockAtLeastFor() throws InterruptedException {
-        LockConfiguration configWithGracePeriod = lockConfig(LOCK_NAME1, 0, LOCK_AT_LEAST_FOR);
+        LockConfiguration configWithGracePeriod = lockConfig(LOCK_NAME1, LOCK_AT_LEAST_FOR, LOCK_AT_LEAST_FOR);
         Optional<SimpleLock> lock1 = getLockProvider().lock(configWithGracePeriod);
         assertThat(lock1).isNotEmpty();
         lock1.get().unlock();
@@ -131,12 +131,12 @@ public void shouldLockAtLeastFor() throws InterruptedException {
     }
 
     protected static LockConfiguration lockConfig(String name) {
-        return lockConfig(name, TimeUnit.MINUTES.toMillis(5), Duration.ZERO);
+        return lockConfig(name, Duration.of(5, MINUTES), Duration.ZERO);
     }
 
-    protected static LockConfiguration lockConfig(String name, long timeoutMillis, Duration lockAtLeastFor) {
+    protected static LockConfiguration lockConfig(String name, Duration lockAtMostFor, Duration lockAtLeastFor) {
         Instant now = Instant.now();
-        return new LockConfiguration(name, now.plus(timeoutMillis, MILLIS), now.plus(lockAtLeastFor));
+        return new LockConfiguration(name, now.plus(lockAtMostFor), now.plus(lockAtLeastFor));
     }
 
 }
