#1635 Fix LockAssert.makeAllAssertsPass(false) if no lock is held

lukas-krecan · Dec 6, 2023 · 8d8f98a · 8d8f98a
1 parent a92d285
commit 8d8f98a
Show file tree

Hide file tree

Showing 2 changed files with 8 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
@@ -78,7 +78,9 @@ public static void makeAllAssertsPass(boolean pass) {
             if (pass) {
                 LockAssert.startLock(TEST_LOCK_NAME);
             } else {
-                LockAssert.endLock();
+                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
@@ -75,4 +75,9 @@ void assertShouldNotFailIfConfiguredForTests() {
         LockAssert.TestHelper.makeAllAssertsPass(false);
         assertThatThrownBy(LockAssert::assertLocked).isInstanceOf(IllegalStateException.class);
     }
+
+    @Test
+    void makeAllAssertsPassShouldNotFail() {
+        LockAssert.TestHelper.makeAllAssertsPass(false);
+    }
 }