Merge pull request #1647 from lukas-krecan/pr/1641

#1640 Fix LockAssert.makeAllAssertsPass(true) to not start more than once
lukas-krecan · Dec 7, 2023 · c83473f · c83473f
2 parents 3cfc1dd + 19b7cbd
commit c83473f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/shedlock-core/src/main/java/net/javacrumbs/shedlock/core/LockAssert.java b/shedlock-core/src/main/java/net/javacrumbs/shedlock/core/LockAssert.java
@@ -76,7 +76,9 @@ public static class TestHelper {
          */
         public static void makeAllAssertsPass(boolean pass) {
             if (pass) {
-                LockAssert.startLock(TEST_LOCK_NAME);
+                if (!LockAssert.alreadyLockedBy(TEST_LOCK_NAME)) {
+                    LockAssert.startLock(TEST_LOCK_NAME);
+                }
             } else {
                 if (LockAssert.alreadyLockedBy(TEST_LOCK_NAME)) {
                     LockAssert.endLock();

diff --git a/shedlock-core/src/test/java/net/javacrumbs/shedlock/core/LockAssertTest.java b/shedlock-core/src/test/java/net/javacrumbs/shedlock/core/LockAssertTest.java
@@ -80,4 +80,15 @@ void assertShouldNotFailIfConfiguredForTests() {
     void makeAllAssertsPassShouldNotFail() {
         LockAssert.TestHelper.makeAllAssertsPass(false);
     }
+
+    @Test
+    void shouldNotStartMoreThanOneTestLock() {
+        assertThatThrownBy(LockAssert::assertLocked).isInstanceOf(IllegalStateException.class);
+        LockAssert.TestHelper.makeAllAssertsPass(true);
+        LockAssert.TestHelper.makeAllAssertsPass(true);
+
+        LockAssert.TestHelper.makeAllAssertsPass(false);
+
+        assertThatThrownBy(LockAssert::assertLocked).isInstanceOf(IllegalStateException.class);
+    }
 }