Merge branch 'tp32' Conflicts: gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c74df06 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c74df06 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c74df06 Branch: refs/heads/master Commit: 2c74df06d30a4aac40acc42105c3d07d2b1664fb Parents: 5bfe873 214fb07 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Sep 13 10:02:45 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Sep 13 10:02:45 2017 -0400 ---------------------------------------------------------------------- .../gremlin/process/traversal/step/map/AddEdgeTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c74df06/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java ---------------------------------------------------------------------- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java index 337c09f,2f4658f..a12f5a8 --- 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 @@@ -62,13 -63,44 +62,13 @@@ public abstract class AddEdgeTest exten 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); - /////// - - @Deprecated - public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id); - - @Deprecated - public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(final Object v1Id); - - @Deprecated - public abstract Traversal<Vertex, Edge> get_g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX(); - - @Deprecated - public abstract Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X(); + public abstract Traversal<Vertex, Edge> get_g_VXaX_addEXknowsX_toXbX_propertyXweight_0_1X(); - @Deprecated - public abstract Traversal<Vertex, Edge> get_g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX(); + public abstract Traversal<Edge, Edge> get_g_addEXknowsX_fromXaX_toXbX_propertyXweight_0_1X(); - @Test - @LoadGraphWith(MODERN) - @Deprecated - @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) - public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX() { - final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(convertToVertexId("marko")); - printTraversalForm(traversal); - int count = 0; - while (traversal.hasNext()) { - final Edge edge = traversal.next(); - assertEquals("createdBy", edge.label()); - assertEquals(0, IteratorUtils.count(edge.properties())); - count++; - - } - assertEquals(1, count); - assertEquals(7, IteratorUtils.count(g.E())); - assertEquals(6, IteratorUtils.count(g.V())); - } + /////// @Test @LoadGraphWith(MODERN)