Mark test-suite-builder suites and related code as `@AndroidIncompati…

…ble`.

(I did also sneak in one change to the backport copy of `IteratorsTest`. It resolve a diff that we accidentally introduced in cl/613629330.)

Such code is already not run when we run our tests under Android emulators. (The Android JUnit 3 runner just ignores `suite()` methods, I want to say?) However, it's still _built_ for them. Besides being a waste, this requires pulling in the whole suite-builder ecosystem, which is again causing problems when I try to bump various things related to Android versions. By adding `@AndroidIncompatible`, I configure our Android test build to strip the code altogether.

RELNOTES=n/a
PiperOrigin-RevId: 719363315

android/guava-testlib/test/com/google/common/collect/testing/AndroidIncompatible.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.common.collect.testing;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import com.google.common.annotations.GwtCompatible;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Signifies that a test should not be run under Android. This annotation is respected only by our
+ * Google-internal Android suite generators. Note that those generators also suppress any test
+ * annotated with MediumTest or LargeTest.
+ *
+ * <p>For more discussion, see {@linkplain com.google.common.base.AndroidIncompatible the
+ * documentation on another copy of this annotation}.
+ */
+@Retention(CLASS)
+@Target({ANNOTATION_TYPE, CONSTRUCTOR, FIELD, METHOD, TYPE})
+@GwtCompatible
+@interface AndroidIncompatible {}

android/guava-testlib/test/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilderTest.java

@@ -26,6 +26,7 @@
 /**
  * @author Max Ross
  */
