Apply InlineMe, or suppress where appropriate.

RELNOTES=n/a
PiperOrigin-RevId: 725859649

Author: cpovirk

android/guava-tests/test/com/google/common/base/CharMatcherTest.java

@@ -362,7 +362,11 @@ private void doTestNoMatchThenMatch(CharMatcher matcher, String s) {
     reallyTestMatchThenNoMatch(matcher.precomputed().negate(), s);
   }
 
-  @SuppressWarnings("deprecation") // intentionally testing apply() method
+  // intentionally testing apply() method
+  @SuppressWarnings({
+    "deprecation",
+    "InlineMeInliner",
+  })
   private void reallyTestOneCharMatch(CharMatcher matcher, String s) {
     assertTrue(matcher.matches(s.charAt(0)));
     assertTrue(matcher.apply(s.charAt(0)));
@@ -380,7 +384,11 @@ private void reallyTestOneCharMatch(CharMatcher matcher, String s) {
     assertEquals(1, matcher.countIn(s));
   }
 
-  @SuppressWarnings("deprecation") // intentionally testing apply() method
+  // intentionally testing apply() method
+  @SuppressWarnings({
+    "deprecation",
+    "InlineMeInliner",
+  })
   private void reallyTestOneCharNoMatch(CharMatcher matcher, String s) {
     assertFalse(matcher.matches(s.charAt(0)));
     assertFalse(matcher.apply(s.charAt(0)));

android/guava-tests/test/com/google/common/collect/ComparisonChainTest.java

@@ -40,7 +40,7 @@ public int compareTo(DontCompareMe o) {
     }
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testCompareBooleans() {
     assertThat(
             ComparisonChain.start()

android/guava-tests/test/com/google/common/collect/IterablesTest.java

@@ -879,7 +879,7 @@ public void testUnmodifiableIterable() {
     assertEquals("[a, b, c]", iterable.toString());
   }
 
-  @SuppressWarnings("deprecation") // test of deprecated method
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableIterableShortCircuit() {
     List<String> list = newArrayList("a", "b", "c");
     Iterable<String> iterable = Iterables.unmodifiableIterable(list);

android/guava-tests/test/com/google/common/collect/IteratorsTest.java

@@ -1526,7 +1526,7 @@ public void testIndexOf_consumedDataNoMatch() {
     assertFalse(iterator.hasNext());
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableIteratorShortCircuit() {
     Iterator<String> mod = Lists.newArrayList("a", "b", "c").iterator();
     UnmodifiableIterator<String> unmod = Iterators.unmodifiableIterator(mod);
@@ -1535,7 +1535,7 @@ public void testUnmodifiableIteratorShortCircuit() {
     assertSame(unmod, Iterators.unmodifiableIterator((Iterator<String>) unmod));
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testPeekingIteratorShortCircuit() {
     Iterator<String> nonpeek = Lists.newArrayList("a", "b", "c").iterator();
     PeekingIterator<String> peek = Iterators.peekingIterator(nonpeek);

android/guava-tests/test/com/google/common/collect/MultimapsTest.java

@@ -81,7 +81,7 @@ public class MultimapsTest extends TestCase {
   private static final Comparator<Integer> INT_COMPARATOR =
       Ordering.<Integer>natural().reverse().nullsFirst();
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableListMultimapShortCircuit() {
     ListMultimap<String, Integer> mod = ArrayListMultimap.create();
     ListMultimap<String, Integer> unmod = Multimaps.unmodifiableListMultimap(mod);
@@ -94,7 +94,7 @@ public void testUnmodifiableListMultimapShortCircuit() {
         immutable, Multimaps.unmodifiableListMultimap((ListMultimap<String, Integer>) immutable));
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableSetMultimapShortCircuit() {
     SetMultimap<String, Integer> mod = HashMultimap.create();
     SetMultimap<String, Integer> unmod = Multimaps.unmodifiableSetMultimap(mod);
@@ -107,7 +107,7 @@ public void testUnmodifiableSetMultimapShortCircuit() {
         immutable, Multimaps.unmodifiableSetMultimap((SetMultimap<String, Integer>) immutable));
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableMultimapShortCircuit() {
     Multimap<String, Integer> mod = HashMultimap.create();
     Multimap<String, Integer> unmod = Multimaps.unmodifiableMultimap(mod);

android/guava-tests/test/com/google/common/collect/MultisetsTest.java

@@ -253,7 +253,7 @@ public void testRemoveOccurrencesMultisetIterable() {
     assertThat(multiset).containsExactly("a", "c").inOrder();
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testUnmodifiableMultisetShortCircuit() {
     Multiset<String> mod = HashMultiset.create();
     Multiset<String> unmod = unmodifiableMultiset(mod);

android/guava-tests/test/com/google/common/collect/OrderingTest.java

@@ -133,7 +133,7 @@ public void testFrom() {
     assertTrue(caseInsensitiveOrdering.compare("a", "B") < 0);
     assertTrue(caseInsensitiveOrdering.compare("B", "a") > 0);
 
-    @SuppressWarnings("deprecation") // test of deprecated method
+    @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
     Ordering<String> orderingFromOrdering = Ordering.from(Ordering.<String>natural());
     new EqualsTester()
         .addEqualityGroup(caseInsensitiveOrdering, Ordering.from(String.CASE_INSENSITIVE_ORDER))
@@ -442,6 +442,7 @@ public void testNullsLast() {
         .testEquals();
   }
 
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testBinarySearch() {
     List<Integer> ints = Lists.newArrayList(0, 2, 3, 5, 7, 9);
     assertEquals(4, numberOrdering.binarySearch(ints, 7));
@@ -966,6 +967,7 @@ void testMinAndMax() {
       assertEquals(max, ordering.max(max, min));
     }
 
+    @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
     void testBinarySearch() {
       for (int i = 0; i < strictlyOrderedList.size(); i++) {
         assertEquals(i, ordering.binarySearch(strictlyOrderedList, strictlyOrderedList.get(i)));

android/guava-tests/test/com/google/common/collect/SetsTest.java

@@ -662,6 +662,7 @@ public void testNullPointerExceptions() {
   }
 
   public void testNewSetFromMap() {
+    @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
     Set<Integer> set = Sets.newSetFromMap(new HashMap<Integer, Boolean>());
     set.addAll(SOME_COLLECTION);
     verifySetContents(set, SOME_COLLECTION);
@@ -670,12 +671,14 @@ public void testNewSetFromMap() {
   @J2ktIncompatible
   @GwtIncompatible // SerializableTester
   public void testNewSetFromMapSerialization() {
+    @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
     Set<Integer> set = Sets.newSetFromMap(new LinkedHashMap<Integer, Boolean>());
     set.addAll(SOME_COLLECTION);
     Set<Integer> copy = SerializableTester.reserializeAndAssert(set);
     assertThat(copy).containsExactly(0, 1).inOrder();
   }
 
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testNewSetFromMapIllegal() {
     Map<Integer, Boolean> map = new LinkedHashMap<>();
     map.put(2, true);

android/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java

@@ -155,6 +155,7 @@ public void testValuesToString_ordered() {
     assertEquals("[b, a, c]", table.values().toString());
   }
 
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   public void testRowComparator() {
     sortedTable = TreeBasedTable.create();
     assertSame(Ordering.natural(), sortedTable.rowComparator());

android/guava-tests/test/com/google/common/hash/BloomFilterTest.java

@@ -304,6 +304,7 @@ public void testLargeNumberOfInsertions() {
     unused = BloomFilter.create(Funnels.unencodedCharsFunnel(), 45L * Integer.MAX_VALUE, 0.99);
   }
 
+  @SuppressWarnings({"deprecation", "InlineMeInliner"}) // test of a deprecated method
   private static void checkSanity(BloomFilter<Object> bf) {
     assertFalse(bf.mightContain(new Object()));
     assertFalse(bf.apply(new Object()));