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/12 23:57:32 UTC
incubator-tinkerpop git commit: more WhereTests --
and()..or()...and()...
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/xmatch fd77cfc85 -> 0eca23341
more WhereTests -- and()..or()...and()...
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0eca2334
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0eca2334
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0eca2334
Branch: refs/heads/xmatch
Commit: 0eca23341ccc3c588b193ad946a55685102330c6
Parents: fd77cfc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 12 15:57:24 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 12 15:57:24 2015 -0600
----------------------------------------------------------------------
.../traversal/step/filter/GroovyWhereTest.groovy | 7 +++++--
.../process/traversal/step/filter/WhereTest.java | 16 +++++++++++++++-
.../tinkergraph/structure/TinkerGraphTest.java | 3 +++
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0eca2334/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
index 5430cd4..0eb8fa4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
@@ -23,8 +23,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
-import static org.apache.tinkerpop.gremlin.process.traversal.P.not
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -119,6 +117,11 @@ public abstract class GroovyWhereTest {
}
@Override
+ public Traversal<Vertex, String> get_g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_valuesXnameX() {
+ TraversalScriptHelper.compute("g.V.where(out('created').and.out('knows').or.in('knows')).name", g)
+ }
+
+ @Override
public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_select_byXnameX() {
TraversalScriptHelper.compute("g.V.as('a').out('created').as('b').where(and(__.as('b').in,not(__.as('a').out('created').has('name','ripple')))).select.by('name')", g)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0eca2334/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 8ce5676..29e4260 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@ -27,7 +27,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,6 +85,8 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex,Map<String,String>> get_g_V_asXaX_outXcreatedX_asXbX_in_asXcX_whereXa__eqXcX_andXasXaX_outXknowsXXX_select_byXnameX();
+ public abstract Traversal<Vertex,String> get_g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_valuesXnameX();
+
public abstract Traversal<Vertex,Map<String,String>> get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_select_byXnameX();
// multi-labels
@@ -302,6 +303,14 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_selectXaX_byXnameX() {
+ Traversal<Vertex,String> traversal = get_g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_valuesXnameX();
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("marko","josh"),traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_select_byXnameX() {
Traversal<Vertex,Map<String,String>> traversal = get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_select_byXnameX();
printTraversalForm(traversal);
@@ -409,6 +418,11 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex,String> get_g_V_whereXoutXcreatedX_and_outXknowsX_or_inXknowsXX_valuesXnameX() {
+ return g.V().where(out("created").and().out("knows").or().in("knows")).values("name");
+ }
+
+ @Override
public Traversal<Vertex,Map<String,String>> get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_select_byXnameX() {
return g.V().as("a").out("created").as("b").where(and(as("b").in(),not(as("a").out("created").has("name","ripple")))).<String>select().by("name");
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0eca2334/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index ab53730..abb4baa 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -167,6 +167,9 @@ public class TinkerGraphTest {
as("d").where(neq("a")).where(neq("b")),
as("b").out("created").has("name", "ripple"))
.select(Pop.head, "a", "b", "c", "d").forEachRemaining(System.out::println);
+
+ System.out.println(g.V().out().and().in().iterate());
+ System.out.println(g.V().as("a","b").where(as("a").out().and().in().as("b")).iterate());
}
@Test