+@AndroidIncompatible // test-suite builders
 public class FeatureSpecificTestSuiteBuilderTest extends TestCase {
   private static final class MyTestSuiteBuilder
       extends FeatureSpecificTestSuiteBuilder<MyTestSuiteBuilder, String> {

android/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java

@@ -52,6 +52,7 @@
  *
  * @author George van den Driessche
  */
+@AndroidIncompatible // test-suite builders
 public final class MapTestSuiteBuilderTests extends TestCase {
   private MapTestSuiteBuilderTests() {}
 

android/guava-testlib/test/com/google/common/collect/testing/MinimalCollectionTest.java

@@ -27,6 +27,7 @@
  *
  * @author Kevin Bourrillion
  */
+@AndroidIncompatible // test-suite builders
 public class MinimalCollectionTest extends TestCase {
   public static Test suite() {
     return CollectionTestSuiteBuilder.using(

android/guava-testlib/test/com/google/common/collect/testing/MinimalSetTest.java

@@ -27,6 +27,7 @@
  *
  * @author Regina O'Dell
  */
+@AndroidIncompatible // test-suite builders
 public class MinimalSetTest extends TestCase {
   public static Test suite() {
     return SetTestSuiteBuilder.using(

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6ListTests.java

@@ -34,6 +34,7 @@
  *
  * @author Kevin Bourrillion
  */
+@AndroidIncompatible // test-suite builders
 public class OpenJdk6ListTests extends TestsForListsInJavaUtil {
   public static Test suite() {
     return new OpenJdk6ListTests().allTests();

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6MapTests.java

@@ -41,6 +41,7 @@
  * @author Kevin Bourrillion
  */
 // TODO(cpovirk): consider renaming this class in light of our now running it under newer JDKs.
+@AndroidIncompatible // test-suite builders
 public class OpenJdk6MapTests extends TestsForMapsInJavaUtil {
   public static Test suite() {
     return new OpenJdk6MapTests().allTests();

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6QueueTests.java

@@ -31,6 +31,7 @@
  *
  * @author Kevin Bourrillion
  */
+@AndroidIncompatible // test-suite builders
 public class OpenJdk6QueueTests extends TestsForQueuesInJavaUtil {
   public static Test suite() {
     return new OpenJdk6QueueTests().allTests();

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6SetTests.java

@@ -34,6 +34,7 @@
  *
  * @author Kevin Bourrillion
  */
+@AndroidIncompatible // test-suite builders
 public class OpenJdk6SetTests extends TestsForSetsInJavaUtil {
   public static Test suite() {
     return new OpenJdk6SetTests().allTests();

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6Tests.java

@@ -27,6 +27,7 @@
  *
  * @author Kevin Bourrillion
  */
+@AndroidIncompatible // test-suite builders
 public class OpenJdk6Tests extends TestCase {
   public static Test suite() {
     TestSuite suite = new TestSuite();

android/guava-testlib/test/com/google/common/collect/testing/SafeTreeMapTest.java

@@ -42,6 +42,7 @@
  * @author Louis Wasserman
  */
 public class SafeTreeMapTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTestSuite(SafeTreeMapTest.class);

android/guava-testlib/test/com/google/common/collect/testing/SafeTreeSetTest.java

@@ -37,6 +37,7 @@
 import junit.framework.TestSuite;
 
 public class SafeTreeSetTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTestSuite(SafeTreeSetTest.class);

android/guava-tests/test/com/google/common/cache/LocalCacheTest.java

@@ -95,6 +95,7 @@
 @SuppressWarnings("GuardedBy") // TODO(b/35466881): Fix or suppress.
 @NullUnmarked
 public class LocalCacheTest extends TestCase {
+  @AndroidIncompatible
   private static class TestStringCacheGenerator extends TestStringMapGenerator {
     private final CacheBuilder<? super String, ? super String> builder;
 
@@ -112,6 +113,7 @@ protected Map<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTestSuite(LocalCacheTest.class);

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

@@ -48,6 +48,7 @@ public class ArrayListMultimapTest extends TestCase {
 
   @GwtIncompatible // suite
   @J2ktIncompatible
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

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

@@ -54,6 +54,7 @@
 public class Collections2Test extends TestCase {
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite(Collections2Test.class.getSimpleName());
     suite.addTest(testsForFilter());
@@ -73,6 +74,7 @@ public static Test suite() {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForFilter() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {
@@ -97,6 +99,7 @@ public Collection<String> create(String[] elements) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForFilterAll() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {
@@ -119,6 +122,7 @@ public Collection<String> create(String[] elements) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForFilterLinkedList() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {
@@ -143,6 +147,7 @@ public Collection<String> create(String[] elements) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForFilterNoNulls() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {
@@ -167,6 +172,7 @@ public Collection<String> create(String[] elements) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForFilterFiltered() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {
@@ -192,6 +198,7 @@ public Collection<String> create(String[] elements) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   private static Test testsForTransform() {
     return CollectionTestSuiteBuilder.using(
             new TestStringCollectionGenerator() {

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

@@ -39,6 +39,7 @@
  */
 @NullUnmarked
 public class CompactHashMapTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

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

@@ -42,6 +42,7 @@
 @GwtIncompatible // java.util.Arrays#copyOf(Object[], int), java.lang.reflect.Array
 @NullUnmarked
 public class CompactHashSetTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     List<Feature<?>> allFeatures =
         Arrays.<Feature<?>>asList(

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

@@ -38,6 +38,7 @@
  */
 @NullUnmarked
 public class CompactLinkedHashMapTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

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

@@ -42,6 +42,7 @@
 @GwtIncompatible // java.util.Arrays#copyOf(Object[], int), java.lang.reflect.Array
 @NullUnmarked
 public class CompactLinkedHashSetTest extends TestCase {
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     List<Feature<?>> allFeatures =
         Arrays.<Feature<?>>asList(

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

@@ -51,6 +51,7 @@
 @NullUnmarked
 public class ConcurrentHashMultisetTest extends TestCase {
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(
@@ -76,6 +77,7 @@ public static Test suite() {
     return suite;
   }
 
+  @AndroidIncompatible // test-suite builders
   private static TestStringMultisetGenerator concurrentHashMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override
@@ -85,6 +87,7 @@ protected Multiset<String> create(String[] elements) {
     };
   }
 
+  @AndroidIncompatible // test-suite builders
   private static TestStringMultisetGenerator concurrentSkipListMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override

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

@@ -390,6 +390,7 @@ public void testAsList() {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   public static class BuiltTests extends TestCase {
     public static Test suite() {
       TestSuite suite = new TestSuite();

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

@@ -70,6 +70,7 @@ private enum Country {
     UK
   }
 
+  @AndroidIncompatible // test-suite builders
   public static final class EnumBiMapGenerator implements TestBiMapGenerator<Country, Currency> {
     @SuppressWarnings("unchecked")
     @Override
@@ -116,6 +117,7 @@ public Currency[] createValueArray(int length) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

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

@@ -65,6 +65,7 @@ private enum Country {
     UK
   }
 
+  @AndroidIncompatible // test-suite builders
   public static final class EnumHashBiMapGenerator implements TestBiMapGenerator<Country, String> {
     @SuppressWarnings("unchecked")
     @Override
@@ -111,6 +112,7 @@ public String[] createValueArray(int length) {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

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

@@ -52,6 +52,7 @@ public class EnumMultisetTest extends TestCase {
 
   @J2ktIncompatible
   @GwtIncompatible // suite
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(
@@ -69,6 +70,7 @@ public static Test suite() {
     return suite;
   }
 
+  @AndroidIncompatible // test-suite builders
   private static TestEnumMultisetGenerator enumMultisetGenerator() {
     return new TestEnumMultisetGenerator() {
       @Override

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

@@ -103,6 +103,7 @@ public String toString() {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -155,6 +155,7 @@ public List<T> subList(int fromIndex, int toIndex) {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -138,6 +138,7 @@ public boolean isEmpty() {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -159,6 +159,7 @@ public int size() {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -250,6 +250,7 @@ protected NavigableMap<K, V> delegate() {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -163,6 +163,7 @@ public SortedSet<T> tailSet(T fromElement) {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -119,6 +119,7 @@ public boolean offer(T o) {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -115,6 +115,7 @@ public String toString() {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();
 

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

@@ -129,6 +129,7 @@ public SortedMap<K, V> subMap(K fromKey, K toKey) {
     }
   }
 
+  @AndroidIncompatible // test-suite builders
   public static Test suite() {
     TestSuite suite = new TestSuite();