Refactor AbstractExtensibleLockProviderIntegrationTest

lukas-krecan · lukas-krecan · commit a2617e17e289 · 2020-07-12T08:28:34.000+02:00
diff --git a/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/AbstractJdbcLockProviderIntegrationTest.java b/providers/jdbc/shedlock-test-support-jdbc/src/main/java/net/javacrumbs/shedlock/test/support/jdbc/AbstractJdbcLockProviderIntegrationTest.java
@@ -69,8 +69,9 @@ protected void assertLocked(String lockName) {
 
     @Test
     public void shouldCreateLockIfRecordAlreadyExists() {
-        Timestamp previousLockTime = Timestamp.from(Instant.now().minusSeconds(60));
+        Timestamp previousLockTime = Timestamp.from(Instant.now().minus(1, ChronoUnit.DAYS));
         testUtils.getJdbcTemplate().update("INSERT INTO shedlock(name, lock_until, locked_at, locked_by) VALUES(?, ?, ?, ?)", LOCK_NAME1, previousLockTime, previousLockTime, "me");
+        assertUnlocked(LOCK_NAME1);
         shouldCreateLock();
     }
 
diff --git a/shedlock-test-support/src/main/java/net/javacrumbs/shedlock/test/support/AbstractExtensibleLockProviderIntegrationTest.java b/shedlock-test-support/src/main/java/net/javacrumbs/shedlock/test/support/AbstractExtensibleLockProviderIntegrationTest.java
@@ -15,7 +15,6 @@
  */
 package net.javacrumbs.shedlock.test.support;
 
-import net.javacrumbs.shedlock.core.ClockProvider;
 import net.javacrumbs.shedlock.core.SimpleLock;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.jupiter.api.Test;
@@ -63,41 +62,47 @@ public void shouldNotBeAbleToExtendExpiredLock() {
         sleepFor(Duration.ofMillis(1));
         assertThat(lock).isNotEmpty();
 
-        Optional<SimpleLock> newLock = lock.get().extend(ClockProvider.now().plusSeconds(10), ClockProvider.now());
+        Optional<SimpleLock> newLock = lock.get().extend(Duration.ofSeconds(10), Duration.ZERO);
         assertThat(newLock).isEmpty();
         assertUnlocked(LOCK_NAME1);
     }
 
 
     @Test
     public void shouldBeAbleToExtendAtLeast() {
-        Optional<SimpleLock> lock = getLockProvider().lock(lockConfig(LOCK_NAME1, Duration.ofSeconds(10), Duration.ZERO));
-        assertThat(lock).isNotEmpty();
+        SimpleLock lock = lock();
 
-        Optional<SimpleLock> newLock = lock.get().extend(ClockProvider.now().plusSeconds(10), ClockProvider.now().plusSeconds(9));
-        assertThat(newLock).isNotEmpty();
-        newLock.get().unlock();
+        SimpleLock newLock = extendLock(lock);
+        newLock.unlock();
         assertLocked(LOCK_NAME1);
     }
 
     @Test
     public void lockCanNotBeExtendedTwice() {
-        Optional<SimpleLock> lock = getLockProvider().lock(lockConfig(LOCK_NAME1, Duration.ofSeconds(10), Duration.ZERO));
-        assertThat(lock).isNotEmpty();
-        Optional<SimpleLock> newLock = lock.get().extend(ClockProvider.now().plusSeconds(10), ClockProvider.now().plusSeconds(9));
-        assertThat(newLock).isNotEmpty();
+        SimpleLock lock = lock();
+        extendLock(lock);
 
-        assertInvalidLock(() -> lock.get().extend(ClockProvider.now().plusSeconds(10), ClockProvider.now().plusSeconds(9)));
+        assertInvalidLock(() -> lock.extend(Duration.ofSeconds(10), Duration.ofSeconds(9)));
     }
 
     @Test
     public void lockCanNotBeUnlockedAfterExtending() {
-        Optional<SimpleLock> lock = getLockProvider().lock(lockConfig(LOCK_NAME1, Duration.ofSeconds(10), Duration.ZERO));
-        assertThat(lock).isNotEmpty();
-        Optional<SimpleLock> newLock = lock.get().extend(ClockProvider.now().plusSeconds(10), ClockProvider.now().plusSeconds(9));
+        SimpleLock lock = lock();
+        extendLock(lock);
+
+        assertInvalidLock(lock::unlock);
+    }
+
+    private SimpleLock extendLock(SimpleLock lock) {
+        Optional<SimpleLock> newLock = lock.extend(Duration.ofSeconds(10), Duration.ofSeconds(9));
         assertThat(newLock).isNotEmpty();
+        return newLock.get();
+    }
 
-        assertInvalidLock(() -> lock.get().unlock());
+    private SimpleLock lock() {
+        Optional<SimpleLock> lock = getLockProvider().lock(lockConfig(LOCK_NAME1, Duration.ofSeconds(10), Duration.ZERO));
+        assertThat(lock).isNotEmpty();
+        return lock.get();
     }
 
     void assertInvalidLock(ThrowableAssert.ThrowingCallable operation) {

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ protected void assertLocked(String lockName) {`
`69`	`69`
`70`	`70`	`@Test`
`71`	`71`	`public void shouldCreateLockIfRecordAlreadyExists() {`
`72`		`- Timestamp previousLockTime = Timestamp.from(Instant.now().minusSeconds(60));`
	`72`	`+ Timestamp previousLockTime = Timestamp.from(Instant.now().minus(1, ChronoUnit.DAYS));`
`73`	`73`	`testUtils.getJdbcTemplate().update("INSERT INTO shedlock(name, lock_until, locked_at, locked_by) VALUES(?, ?, ?, ?)", LOCK_NAME1, previousLockTime, previousLockTime, "me");`
	`74`	`+ assertUnlocked(LOCK_NAME1);`
`74`	`75`	`shouldCreateLock();`
`75`	`76`	`}`
`76`	`77`