Merge "Upgrade guava to v33.0.0" into main am: fcb6827395 am: 0be00b5218

Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2894060

Change-Id: I8deb731e9d2b4cc35b6760f190c9e7583e91b271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/guava-tests/test/com/google/common/collect/FauxveridesTest.java
index f7eda67d5..9dfac093f 100644
--- a/guava-tests/test/com/google/common/collect/FauxveridesTest.java
+++ b/guava-tests/test/com/google/common/collect/FauxveridesTest.java
@@ -21,6 +21,7 @@ import static com.google.common.collect.Sets.difference;
 import static com.google.common.collect.Sets.newHashSet;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -44,26 +45,32 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * @author Chris Povirk
  */
 public class FauxveridesTest extends TestCase {
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableBiMap() {
     doHasAllFauxveridesTest(ImmutableBiMap.class, ImmutableMap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableListMultimap() {
     doHasAllFauxveridesTest(ImmutableListMultimap.class, ImmutableMultimap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSetMultimap() {
     doHasAllFauxveridesTest(ImmutableSetMultimap.class, ImmutableMultimap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSortedMap() {
     doHasAllFauxveridesTest(ImmutableSortedMap.class, ImmutableMap.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSortedSet() {
     doHasAllFauxveridesTest(ImmutableSortedSet.class, ImmutableSet.class);
   }
 
+  @AndroidIncompatible // similar to ImmutableTableTest.testNullPointerInstance
   public void testImmutableSortedMultiset() {
     doHasAllFauxveridesTest(ImmutableSortedMultiset.class, ImmutableMultiset.class);
   }
@@ -78,31 +85,19 @@ public class FauxveridesTest extends TestCase {
     Map<Object, Object> original =
         ImmutableMap.of(new Object(), new Object(), new Object(), new Object());
 
-    try {
-      ImmutableSortedMap.copyOf(original);
-      fail();
-    } catch (ClassCastException expected) {
-    }
+    assertThrows(ClassCastException.class, () -> ImmutableSortedMap.copyOf(original));
   }
 
   public void testImmutableSortedSetCopyOfIterable() {
     Set<Object> original = ImmutableSet.of(new Object(), new Object());
 
-    try {
-      ImmutableSortedSet.copyOf(original);
-      fail();
-    } catch (ClassCastException expected) {
-    }
+    assertThrows(ClassCastException.class, () -> ImmutableSortedSet.copyOf(original));
   }
 
   public void testImmutableSortedSetCopyOfIterator() {
     Set<Object> original = ImmutableSet.of(new Object(), new Object());
 
-    try {
-      ImmutableSortedSet.copyOf(original.iterator());
-      fail();
-    } catch (ClassCastException expected) {
-    }
+    assertThrows(ClassCastException.class, () -> ImmutableSortedSet.copyOf(original.iterator()));
   }
 
   private void doHasAllFauxveridesTest(Class<?> descendant, Class<?> ancestor) {