You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/05/18 14:32:56 UTC

[2/2] incubator-tinkerpop git commit: upmerged a test to ensure g.V(1, 2, blah, 3) returns 1, 2, 3 vertices. CTR.

upmerged a test to ensure g.V(1,2,blah,3) returns 1, 2, 3 vertices. CTR.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c61095f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c61095f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c61095f6

Branch: refs/heads/master
Commit: c61095f6b37e1d6514c91f14e09dea0ef2e99f07
Parents: 4f03ea1 3feb752
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed May 18 08:32:42 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed May 18 08:32:42 2016 -0600

----------------------------------------------------------------------
 .../traversal/step/map/GroovyVertexTest.groovy  | 13 ++++++++--
 .../process/traversal/step/map/VertexTest.java  | 27 +++++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c61095f6/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
index 451739f,7b8974c..3c4f8b4
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
@@@ -31,13 -31,13 +31,15 @@@ public abstract class GroovyVertexTest 
      public static class Traversals extends VertexTest {
  
          @Override
-         public Traversal<Vertex, String> get_g_VXlistXv1_v2_v3XX_name(final Vertex v1, final Vertex v2, final Vertex v3) {
 -        public Traversal<Vertex, String> get_g_VXlistXv1_v2_v3XX_name() {
 -            TraversalScriptHelper.compute("g.V(ids).name", g, "ids", [convertToVertex(graph, "marko"), convertToVertex(graph, "vadas"), convertToVertex(graph, "lop")])
++        public Traversal<Vertex, String> get_g_VXlistXv1_v2_v3XX_name(
++                final Vertex v1, final Vertex v2, final Vertex v3) {
 +            new ScriptTraversal<>(g, "gremlin-groovy", "g.V(ids).name", "ids", [v1, v2, v3])
          }
  
          @Override
-         public Traversal<Vertex, String> get_g_VXlistX1_2_3XX_name(final Object v1Id, final Object v2Id, final Object v3Id) {
 -        public Traversal<Vertex, String> get_g_VXlistX1_2_3XX_name() {
 -            TraversalScriptHelper.compute("g.V(ids).name", g, "ids", [convertToVertexId(graph, "marko"), convertToVertexId(graph, "vadas"), convertToVertexId(graph, "lop")])
++        public Traversal<Vertex, String> get_g_VXlistX1_2_3XX_name(
++                final Object v1Id, final Object v2Id, final Object v3Id) {
 +            new ScriptTraversal<>(g, "gremlin-groovy", "g.V(ids).name", "ids", [v1Id, v2Id, v3Id])
          }
  
          @Override
@@@ -167,7 -167,14 +169,14 @@@
  
          @Override
          public Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id) {
 -            TraversalScriptHelper.compute("g.V(v1Id).to(Direction.OUT, 'knows')", g, "v1Id", v1Id);
 +            new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).to(Direction.OUT, 'knows')", "v1Id", v1Id)
          }
+ 
+         @Override
+         public Traversal<Vertex, String> get_g_VX1_2_3_4X_name(
+                 final Object v1Id, final Object v2Id, final Object v3Id, final Object v4Id) {
+             g.V(v3Id).drop().iterate();
 -            TraversalScriptHelper.compute("g.V(v1Id, v2Id, v4Id, v3Id).name", g, "v1Id", v1Id, "v2Id", v2Id, "v3Id", v3Id, "v4Id", v4Id);
++            new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id, v2Id, v4Id, v3Id).name", "v1Id", v1Id, "v2Id", v2Id, "v3Id", v3Id, "v4Id", v4Id)
+         }
      }
  }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c61095f6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------