1 files changed, 18 insertions, 40 deletions

diff --git a/guava-tests/test/com/google/common/reflect/MutableTypeToInstanceMapTest.java b/guava-tests/test/com/google/common/reflect/MutableTypeToInstanceMapTest.java
index cea81e3a2..0ea574e46 100644
--- a/guava-tests/test/com/google/common/reflect/MutableTypeToInstanceMapTest.java
+++ b/guava-tests/test/com/google/common/reflect/MutableTypeToInstanceMapTest.java
@@ -18,6 +18,7 @@ package com.google.common.reflect;
 
 import static com.google.common.collect.Maps.immutableEntry;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -81,30 +82,23 @@ public class MutableTypeToInstanceMapTest extends TestCase {
   }
 
   public void testPutThrows() {
-    try {
-      map.put(TypeToken.of(Integer.class), new Integer(5));
-      fail();
-    } catch (UnsupportedOperationException expected) {
-    }
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> map.put(TypeToken.of(Integer.class), new Integer(5)));
   }
 
   public void testPutAllThrows() {
-    try {
-      map.putAll(ImmutableMap.of(TypeToken.of(Integer.class), new Integer(5)));
-      fail();
-    } catch (UnsupportedOperationException expected) {
-    }
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> map.putAll(ImmutableMap.of(TypeToken.of(Integer.class), new Integer(5))));
   }
 
   public void testEntrySetMutationThrows() {
     map.putInstance(String.class, "test");
     assertEquals(TypeToken.of(String.class), map.entrySet().iterator().next().getKey());
     assertEquals("test", map.entrySet().iterator().next().getValue());
-    try {
-      map.entrySet().iterator().next().setValue(1);
-      fail();
-    } catch (UnsupportedOperationException expected) {
-    }
+    assertThrows(
+        UnsupportedOperationException.class, () -> map.entrySet().iterator().next().setValue(1));
   }
 
   public void testEntrySetToArrayMutationThrows() {
@@ -113,11 +107,7 @@ public class MutableTypeToInstanceMapTest extends TestCase {
     Entry<Object, Object> entry = (Entry<Object, Object>) map.entrySet().toArray()[0];
     assertEquals(TypeToken.of(String.class), entry.getKey());
     assertEquals("test", entry.getValue());
-    try {
-      entry.setValue(1);
-      fail();
-    } catch (UnsupportedOperationException expected) {
-    }
+    assertThrows(UnsupportedOperationException.class, () -> entry.setValue(1));
   }
 
   public void testEntrySetToTypedArrayMutationThrows() {
@@ -126,11 +116,7 @@ public class MutableTypeToInstanceMapTest extends TestCase {
     Entry<Object, Object> entry = map.entrySet().toArray(new Entry[0])[0];
     assertEquals(TypeToken.of(String.class), entry.getKey());
     assertEquals("test", entry.getValue());
-    try {
-      entry.setValue(1);
-      fail();
-    } catch (UnsupportedOperationException expected) {
-    }
+    assertThrows(UnsupportedOperationException.class, () -> entry.setValue(1));
   }
 
   public void testPutAndGetInstance() {
@@ -147,11 +133,8 @@ public class MutableTypeToInstanceMapTest extends TestCase {
   }
 
   public void testNull() {
-    try {
-      map.putInstance((TypeToken) null, new Integer(1));
-      fail();
-    } catch (NullPointerException expected) {
-    }
+    assertThrows(
+        NullPointerException.class, () -> map.putInstance((TypeToken) null, new Integer(1)));
     map.putInstance(Integer.class, null);
     assertTrue(map.containsKey(TypeToken.of(Integer.class)));
     assertTrue(map.entrySet().contains(immutableEntry(TypeToken.of(Integer.class), null)));
@@ -208,19 +191,14 @@ public class MutableTypeToInstanceMapTest extends TestCase {
   }
 
   public void testGetInstance_withTypeVariable() {
-    try {
-      map.getInstance(this.<Number>anyIterableType());
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(
+        IllegalArgumentException.class, () -> map.getInstance(this.<Number>anyIterableType()));
   }
 
   public void testPutInstance_withTypeVariable() {
-    try {
-      map.putInstance(this.<Integer>anyIterableType(), ImmutableList.of(1));
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> map.putInstance(this.<Integer>anyIterableType(), ImmutableList.of(1)));
   }
 
   private <T> TypeToken<Iterable<T>> anyIterableType() {