Merge "Upgrade guava to v33.0.0" into main am: fcb6827395 am: 0be00b5218 am: 422eb80fea

Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2894060

Change-Id: I9a7385b0f8af3ec832abe8b207a1c25e1d5dc9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
index e0c2ebfea..6197e86a6 100644
--- a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
+++ b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java
@@ -20,6 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.testing.Helpers.assertEqualIgnoringOrder;
 import static com.google.common.collect.testing.Helpers.assertEqualInOrder;
 import static com.google.common.collect.testing.Platform.format;
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableSet;
 import static java.util.Comparator.naturalOrder;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -34,8 +36,9 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.EnumSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Spliterator;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -199,6 +202,9 @@ public final class SpliteratorTester<E> {
     };
 
     abstract <E> void forEach(GeneralSpliterator<E> spliterator, Consumer<? super E> consumer);
+
+    static final Set<SpliteratorDecompositionStrategy> ALL_STRATEGIES =
+        unmodifiableSet(new LinkedHashSet<>(asList(values())));
   }
 
   private static <E> @Nullable GeneralSpliterator<E> trySplitTestingSize(
@@ -289,7 +295,7 @@ public final class SpliteratorTester<E> {
       int characteristics = spliterator.characteristics();
       long estimatedSize = spliterator.estimateSize();
       for (SpliteratorDecompositionStrategy strategy :
-          EnumSet.allOf(SpliteratorDecompositionStrategy.class)) {
+          SpliteratorDecompositionStrategy.ALL_STRATEGIES) {
         List<E> resultsForStrategy = new ArrayList<>();
         strategy.forEach(spliteratorSupplier.get(), resultsForStrategy::add);