Reenable NullPointerTester tests for our internal Android-emulator …

…testing. We had disabled the tests in that environment because `NullPointerTester` performed reflection on types that contained `Collector`-based APIs. Since `Collector` wasn't available, the tests failed. But now, we've enabled library desugaring for our internal tests (though we continue not to _require_ library desugaring unless users actually use such APIs), so the tests can work again. (relevant to #6567) RELNOTES=n/a PiperOrigin-RevId: 634784425
google · May 17, 2024 · 6dd1cb1 · 6dd1cb1
1 parent dc200d3
commit 6dd1cb1
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 102 deletions.
diff --git a/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java
@@ -45,32 +45,26 @@
  * @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);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -581,7 +581,6 @@ public void testEmptySerialization() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableListMultimap.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java
@@ -468,7 +468,6 @@ public void testToImmutableList_java7_combine() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableList.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java
@@ -907,7 +907,6 @@ public void testAsMultimapCaches() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMap.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java
@@ -132,7 +132,6 @@ public void testEquals() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMultimap.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java
@@ -480,7 +480,6 @@ public void testBuilderSetCountIllegal() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMultiset.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java
@@ -603,7 +603,6 @@ private ImmutableSetMultimap<String, Integer> createMultimap() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableSetMultimap.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java
@@ -664,7 +664,6 @@ public void testNullGet() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableSortedMap.class);

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMultisetTest.java
@@ -422,7 +422,6 @@ public void testBuilderSetCountIllegal() {
     assertThrows(IllegalArgumentException.class, () -> builder.setCount("a", -2));
   }
 
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(ImmutableSortedMultiset.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java
@@ -233,7 +233,6 @@ protected <E extends Comparable<? super E>> SortedSet<E> copyOf(Iterator<? exten
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(ImmutableSortedSet.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java
@@ -483,34 +483,4 @@ public void testOverflowCondition() {
     }
     assertTrue(builder.build() instanceof SparseImmutableTable);
   }
-
-  @J2ktIncompatible
-  @GwtIncompatible // NullPointerTester
-  @Override
-  public void testNullPointerInstance() {
-    if (isAndroid()) {
-      /*
-       * NPT fails under the old versions of Android we test under because it performs reflection on
-       * ImmutableTable, which declares static methods that refer to Collector, which is unavailable
-       * under such versions.
-       *
-       * We use a runtime check here instead of @AndroidIncompatible: @AndroidIncompatible operates
-       * by stripping annotated methods entirely, and if we strip this method, then JUnit would just
-       * run the supermethod as usual.
-       *
-       * TODO: b/292578973: Use @AndroidIncompatible if we change our system to keep the methods in
-       * place but to have the test runner skip them. However, note that if we choose to *both*
-       * strip the methods *and* have the test runner not run them (for some unusual cases in which
-       * we don't run the stripping test for technical reasons), then we'd be back to the problem
-       * described above, since the supermethod is *not* annotated @AndroidIncompatible (since it
-       * works fine with the other Table implementations).
-       */
-      return;
-    }
-    super.testNullPointerInstance();
-  }
-
-  private static boolean isAndroid() {
-    return System.getProperty("java.runtime.name", "").contains("Android");
-  }
 }
diff --git a/android/guava-tests/test/com/google/common/collect/IterablesTest.java b/android/guava-tests/test/com/google/common/collect/IterablesTest.java
@@ -1375,7 +1375,6 @@ public void testMergeSorted_skipping_pyramid() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testIterables_nullCheck() throws Exception {
     new ClassSanityTester()
         .forAllPublicStaticMethods(Iterables.class)

diff --git a/android/guava-tests/test/com/google/common/collect/MapsTest.java b/android/guava-tests/test/com/google/common/collect/MapsTest.java
@@ -389,7 +389,6 @@ public void testToStringImplWithNullValues() throws Exception {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointerExceptions() {
     new NullPointerTester().testAllPublicStaticMethods(Maps.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java
@@ -1030,7 +1030,6 @@ public void testFilteredKeysListMultimapGetBadValue() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(Multimaps.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/MultisetsTest.java b/android/guava-tests/test/com/google/common/collect/MultisetsTest.java
@@ -276,7 +276,6 @@ public void testHighestCountFirst() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(Multisets.class);
   }

diff --git a/android/guava-tests/test/com/google/common/collect/SetsTest.java b/android/guava-tests/test/com/google/common/collect/SetsTest.java
@@ -657,7 +657,6 @@ public void testComplementOfEmptySetWithoutTypeDoesntWork() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointerExceptions() {
     new NullPointerTester()
         .setDefault(Enum.class, SomeEnum.A)

diff --git a/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java
@@ -246,7 +246,6 @@ public void testFailureWhenMoreThan255HashFunctionsAreNeeded() {
         });
   }
 
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicInstanceMethods(BloomFilter.create(Funnels.unencodedCharsFunnel(), 100));

diff --git a/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/guava-tests/test/com/google/common/collect/FauxveridesTest.java
@@ -45,32 +45,26 @@
  * @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);
   }

diff --git a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -612,7 +612,6 @@ public void testEmptySerialization() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableListMultimap.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableListTest.java b/guava-tests/test/com/google/common/collect/ImmutableListTest.java
@@ -466,7 +466,6 @@ public void testToImmutableList() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableList.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java
@@ -918,7 +918,6 @@ public void testAsMultimapCaches() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMap.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java
@@ -132,7 +132,6 @@ public void testEquals() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMultimap.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java
@@ -586,7 +586,6 @@ public void testBuilderSetCountIllegal() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableMultiset.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java
@@ -636,7 +636,6 @@ private ImmutableSetMultimap<String, Integer> createMultimap() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNulls() throws Exception {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableSetMultimap.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java
@@ -690,7 +690,6 @@ public void testNullGet() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicStaticMethods(ImmutableSortedMap.class);

diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedMultisetTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedMultisetTest.java
@@ -453,7 +453,6 @@ public void testToImmutableSortedMultisetCountFunction() {
             "C");
   }
 
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(ImmutableSortedMultiset.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java
@@ -238,7 +238,6 @@ protected <E extends Comparable<? super E>> SortedSet<E> copyOf(Iterator<? exten
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(ImmutableSortedSet.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/ImmutableTableTest.java b/guava-tests/test/com/google/common/collect/ImmutableTableTest.java
@@ -489,34 +489,4 @@ public void testOverflowCondition() {
     }
     assertTrue(builder.build() instanceof SparseImmutableTable);
   }
-
-  @J2ktIncompatible
-  @GwtIncompatible // NullPointerTester
-  @Override
-  public void testNullPointerInstance() {
-    if (isAndroid()) {
-      /*
-       * NPT fails under the old versions of Android we test under because it performs reflection on
-       * ImmutableTable, which declares static methods that refer to Collector, which is unavailable
-       * under such versions.
-       *
-       * We use a runtime check here instead of @AndroidIncompatible: @AndroidIncompatible operates
-       * by stripping annotated methods entirely, and if we strip this method, then JUnit would just
-       * run the supermethod as usual.
-       *
-       * TODO: b/292578973: Use @AndroidIncompatible if we change our system to keep the methods in
-       * place but to have the test runner skip them. However, note that if we choose to *both*
-       * strip the methods *and* have the test runner not run them (for some unusual cases in which
-       * we don't run the stripping test for technical reasons), then we'd be back to the problem
-       * described above, since the supermethod is *not* annotated @AndroidIncompatible (since it
-       * works fine with the other Table implementations).
-       */
-      return;
-    }
-    super.testNullPointerInstance();
-  }
-
-  private static boolean isAndroid() {
-    return System.getProperty("java.runtime.name", "").contains("Android");
-  }
 }
diff --git a/guava-tests/test/com/google/common/collect/IterablesTest.java b/guava-tests/test/com/google/common/collect/IterablesTest.java
@@ -1412,7 +1412,6 @@ public void testMergeSorted_skipping_pyramid() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testIterables_nullCheck() throws Exception {
     new ClassSanityTester()
         .forAllPublicStaticMethods(Iterables.class)

diff --git a/guava-tests/test/com/google/common/collect/MapsTest.java b/guava-tests/test/com/google/common/collect/MapsTest.java
@@ -389,7 +389,6 @@ public void testToStringImplWithNullValues() throws Exception {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointerExceptions() {
     new NullPointerTester().testAllPublicStaticMethods(Maps.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/MultimapsTest.java b/guava-tests/test/com/google/common/collect/MultimapsTest.java
@@ -1099,7 +1099,6 @@ public void testFilteredKeysListMultimapGetBadValue() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(Multimaps.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/MultisetsTest.java b/guava-tests/test/com/google/common/collect/MultisetsTest.java
@@ -297,7 +297,6 @@ public void testToMultisetCountFunction() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     new NullPointerTester().testAllPublicStaticMethods(Multisets.class);
   }

diff --git a/guava-tests/test/com/google/common/collect/SetsTest.java b/guava-tests/test/com/google/common/collect/SetsTest.java
@@ -690,7 +690,6 @@ public void testComplementOfEmptySetWithoutTypeDoesntWork() {
 
   @J2ktIncompatible
   @GwtIncompatible // NullPointerTester
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointerExceptions() {
     new NullPointerTester()
         .setDefault(Enum.class, SomeEnum.A)

diff --git a/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/guava-tests/test/com/google/common/hash/BloomFilterTest.java
@@ -246,7 +246,6 @@ public void testFailureWhenMoreThan255HashFunctionsAreNeeded() {
         });
   }
 
-  @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
   public void testNullPointers() {
     NullPointerTester tester = new NullPointerTester();
     tester.testAllPublicInstanceMethods(BloomFilter.create(Funnels.unencodedCharsFunnel(), 100));
-Original file line number
+Diff line change
@@ Expand Up / @@ -453,7 +453,6 @@ public void testToImmutableSortedMultisetCountFunction() { @@
                 "C");
       }
-      @AndroidIncompatible // see ImmutableTableTest.testNullPointerInstance
       public void testNullPointers() {
         new NullPointerTester().testAllPublicStaticMethods(ImmutableSortedMultiset.class);
       }
@@ Expand Down @@