Moved traversal arguments out of the traversal "maker" method. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/214fb073 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/214fb073 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/214fb073 Branch: refs/heads/TINKERPOP-1730 Commit: 214fb073b004d57c52f1f93ca6f3fe852732dc98 Parents: f96017b Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Sep 13 10:01:16 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Sep 13 10:01:16 2017 -0400 ---------------------------------------------------------------------- .../process/traversal/step/map/GroovyAddEdgeTest.groovy | 4 +--- .../gremlin/process/traversal/step/map/AddEdgeTest.java | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214fb073/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy index 35823a1..3ccbe5d 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy @@ -88,9 +88,7 @@ public abstract class GroovyAddEdgeTest { } @Override - public Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() { - final Vertex a = g.V().has("name", "marko").next(); - final Vertex b = g.V().has("name", "peter").next(); + public Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final Vertex a, final Vertex b) { return new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('b', b).V(a).addE('knows').to('b').property('weight', 0.5d)", "a", a, "b", b) } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214fb073/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java index 0e5fca2..2f4658f 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java @@ -63,7 +63,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, Edge> get_g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX(); - public abstract Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(); + public abstract Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final Vertex a, final Vertex v2); /////// @@ -266,7 +266,10 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { @LoadGraphWith(MODERN) @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) public void g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() { - final Traversal<Vertex, Edge> traversal = get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(); + final Vertex a = g.V().has("name", "marko").next(); + final Vertex b = g.V().has("name", "peter").next(); + + final Traversal<Vertex, Edge> traversal = get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(a, b); final Edge edge = traversal.next(); assertFalse(traversal.hasNext()); assertEquals(edge.outVertex(), convertToVertex(graph, "marko")); @@ -373,9 +376,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { } @Override - public Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() { - final Vertex a = g.V().has("name", "marko").next(); - final Vertex b = g.V().has("name", "peter").next(); + public Traversal<Vertex, Edge> get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final Vertex a, final Vertex b) { return g.withSideEffect("b", b).V(a).addE("knows").to("b").property("weight", 0.5d); }
