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 2015/06/03 00:29:25 UTC

incubator-tinkerpop git commit: add a g.V.has(location) test to ensure multi-properties doesnt cause problems.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 372284372 -> 1140dd858


add a g.V.has(location) test to ensure multi-properties doesnt cause problems.


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

Branch: refs/heads/master
Commit: 1140dd85876da8ddda46503dce18e487e433702a
Parents: 3722843
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 2 16:29:18 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 2 16:29:18 2015 -0600

----------------------------------------------------------------------
 .../traversal/step/filter/GroovyHasTest.groovy   |  5 +++++
 .../process/traversal/step/filter/HasTest.java   | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1140dd85/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
index 076b2dd..28fea67 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
@@ -114,5 +114,10 @@ public abstract class GroovyHasTest {
         public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
             TraversalScriptHelper.compute("g.V(v1Id).outE.has('weight', inside(0.0d, 0.6d)).inV", g, "v1Id", v1Id);
         }
+
+        @Override
+        public Traversal<Vertex, Vertex> get_g_V_hasXlocationX() {
+            TraversalScriptHelper.compute("g.V.has('location')", g)
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1140dd85/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
index 6c1464a..0185494 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
@@ -21,11 +21,11 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
 import org.apache.tinkerpop.gremlin.LoadGraphWith;
 import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.hamcrest.CoreMatchers;
@@ -80,6 +80,8 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id);
 
+    public abstract Traversal<Vertex, Vertex> get_g_V_hasXlocationX();
+
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_outXknowsX_hasXoutXcreatedXX_valuesXnameX() {
@@ -291,6 +293,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
         final Object edgeId11 = convertToEdgeId("josh", "created", "lop");
         final Object edgeId10 = convertToEdgeId("josh", "created", "ripple");
         final Traversal<Edge, Edge> traversal = get_g_EX11X_outV_outE_hasXid_10X(edgeId11, edgeId10);
+        printTraversalForm(traversal);
         assert_g_EX11X(edgeId10, traversal);
     }
 
@@ -300,9 +303,18 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
         final Object edgeId11 = convertToEdgeId("josh", "created", "lop");
         final Object edgeId10 = convertToEdgeId("josh", "created", "ripple");
         final Traversal<Edge, Edge> traversal = get_g_EX11X_outV_outE_hasXid_10X(edgeId11.toString(), edgeId10.toString());
+        printTraversalForm(traversal);
         assert_g_EX11X(edgeId10, traversal);
     }
 
+    @Test
+    @LoadGraphWith(CREW)
+    public void g_V_hasXlocationX() {
+        final Traversal<Vertex, Vertex> traversal = get_g_V_hasXlocationX();
+        printTraversalForm(traversal);
+        checkResults(Arrays.asList(convertToVertex(graph, "marko"), convertToVertex(graph, "stephen"), convertToVertex(graph, "daniel"), convertToVertex(graph, "matthias")), traversal);
+    }
+
     private void assert_g_EX11X(final Object edgeId, final Traversal<Edge, Edge> traversal) {
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
@@ -396,5 +408,10 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
         public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
             return g.V(v1Id).outE().has("weight", P.inside(0.0d, 0.6d)).inV();
         }
+
+        @Override
+        public Traversal<Vertex, Vertex> get_g_V_hasXlocationX() {
+            return g.V().has("location");
+        }
     }
 }
\ No newline at end of file