Merge pull request #237 from leonz/patch-1

DeterministicScheduler: Future is done if cancelled
jmock-developers · Mar 16, 2024 · c44dfc0 · c44dfc0
2 parents 589745f + 9988365
commit c44dfc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/jmock/src/main/java/org/jmock/lib/concurrent/DeterministicScheduler.java b/jmock/src/main/java/org/jmock/lib/concurrent/DeterministicScheduler.java
@@ -219,6 +219,7 @@ public int compareTo(Delayed o) {
 
         public boolean cancel(boolean mayInterruptIfRunning) {
             isCancelled = true;
+            isDone = true;
             return deltaQueue.remove(this);
         }
 

diff --git a/jmock/src/test/java/org/jmock/test/unit/lib/concurrent/DeterministicSchedulerTests.java b/jmock/src/test/java/org/jmock/test/unit/lib/concurrent/DeterministicSchedulerTests.java
@@ -236,6 +236,7 @@ public void testCanCancelScheduledCommands() {
         assertFalse(future.isCancelled());
         future.cancel(dontCare);
         assertTrue(future.isCancelled());
+        assertTrue(future.isDone()); // fixes #
 
         checking(new Expectations() {{
             never (commandA);