1 files changed, 5 insertions, 16 deletions
diff --git a/android/guava-tests/test/com/google/common/eventbus/SubscriberRegistryTest.java b/android/guava-tests/test/com/google/common/eventbus/SubscriberRegistryTest.java
index c9e5c9a5b..901bb2b51 100644
--- a/android/guava-tests/test/com/google/common/eventbus/SubscriberRegistryTest.java
+++ b/android/guava-tests/test/com/google/common/eventbus/SubscriberRegistryTest.java
@@ -16,6 +16,8 @@
 
 package com.google.common.eventbus;
 
+import static org.junit.Assert.assertThrows;
+
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterators;
 import java.util.Iterator;
@@ -59,28 +61,15 @@ public class SubscriberRegistryTest extends TestCase {
   }
 
   public void testUnregister_notRegistered() {
-    try {
-      registry.unregister(new StringSubscriber());
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(IllegalArgumentException.class, () -> registry.unregister(new StringSubscriber()));
 
     StringSubscriber s1 = new StringSubscriber();
     registry.register(s1);
-    try {
-      registry.unregister(new StringSubscriber());
-      fail();
-    } catch (IllegalArgumentException expected) {
-      // a StringSubscriber was registered, but not the same one we tried to unregister
-    }
+    assertThrows(IllegalArgumentException.class, () -> registry.unregister(new StringSubscriber()));
 
     registry.unregister(s1);
 
-    try {
-      registry.unregister(s1);
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(IllegalArgumentException.class, () -> registry.unregister(s1));
   }
 
   public void testGetSubscribers() {