You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/04/10 12:45:40 UTC
[tinkerpop] branch master updated: TINKERPOP-2194 Simplify choose()
test to avoid enforcing map key order CTR
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new 03234d2 TINKERPOP-2194 Simplify choose() test to avoid enforcing map key order CTR
new 252e4e9 Merge branch 'tp33'
03234d2 is described below
commit 03234d22530d309fa76fd477e90809e7041f0cb6
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Apr 10 08:44:24 2019 -0400
TINKERPOP-2194 Simplify choose() test to avoid enforcing map key order CTR
---
gremlin-test/features/branch/Choose.feature | 6 +++---
.../gremlin/process/traversal/step/branch/ChooseTest.java | 15 +++++++--------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/gremlin-test/features/branch/Choose.feature b/gremlin-test/features/branch/Choose.feature
index 187c96e..7bb8c03 100644
--- a/gremlin-test/features/branch/Choose.feature
+++ b/gremlin-test/features/branch/Choose.feature
@@ -17,18 +17,18 @@
Feature: Step - choose()
- Scenario: g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX
+ Scenario: g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX
Given the modern graph
And the traversal of
"""
g.V().choose(__.out().count()).
option(2L, __.values("name")).
- option(3L, __.valueMap())
+ option(3L, __.values("age"))
"""
When iterated to list
Then the result should be unordered
| result |
- | m[{"name":["marko"], "age":[29]}] |
+ | d[29].i |
| josh |
Scenario: g_V_chooseXlabel_eqXpersonX__outXknowsX__inXcreatedXX_name
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
index dd82f56..28f3abe 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
@@ -32,7 +32,6 @@ import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -59,7 +58,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(GremlinProcessRunner.class)
public abstract class ChooseTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX();
+ public abstract Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX();
public abstract Traversal<Vertex, String> get_g_V_chooseXlabel_eqXpersonX__outXknowsX__inXcreatedXX_name();
@@ -79,19 +78,19 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
- final Traversal<Vertex, Object> traversal = get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX();
+ public void g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX() {
+ final Traversal<Vertex, Object> traversal = get_g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX();
printTraversalForm(traversal);
final Map<String, Long> counts = new HashMap<>();
int counter = 0;
while (traversal.hasNext()) {
- MapHelper.incr(counts, traversal.next().toString(), 1l);
+ MapHelper.incr(counts, traversal.next().toString(), 1L);
counter++;
}
assertFalse(traversal.hasNext());
assertEquals(2, counter);
assertEquals(2, counts.size());
- assertEquals(Long.valueOf(1), counts.get("{name=[marko], age=[29]}"));
+ assertEquals(Long.valueOf(1), counts.get("29"));
assertEquals(Long.valueOf(1), counts.get("josh"));
}
@@ -175,10 +174,10 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
public static class Traversals extends ChooseTest {
@Override
- public Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
+ public Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L_nameX_optionX3L_ageX() {
return g.V().choose(out().count())
.option(2L, values("name"))
- .option(3L, valueMap());
+ .option(3L, values("age"));
}
@Override