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 2015/04/15 19:47:27 UTC

[05/50] incubator-tinkerpop git commit: Add more tests to enforce type relaxation on queries in a traversal.

Add more tests to enforce type relaxation on queries in a traversal.


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

Branch: refs/heads/variables
Commit: f273a5655e6aa1ad5a0189d83c4f9f232954f847
Parents: 8d968fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 13 14:07:05 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 13 14:07:05 2015 -0400

----------------------------------------------------------------------
 .../traversal/step/map/GroovyVertexTest.groovy  | 10 ++++++
 .../process/traversal/step/map/VertexTest.java  | 38 ++++++++++++++++++++
 2 files changed, 48 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f273a565/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
----------------------------------------------------------------------
diff --git 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
index 2951c47..4edb264 100644
--- 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
@@ -62,6 +62,11 @@ public abstract class GroovyVertexTest {
         }
 
         @Override
+        public Traversal<Edge, Edge> get_g_EX11X(Object e11Id) {
+            g.E(e11Id);
+        }
+
+        @Override
         public Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id) {
             g.V(v1Id).outE
         }
@@ -191,6 +196,11 @@ public abstract class GroovyVertexTest {
         }
 
         @Override
+        public Traversal<Edge, Edge> get_g_EX11X(Object e11Id) {
+            ComputerTestHelper.compute("g.E($e11Id)", g)
+        }
+
+        @Override
         public Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id) {
             ComputerTestHelper.compute("g.V(${v1Id}).outE", g);
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f273a565/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 90a07ec..098615c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -55,6 +55,8 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Edge, Edge> get_g_E();
 
+    public abstract Traversal<Edge, Edge> get_g_EX11X(final Object e11Id);
+
     public abstract Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id);
 
     public abstract Traversal<Vertex, Edge> get_g_VX2X_inE(final Object v2Id);
@@ -190,6 +192,30 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
 
     @Test
     @LoadGraphWith(MODERN)
+    public void g_EX11X() {
+        final Object edgeId = convertToEdgeId("josh", "created", "lop");
+        final Traversal<Edge, Edge> traversal = get_g_EX11X(edgeId);
+        assert_g_EX11X(edgeId, traversal);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_EX11AsStringX() {
+        final Object edgeId = convertToEdgeId("josh", "created", "lop");
+        final Traversal<Edge, Edge> traversal = get_g_EX11X(edgeId.toString());
+        assert_g_EX11X(edgeId, traversal);
+    }
+
+    private void assert_g_EX11X(final Object edgeId, final Traversal<Edge, Edge> traversal) {
+        printTraversalForm(traversal);
+        assertTrue(traversal.hasNext());
+        final Edge e = traversal.next();
+        assertEquals(edgeId, e.id());
+        assertFalse(traversal.hasNext());
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
     public void g_VX1X_outE() {
         final Traversal<Vertex, Edge> traversal = get_g_VX1X_outE(convertToVertexId("marko"));
         printTraversalForm(traversal);
@@ -384,6 +410,13 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
         assert_g_v1_outXknowsX(traversal);
     }
 
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_VX1X_outXknowsAsStringIdX() {
+        final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXknowsX(convertToVertexId("marko").toString());
+        assert_g_v1_outXknowsX(traversal);
+    }
+
     private void assert_g_v1_outXknowsX(final Traversal<Vertex, Vertex> traversal) {
         printTraversalForm(traversal);
         int counter = 0;
@@ -609,5 +642,10 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
         public Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id) {
             return g.V(v1Id).to(Direction.OUT, "knows");
         }
+
+        @Override
+        public Traversal<Edge, Edge> get_g_EX11X(final Object e11Id) {
+            return g.E(e11Id);
+        }
     }
 }