[tinkerpop] branch 3.5-dev updated: cherry-picking from #1898 to 3.5-dev for TINKERPOP-2840

[xiazcy]

This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.5-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/3.5-dev by this push:
     new 8f62cbbdc1 cherry-picking from #1898 to 3.5-dev for TINKERPOP-2840
8f62cbbdc1 is described below

commit 8f62cbbdc1c90f5b1570e936e93c474b776b725f
Author: Priyanka Awatramani <apple@Priyankas-MacBook-Pro.local>
AuthorDate: Sat Dec 10 18:54:54 2022 -0600

    cherry-picking from #1898 to 3.5-dev for TINKERPOP-2840
---
 .../translator/ParameterizedGroovyTranslatorTest.java     | 15 ++++++++-------
 .../gremlin/util/iterator/IteratorUtilsTest.java          |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
index f38ddeba6b..7bea6a3d52 100644
--- 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
+++ 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/ParameterizedGroovyTranslatorTest.java
@@ -42,7 +42,7 @@ import javax.script.SimpleBindings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
 import java.util.function.Function;
 
@@ -134,7 +134,7 @@ public class ParameterizedGroovyTranslatorTest {
 
     @Test
     public void shouldHandleSet() {
-        final Script script = translator.translate(g.V().id().is(new 
HashSet<Object>() {{
+        final Script script = translator.translate(g.V().id().is(new 
LinkedHashSet<Object>() {{
             add(3);
             add(Arrays.asList(1, 2, 3.1d));
             add(3);
@@ -144,11 +144,12 @@ public class ParameterizedGroovyTranslatorTest {
         script.getParameters().ifPresent(bindings::putAll);
         assertEquals(5, bindings.size());
         assertEquals(Integer.valueOf(3), bindings.get("_args_0"));
-        assertEquals("3", bindings.get("_args_1"));
-        assertEquals(Integer.valueOf(1), bindings.get("_args_2"));
-        assertEquals(Integer.valueOf(2), bindings.get("_args_3"));
-        assertEquals(Double.valueOf(3.1), bindings.get("_args_4"));
-        assertEquals("g.V().id().is([_args_0, _args_1, [_args_2, _args_3, 
_args_4]] as Set)", script.getScript());
+        assertEquals(Integer.valueOf(1), bindings.get("_args_1"));
+        assertEquals(Integer.valueOf(2), bindings.get("_args_2"));
+        assertEquals(Double.valueOf(3.1), bindings.get("_args_3"));
+        assertEquals("3", bindings.get("_args_4"));
+
+        assertEquals("g.V().id().is([_args_0, [_args_1, _args_2, _args_3], 
_args_4] as Set)", script.getScript());
     }
 
     @Test
diff --git 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtilsTest.java
 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtilsTest.java
index 9649be9034..83aa6bdd70 100644
--- 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtilsTest.java
+++ 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtilsTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -174,7 +174,7 @@ public class IteratorUtilsTest {
 
     @Test
     public void shouldConvertMapToIterator() {
-        final Map<String,String> m = new HashMap<>();
+        final Map<String,String> m = new LinkedHashMap<>();
         m.put("key1", "val1");
         m.put("key2", "val2");
         m.put("key3", "val3");
@@ -238,7 +238,7 @@ public class IteratorUtilsTest {
 
     @Test
     public void shouldConvertMapToList() {
-        final Map<String,String> m = new HashMap<>();
+        final Map<String,String> m = new LinkedHashMap<>();
         m.put("key1", "val1");
         m.put("key2", "val2");
         m.put("key3", "val3");