1 files changed, 3 insertions, 10 deletions
diff --git a/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java
index 1d38c8600..f7ffbc92f 100644
--- a/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java
+++ b/android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java
@@ -20,6 +20,7 @@ import static com.google.common.collect.MapMakerInternalMap.Strength.STRONG;
 import static com.google.common.collect.MapMakerInternalMap.Strength.WEAK;
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static java.util.Arrays.asList;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
@@ -159,11 +160,7 @@ public class ConcurrentHashMultisetTest extends TestCase {
 
     when(backingMap.get(KEY)).thenReturn(new AtomicInteger(INITIAL_COUNT));
 
-    try {
-      multiset.add(KEY, COUNT_TO_ADD);
-      fail("Must reject arguments that would cause counter overflow.");
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(IllegalArgumentException.class, () -> multiset.add(KEY, COUNT_TO_ADD));
   }
 
   /**
@@ -246,11 +243,7 @@ public class ConcurrentHashMultisetTest extends TestCase {
     cms.add("a", 2);
     cms.add("b", 3);
 
-    try {
-      cms.removeExactly("a", -2);
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(IllegalArgumentException.class, () -> cms.removeExactly("a", -2));
 
     assertTrue(cms.removeExactly("a", 0));
     assertEquals(2, cms.count("a"));