1 files changed, 11 insertions, 10 deletions
diff --git a/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToFutureTest.java b/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToFutureTest.java
index 79288eb2a..29ce341e1 100644
--- a/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToFutureTest.java
+++ b/android/guava-tests/test/com/google/common/util/concurrent/ClosingFutureFinishToFutureTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.util.concurrent.ClosingFuture.ClosingCallable;
 import com.google.common.util.concurrent.ClosingFuture.DeferredCloser;
@@ -39,11 +40,11 @@ public class ClosingFutureFinishToFutureTest extends AbstractClosingFutureTest {
             },
             executor);
     FluentFuture<Closeable> unused = closingFuture.finishToFuture();
-    try {
-      FluentFuture<Closeable> unused2 = closingFuture.finishToFuture();
-      fail("should have thrown");
-    } catch (IllegalStateException expected) {
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          FluentFuture<Closeable> unused2 = closingFuture.finishToFuture();
+        });
   }
 
   public void testFinishToFuture_throwsAfterCallingFinishToValueAndCloser() throws Exception {
@@ -57,11 +58,11 @@ public class ClosingFutureFinishToFutureTest extends AbstractClosingFutureTest {
             },
             executor);
     closingFuture.finishToValueAndCloser(new NoOpValueAndCloserConsumer<>(), directExecutor());
-    try {
-      FluentFuture<Closeable> unused = closingFuture.finishToFuture();
-      fail("should have thrown");
-    } catch (IllegalStateException expected) {
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          FluentFuture<Closeable> unused = closingFuture.finishToFuture();
+        });
   }
 
   public void testFinishToFuture_preventsFurtherDerivation() {