Repository: tinkerpop Updated Branches: refs/heads/master 994056044 -> 4d09fe540
Fixed some test definitions - were not consistent CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b5836edb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b5836edb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b5836edb Branch: refs/heads/master Commit: b5836edb0240764cd718cbe6bf2ce783fd7dc29d Parents: 1a95df0 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Aug 29 10:52:53 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Aug 29 10:52:53 2017 -0400 ---------------------------------------------------------------------- .../traversal/step/sideEffect/GroovyGroupTest.groovy | 4 ++-- .../process/traversal/step/branch/RepeatTest.java | 2 +- .../process/traversal/step/filter/DedupTest.java | 2 +- .../process/traversal/step/sideEffect/GroupTest.java | 15 ++++++++------- 4 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5836edb/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy index fc0c55d..e4f93e8 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy @@ -130,8 +130,8 @@ public abstract class GroovyGroupTest { } @Override - public Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('a', map).V().group('a').by('name').by(outE().label.fold).cap('a')", "map", new HashMap<>(["marko": [666], "noone": ["blah"]])); + public Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(final Map<String, List<Object>> m) { + new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('a', map).V().group('a').by('name').by(outE().label.fold).cap('a')", "map", m); } } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5836edb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java index 0315589..ae1220f 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java @@ -252,7 +252,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) - public void g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_capXmX() { + public void g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_timesX3X_capXmX() { final Traversal<Vertex, Map<Integer, Long>> traversal = get_g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_timesX3X_capXmX(convertToVertexId("marko")); printTraversalForm(traversal); final Map<Integer, Long> map = traversal.next(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5836edb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java index 5ac5e22..ef5086f 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java @@ -289,7 +289,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) - public void g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup() { + public void g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup() { final Traversal<Vertex, Collection<String>> traversal = get_g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup(); printTraversalForm(traversal); final List<String> vertices = new ArrayList<>(traversal.next()); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5836edb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java index 5f2504e..3e1e53b 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java @@ -97,7 +97,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, Map<String, Number>> get_g_V_group_byXlabelX_byXbothE_groupXaX_byXlabelX_byXweight_sumX_weight_sumX(); - public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(); + public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(final Map<String, List<Object>> m); @Test @LoadGraphWith(MODERN) @@ -470,7 +470,11 @@ public abstract class GroupTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX() { - final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(); + final Map<String, List<Object>> m = new HashMap<>(); + m.put("marko", new ArrayList<>(Collections.singleton(666))); + m.put("noone", new ArrayList<>(Collections.singleton("blah"))); + + final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(m); printTraversalForm(traversal); final Map<String, List<Object>> map = traversal.next(); assertEquals(7, map.size()); @@ -587,11 +591,8 @@ public abstract class GroupTest extends AbstractGremlinProcessTest { } @Override - public Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX() { - final Map<String, List<Object>> map = new HashMap<>(); - map.put("marko", new ArrayList<>(Collections.singleton(666))); - map.put("noone", new ArrayList<>(Collections.singleton("blah"))); - return g.withSideEffect("a", map).V().group("a").by("name").by(outE().label().fold()).cap("a"); + public Traversal<Vertex, Map<String, List<Object>>> get_g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX(final Map<String, List<Object>> m) { + return g.withSideEffect("a", m).V().group("a").by("name").by(outE().label().fold()).cap("a"); } } }
