Merge pull request #124 from adambalogh/master

Return -1 as delay for removed elements in DeltaQueue
jmock-developers · Apr 2, 2019 · a49f6a0 · a49f6a0
2 parents 1b3d8b9 + be91ddb
commit a49f6a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/jmock/src/main/java/org/jmock/lib/concurrent/internal/DeltaQueue.java b/jmock/src/main/java/org/jmock/lib/concurrent/internal/DeltaQueue.java
@@ -42,7 +42,7 @@ public long delay(T element) {
             next = next.next;
         }
         if (next == null) {
-            throw new IllegalStateException("Element not found in the delay queue");
+            return -1;
         }
         return ret;
     }

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
@@ -146,10 +146,7 @@ public void testGetDelayOnPassedTasks() throws Exception {
 
         scheduler.tick(2, TimeUnit.MILLISECONDS);
 
-        try {
-            assertEquals(0, task1.getDelay(TimeUnit.MILLISECONDS));
-            fail("should have thrown IllegalStateException");
-        } catch (IllegalStateException expected) {}
+        assertEquals(-1, task1.getDelay(TimeUnit.MILLISECONDS));
     }
 
     public class ExampleException extends Exception {}

diff --git a/jmock/src/test/java/org/jmock/test/unit/lib/concurrent/internal/DeltaQueueTests.java b/jmock/src/test/java/org/jmock/test/unit/lib/concurrent/internal/DeltaQueueTests.java
@@ -167,4 +167,11 @@ public void testReturnsFalseIfElementAlreadyRemoved() {
 
         assertFalse(deltaQueue.remove(elementC));
     }
+
+    public void testDelayIsMinusOneWhenElementIsAlreadyRemoved() {
+        deltaQueue.add(1L, elementA);
+        deltaQueue.remove(elementA);
+
+        assertEquals("delay", -1, deltaQueue.delay(elementA));
+    }
 }