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 18:34:43 UTC

incubator-tinkerpop git commit: a test to make sure has('blah', __.traversal) filters as expected.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master f764ba852 -> 41bf478de


a test to make sure has('blah',__.traversal) filters as expected.


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

Branch: refs/heads/master
Commit: 41bf478de478b701a632218f0fd85c8522e38145
Parents: f764ba8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 3 10:34:29 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 3 10:34:29 2015 -0600

----------------------------------------------------------------------
 .../traversal/step/filter/GroovyHasTest.groovy  |  5 +++++
 .../process/traversal/step/filter/HasTest.java  | 22 +++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/41bf478d/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 28fea67..69c716a 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
@@ -86,6 +86,11 @@ public abstract class GroovyHasTest {
         }
 
         @Override
+        public Traversal<Vertex, Vertex> get_g_V_hasXage_isXgt_30XX() {
+            TraversalScriptHelper.compute("g.V.has('age', __.is(gt(30)))", g);
+        }
+
+        @Override
         public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
             TraversalScriptHelper.compute("g.E(e7Id).hasLabel('knows')", g, "e7Id", e7Id);
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/41bf478d/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 0185494..060154c 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
@@ -66,6 +66,8 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, Vertex> get_g_V_hasXage_gt_30X();
 
+    public abstract Traversal<Vertex, Vertex> get_g_V_hasXage_isXgt_30XX();
+
     public abstract Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id);
 
     public abstract Traversal<Edge, Edge> get_g_E_hasLabelXknowsX();
@@ -135,13 +137,14 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasXage_gt_30X() {
-        final Traversal<Vertex, Vertex> traversal = get_g_V_hasXage_gt_30X();
-        printTraversalForm(traversal);
-        final List<Vertex> list = traversal.toList();
-        assertEquals(2, list.size());
-        for (final Element v : list) {
-            assertTrue(v.<Integer>value("age") > 30);
-        }
+        Arrays.asList(get_g_V_hasXage_gt_30X(), get_g_V_hasXage_isXgt_30XX()).forEach(traversal -> {
+            printTraversalForm(traversal);
+            final List<Vertex> list = traversal.toList();
+            assertEquals(2, list.size());
+            for (final Element v : list) {
+                assertTrue(v.<Integer>value("age") > 30);
+            }
+        });
     }
 
     @Test
@@ -380,6 +383,11 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
         }
 
         @Override
+        public Traversal<Vertex, Vertex> get_g_V_hasXage_isXgt_30XX() {
+            return g.V().has("age", __.is(P.gt(30)));
+        }
+
+        @Override
         public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
             return g.E(e7Id).hasLabel("knows");
         }