Internal change.

PiperOrigin-RevId: 688529810

Author: cpovirk

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

@@ -24,7 +24,6 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import java.time.Duration;
-import java.util.EnumSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -104,7 +103,7 @@ public void testAutoIncrementStep_resetToZero() {
     assertEquals(10, ticker.read());
     assertEquals(20, ticker.read());
 
-    for (TimeUnit timeUnit : EnumSet.allOf(TimeUnit.class)) {
+    for (TimeUnit timeUnit : TimeUnit.values()) {
       ticker.setAutoIncrementStep(0, timeUnit);
       assertEquals(
           "Expected no auto-increment when setting autoIncrementStep to 0 " + timeUnit,

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

@@ -22,8 +22,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.ExecutionError;
-import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.UnsupportedCharsetException;
@@ -134,7 +132,6 @@ ImmutableMap<Class<? extends Throwable>, Predicate<Throwable>> exceptions() {
           .put(
               ConcurrentModificationException.class,
               e -> e instanceof ConcurrentModificationException)
-          .put(ExecutionError.class, e -> e instanceof ExecutionError)
           .put(ExecutionException.class, e -> e instanceof ExecutionException)
           .put(IllegalArgumentException.class, e -> e instanceof IllegalArgumentException)
           .put(IllegalStateException.class, e -> e instanceof IllegalStateException)
@@ -144,7 +141,6 @@ ImmutableMap<Class<? extends Throwable>, Predicate<Throwable>> exceptions() {
           .put(NumberFormatException.class, e -> e instanceof NumberFormatException)
           .put(RuntimeException.class, e -> e instanceof RuntimeException)
           .put(TimeoutException.class, e -> e instanceof TimeoutException)
-          .put(UncheckedExecutionException.class, e -> e instanceof UncheckedExecutionException)
           .put(UnsupportedCharsetException.class, e -> e instanceof UnsupportedCharsetException)
           .put(UnsupportedOperationException.class, e -> e instanceof UnsupportedOperationException)
           .put(VerifyException.class, e -> e instanceof VerifyException)

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

@@ -24,7 +24,6 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 import java.time.Duration;
-import java.util.EnumSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -102,7 +101,7 @@ public void testAutoIncrementStep_resetToZero() {
     assertEquals(10, ticker.read());
     assertEquals(20, ticker.read());
 
-    for (TimeUnit timeUnit : EnumSet.allOf(TimeUnit.class)) {
+    for (TimeUnit timeUnit : TimeUnit.values()) {
       ticker.setAutoIncrementStep(0, timeUnit);
       assertEquals(
           "Expected no auto-increment when setting autoIncrementStep to 0 " + timeUnit,

guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java

@@ -22,8 +22,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.ExecutionError;
-import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.UnsupportedCharsetException;
@@ -134,7 +132,6 @@ ImmutableMap<Class<? extends Throwable>, Predicate<Throwable>> exceptions() {
           .put(
               ConcurrentModificationException.class,
               e -> e instanceof ConcurrentModificationException)
-          .put(ExecutionError.class, e -> e instanceof ExecutionError)
           .put(ExecutionException.class, e -> e instanceof ExecutionException)
           .put(IllegalArgumentException.class, e -> e instanceof IllegalArgumentException)
           .put(IllegalStateException.class, e -> e instanceof IllegalStateException)
@@ -144,7 +141,6 @@ ImmutableMap<Class<? extends Throwable>, Predicate<Throwable>> exceptions() {
           .put(NumberFormatException.class, e -> e instanceof NumberFormatException)
           .put(RuntimeException.class, e -> e instanceof RuntimeException)
           .put(TimeoutException.class, e -> e instanceof TimeoutException)
-          .put(UncheckedExecutionException.class, e -> e instanceof UncheckedExecutionException)
           .put(UnsupportedCharsetException.class, e -> e instanceof UnsupportedCharsetException)
           .put(UnsupportedOperationException.class, e -> e instanceof UnsupportedOperationException)
           .put(VerifyException.class, e -> e instanceof VerifyException)