From 3f453aad660c2bef801ef6dd580678816346f50d Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 17:43:15 -0600 Subject: [PATCH 1/2] fix flaky test iterableOfIterator --- .../gemfire/util/CollectionUtilsUnitTests.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java index 5f3dc86cd..26db51d5f 100644 --- a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java @@ -22,17 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -268,7 +258,7 @@ public void iterableOfIterator() { assertThat(iterable).isNotNull(); - Set set = new HashSet<>(); + Set set = new LinkedHashSet<>(); iterable.forEach(set::add); From 3a1e8fa45d76f360c1677760ea2b467164edf601 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 17:54:24 -0600 Subject: [PATCH 2/2] fix flaky test iterableOfEnumeration --- .../data/gemfire/util/CollectionUtilsUnitTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java index 26db51d5f..e91d45510 100644 --- a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java @@ -206,7 +206,8 @@ public void iterableOfEnumeration() { assertThat(iterable).isNotNull(); //assertThat(iterable).containsExactly(1, 2, 3); - assertThat(StreamSupport.stream(iterable.spliterator(), false).collect(Collectors.toSet())) + LinkedHashSet set = StreamSupport.stream(iterable.spliterator(), false).collect(Collectors.toCollection(LinkedHashSet::new)); + assertThat(set) .containsExactly(1, 2, 3); verify(mockEnumeration, times(4)).hasMoreElements();