aboutsummaryrefslogtreecommitdiff
path: root/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java')
-rw-r--r--guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java b/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java
index 66ad78491..a82aa8710 100644
--- a/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java
+++ b/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java
@@ -16,6 +16,8 @@
package com.google.common.util.concurrent.testing;
+import static org.junit.Assert.assertThrows;
+
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.ListeningScheduledExecutorService;
import java.util.List;
@@ -76,12 +78,7 @@ public class TestingExecutorsTest extends TestCase {
Future<Boolean> future = futureList.get(0);
assertFalse(taskDone);
assertTrue(future.isDone());
- try {
- future.get();
- fail();
- } catch (CancellationException e) {
- // pass
- }
+ assertThrows(CancellationException.class, () -> future.get());
}
public void testSameThreadScheduledExecutor() throws ExecutionException, InterruptedException {
@@ -110,11 +107,6 @@ public class TestingExecutorsTest extends TestCase {
};
Future<?> future = TestingExecutors.sameThreadScheduledExecutor().submit(runnable);
- try {
- future.get();
- fail("Should have thrown exception");
- } catch (ExecutionException e) {
- // pass
- }
+ assertThrows(ExecutionException.class, () -> future.get());
}
}