Skip to content

Commit 2d6814a

Browse files
qz0610Cole-Greer
authored andcommitted
fix flaky tests in ParametersTest (#2820)
1 parent 5542869 commit 2d6814a

File tree

1 file changed

+27
-3
lines changed
  • gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util

1 file changed

+27
-3
lines changed

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ParametersTest.java

+27-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Collections;
2929
import java.util.List;
3030
import java.util.Map;
31+
import java.util.HashMap;
3132

3233
import static org.hamcrest.CoreMatchers.is;
3334
import static org.hamcrest.MatcherAssert.assertThat;
@@ -57,7 +58,15 @@ public void shouldAllowNullValues() {
5758

5859
final Object[] params = parameters.getKeyValues(mock(Traverser.Admin.class));
5960
assertEquals(6, params.length);
60-
assertThat(Arrays.equals(new Object[] {"a", null, "b", "bat", "c", "cat"}, params), is(true));
61+
Map<Object, Object> paramsMap = new HashMap<>();
62+
for (int i = 0; i < params.length; i += 2) {
63+
paramsMap.put(params[i], params[i + 1]);
64+
}
65+
Map<Object, Object> expectedMap = new HashMap<>();
66+
expectedMap.put("a", null);
67+
expectedMap.put("b", "bat");
68+
expectedMap.put("c", "cat");
69+
assertThat(paramsMap.equals(expectedMap), is(true));
6170
}
6271

6372
@Test
@@ -67,7 +76,15 @@ public void shouldGetKeyValues() {
6776

6877
final Object[] params = parameters.getKeyValues(mock(Traverser.Admin.class));
6978
assertEquals(6, params.length);
70-
assertThat(Arrays.equals(new Object[] {"a", "axe", "b", "bat", "c", "cat"}, params), is(true));
79+
Map<Object, Object> paramsMap = new HashMap<>();
80+
for (int i = 0; i < params.length; i += 2) {
81+
paramsMap.put(params[i], params[i + 1]);
82+
}
83+
Map<Object, Object> expectedMap = new HashMap<>();
84+
expectedMap.put("a", "axe");
85+
expectedMap.put("b", "bat");
86+
expectedMap.put("c", "cat");
87+
assertThat(paramsMap.equals(expectedMap), is(true));
7188
}
7289

7390
@Test
@@ -77,7 +94,14 @@ public void shouldGetKeyValuesIgnoringSomeKeys() {
7794

7895
final Object[] params = parameters.getKeyValues(mock(Traverser.Admin.class), "b");
7996
assertEquals(4, params.length);
80-
assertThat(Arrays.equals(new Object[] {"a", "axe", "c", "cat"}, params), is(true));
97+
Map<Object, Object> paramsMap = new HashMap<>();
98+
for (int i = 0; i < params.length; i += 2) {
99+
paramsMap.put(params[i], params[i + 1]);
100+
}
101+
Map<Object, Object> expectedMap = new HashMap<>();
102+
expectedMap.put("a", "axe");
103+
expectedMap.put("c", "cat");
104+
assertThat(paramsMap.equals(expectedMap), is(true));
81105
}
82106

83107
@Test

0 commit comments

Comments
 (0)