Merge branch 'master' into test/map-entryset-stream-spliterator

Author: faisalmastoi55

android/guava-testlib/src/com/google/common/collect/testing/PerCollectionSizeTestSuiteBuilder.java

@@ -126,7 +126,7 @@ private static final class OneSizeTestSuiteBuilder<T, E>
     private final List<Class<? extends AbstractTester>> testers;
 
     @SuppressWarnings("rawtypes") // class literals
-    public OneSizeTestSuiteBuilder(List<Class<? extends AbstractTester>> testers) {
+    OneSizeTestSuiteBuilder(List<Class<? extends AbstractTester>> testers) {
       this.testers = testers;
     }
 

android/guava-testlib/src/com/google/common/collect/testing/google/MultimapTestSuiteBuilder.java

@@ -314,7 +314,7 @@ private static class AsMapGenerator<K, V, M extends Multimap<K, V>>
       implements TestMapGenerator<K, Collection<V>>, DerivedGenerator {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public AsMapGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    AsMapGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 
@@ -638,8 +638,7 @@ private static class ReserializedMultimapGenerator<K, V, M extends Multimap<K, V
       implements TestMultimapGenerator<K, V, M> {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
-    public ReserializedMultimapGenerator(
-        OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
+    ReserializedMultimapGenerator(OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator) {
       this.multimapGenerator = multimapGenerator;
     }
 

android/guava-testlib/src/com/google/common/collect/testing/google/SetGenerators.java

@@ -412,7 +412,7 @@ public List<Integer> order(List<Integer> insertionOrder) {
 
   private abstract static class AbstractContiguousSetGenerator
       extends TestIntegerSortedSetGenerator {
-    protected final ContiguousSet<Integer> checkedCreate(SortedSet<Integer> elementsSet) {
+    final ContiguousSet<Integer> checkedCreate(SortedSet<Integer> elementsSet) {
       List<Integer> elements = new ArrayList<>(elementsSet);
       /*
        * A ContiguousSet can't have holes. If a test demands a hole, it should be changed so that it

android/guava-testlib/src/com/google/common/testing/DummyProxy.java

@@ -29,6 +29,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import org.jspecify.annotations.NullMarked;
@@ -50,7 +51,22 @@ abstract class DummyProxy {
    */
   final <T> T newProxy(TypeToken<T> interfaceType) {
     Set<Class<?>> interfaceClasses = new LinkedHashSet<>();
-    interfaceClasses.addAll(interfaceType.getTypes().interfaces().rawTypes());
+    Set<Class<? super T>> allInterfaceClasses = interfaceType.getTypes().interfaces().rawTypes();
+    for (Class<? super T> itf : allInterfaceClasses) {
+      Iterator<Class<?>> iterator = interfaceClasses.iterator();
+      boolean addToSet = true;
+      while (iterator.hasNext()) {
+        Class<?> current = iterator.next();
+        if (current == itf || itf.isAssignableFrom(current)) {
+          // Skip any super interface of the ones that are already included.
+          addToSet = false;
+          break;
+        }
+      }
+      if (addToSet) {
+        interfaceClasses.add(itf);
+      }
+    }
     // Make the proxy serializable to work with SerializableTester
     interfaceClasses.add(Serializable.class);
     Object dummy =

android/guava-testlib/src/com/google/common/testing/NullPointerTester.java

@@ -631,7 +631,7 @@ public boolean isExpectedType(Throwable cause) {
       }
     };
 
-    public abstract boolean isExpectedType(Throwable cause);
+    abstract boolean isExpectedType(Throwable cause);
   }
 
   private static boolean annotatedTypeExists() {

android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java

@@ -16,6 +16,8 @@
 
 package com.google.common.util.concurrent.testing;
 
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
@@ -26,7 +28,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -71,7 +72,7 @@ public void testGetBlocksUntilValueAvailable() throws Throwable {
     assertFalse(future.isDone());
     assertFalse(future.isCancelled());
 
-    ExecutorService executor = Executors.newSingleThreadExecutor();
+    ExecutorService executor = newSingleThreadExecutor();
 
     try {
       Future<Boolean> getResult = executor.submit(() -> future.get());
@@ -138,7 +139,7 @@ public void testListenersNotifiedOnError() throws Exception {
     CountDownLatch successLatch = new CountDownLatch(1);
     CountDownLatch listenerLatch = new CountDownLatch(1);
 
-    ExecutorService exec = Executors.newCachedThreadPool();
+    ExecutorService exec = newCachedThreadPool();
 
     future.addListener(listenerLatch::countDown, exec);
 
@@ -171,7 +172,7 @@ public void testListenersNotifiedOnError() throws Exception {
   public void testAllListenersCompleteSuccessfully()
       throws InterruptedException, ExecutionException {
 
-    ExecutorService exec = Executors.newCachedThreadPool();
+    ExecutorService exec = newCachedThreadPool();
 
     int listenerCount = 20;
     CountDownLatch listenerLatch = new CountDownLatch(listenerCount);

android/guava-testlib/src/com/google/common/util/concurrent/testing/SameThreadScheduledExecutorService.java

@@ -17,6 +17,7 @@
 package com.google.common.util.concurrent.testing;
 
 import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static java.util.concurrent.Executors.callable;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Preconditions;
@@ -31,7 +32,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -136,7 +136,7 @@ public void execute(Runnable command) {
   public ListenableScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
     Preconditions.checkNotNull(command, "command must not be null");
     Preconditions.checkNotNull(unit, "unit must not be null!");
-    return schedule(Executors.callable(command), delay, unit);
+    return schedule(callable(command), delay, unit);
   }
 
   @Override

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

@@ -36,6 +36,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.testing.features.FeatureUtilTest.ExampleFeature.NotTesterAnnotation;
 import com.google.common.collect.testing.features.FeatureUtilTest.ExampleFeature.Require;
+import com.google.errorprone.annotations.Keep;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.reflect.Method;
@@ -175,6 +176,7 @@ class Tester {}
   public void testBuildTesterRequirements_class_present_method_present() throws Exception {
     @Require(IMPLIES_BAR)
     class Tester {
+      @Keep
       @Require(IMPLIES_IMPLIES_FOO)
       public void test() {}
     }
@@ -189,6 +191,7 @@ public void test() {}
   public void testBuildTesterRequirements_class_absent_method_absent() throws Exception {
     @Require(absent = IMPLIES_BAR)
     class Tester {
+      @Keep
       @Require(absent = IMPLIES_IMPLIES_FOO)
       public void test() {}
     }
@@ -202,6 +205,7 @@ public void test() {}
   public void testBuildTesterRequirements_class_present_method_absent() throws Exception {
     @Require(IMPLIES_IMPLIES_FOO)
     class Tester {
+      @Keep
       @Require(absent = IMPLIES_IMPLIES_FOO_AND_IMPLIES_BAR)
       public void test() {}
     }
@@ -217,6 +221,7 @@ public void test() {}
   public void testBuildTesterRequirements_class_absent_method_present() throws Exception {
     @Require(absent = IMPLIES_IMPLIES_FOO_AND_IMPLIES_BAR)
     class Tester {
+      @Keep
       @Require(IMPLIES_IMPLIES_FOO)
       public void test() {}
     }
@@ -267,6 +272,7 @@ class Tester {}
   public void testBuildTesterRequirements_methodClassConflict() throws Exception {
     @Require(IMPLIES_FOO)
     class Tester {
+      @Keep
       @Require(absent = FOO)
       public void test() {}
     }
@@ -301,6 +307,7 @@ class Tester {}
 
   public void testGetTesterAnnotations_method() throws Exception {
     class Tester {
+      @Keep
       @Require
       @NotTesterAnnotation
       public void test() {}

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

@@ -17,6 +17,7 @@
 package com.google.common.testing;
 
 import static com.google.common.testing.ReflectionFreeAssertThrows.assertThrows;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -27,7 +28,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
@@ -166,7 +166,7 @@ public void testConcurrentAutoIncrementStep() throws Exception {
   @GwtIncompatible // concurrency
   private void runConcurrentTest(int numberOfThreads, Callable<@Nullable Void> callable)
       throws Exception {
-    ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+    ExecutorService executorService = newFixedThreadPool(numberOfThreads);
     CountDownLatch startLatch = new CountDownLatch(numberOfThreads);
     CountDownLatch doneLatch = new CountDownLatch(numberOfThreads);
     for (int i = numberOfThreads; i > 0; i--) {

android/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java

@@ -320,7 +320,7 @@ private interface Adder {
   private static class ForwardingArithmetic implements Arithmetic {
     private final Arithmetic arithmetic;
 
-    public ForwardingArithmetic(Arithmetic arithmetic) {
+    ForwardingArithmetic(Arithmetic arithmetic) {
       this.arithmetic = arithmetic;
     }
 
@@ -455,7 +455,7 @@ void foo(
   private static class ParameterTypesDifferentForwarder implements ParameterTypesDifferent {
     private final ParameterTypesDifferent delegate;
 
-    public ParameterTypesDifferentForwarder(ParameterTypesDifferent delegate) {
+    ParameterTypesDifferentForwarder(ParameterTypesDifferent delegate) {
       this.delegate = delegate;
     }