1 files changed, 11 insertions, 12 deletions
diff --git a/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToValueAndCloserTest.java b/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToValueAndCloserTest.java
index ac3cf5569..c249eca34 100644
--- a/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToValueAndCloserTest.java
+++ b/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToValueAndCloserTest.java
@@ -22,6 +22,7 @@ import static com.google.common.util.concurrent.MoreExecutors.shutdownAndAwaitTe
 import static com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.util.concurrent.ClosingFuture.ClosingCallable;
 import com.google.common.util.concurrent.ClosingFuture.DeferredCloser;
@@ -61,12 +62,11 @@ public class ClosingFutureFinishToValueAndCloserTest extends AbstractClosingFutu
             executor);
     closingFuture.finishToValueAndCloser(
         new NoOpValueAndCloserConsumer<>(), finishToValueAndCloserExecutor);
-    try {
-      closingFuture.finishToValueAndCloser(
-          new NoOpValueAndCloserConsumer<>(), finishToValueAndCloserExecutor);
-      fail("should have thrown");
-    } catch (IllegalStateException expected) {
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            closingFuture.finishToValueAndCloser(
+                new NoOpValueAndCloserConsumer<>(), finishToValueAndCloserExecutor));
   }
 
   public void testFinishToValueAndCloser_throwsAfterCallingFinishToFuture() throws Exception {
@@ -80,12 +80,11 @@ public class ClosingFutureFinishToValueAndCloserTest extends AbstractClosingFutu
             },
             executor);
     FluentFuture<Closeable> unused = closingFuture.finishToFuture();
-    try {
-      closingFuture.finishToValueAndCloser(
-          new NoOpValueAndCloserConsumer<>(), finishToValueAndCloserExecutor);
-      fail("should have thrown");
-    } catch (IllegalStateException expected) {
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            closingFuture.finishToValueAndCloser(
+                new NoOpValueAndCloserConsumer<>(), finishToValueAndCloserExecutor));
   }
 
   @Override