replacing ExecutorShutdownCondition with lambda, seems like it's quic…

…ker(?) so had to bump the test timeouts.
tobyweston · Jan 21, 2014 · 418413e · 418413e
1 parent e6107cc
commit 418413e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 40 deletions.
diff --git a/src/main/java/com/google/code/tempusfugit/condition/Conditions.java b/src/main/java/com/google/code/tempusfugit/condition/Conditions.java
@@ -17,12 +17,12 @@
 package com.google.code.tempusfugit.condition;
 
 import com.google.code.tempusfugit.concurrency.Callable;
-import com.google.code.tempusfugit.temporal.Condition;
-import com.google.code.tempusfugit.temporal.SelfDescribingCondition;
+import com.google.code.tempusfugit.temporal.*;
 import org.hamcrest.Matcher;
 import org.junit.Assert;
 
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeoutException;
 
 public final class Conditions {
 
@@ -31,7 +31,7 @@ public static Condition not(Condition condition) {
     }
 
     public static Condition shutdown(ExecutorService service) {
-        return new ExecutorShutdownCondition(service);
+        return service::isShutdown;
     }
 
     public static Condition isAlive(Thread thread) {

diff --git a/src/main/java/com/google/code/tempusfugit/condition/ExecutorShutdownCondition.java b/src/main/java/com/google/code/tempusfugit/condition/ExecutorShutdownCondition.java
diff --git a/src/test/java/com/google/code/tempusfugit/concurrency/ExecutorServiceShutdownTest.java b/src/test/java/com/google/code/tempusfugit/concurrency/ExecutorServiceShutdownTest.java
@@ -31,6 +31,7 @@
 
 import static com.google.code.tempusfugit.concurrency.ExecutorServiceShutdown.shutdown;
 import static com.google.code.tempusfugit.temporal.Duration.millis;
+import static com.google.code.tempusfugit.temporal.Duration.seconds;
 import static com.google.code.tempusfugit.temporal.Timeout.timeout;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -94,7 +95,7 @@ public void waitingForShutdown() throws TimeoutException, InterruptedException {
             oneOf(executor).shutdownNow();
             oneOf(executor).isShutdown(); will(returnValue(true));
         }});
-        assertThat(shutdown(executor).waitingForShutdown(timeout(millis(5))), is(true));
+        assertThat(shutdown(executor).waitingForShutdown(timeout(millis(500))), is(true));
     }
 
     @Test(expected = TimeoutException.class)
@@ -103,7 +104,7 @@ public void waitingForShutdownTimesOut() throws TimeoutException, InterruptedExc
             oneOf(executor).shutdownNow();
             atLeast(1).of(executor).isShutdown(); will(returnValue(false));
         }});
-        shutdown(executor).waitingForShutdown(timeout(millis(5)));
+        shutdown(executor).waitingForShutdown(timeout(millis(500)));
     }
 
     private void awaitingTermination(final boolean result) throws InterruptedException {