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/18 03:42:37 UTC
incubator-tinkerpop git commit: TINKERPOP3-735: Add and/or tests to
verify traversals can see path
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 064e48fd1 -> e2116901c
TINKERPOP3-735: Add and/or tests to verify traversals can see path
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e2116901
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e2116901
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e2116901
Branch: refs/heads/master
Commit: e2116901c23f5380a1d3e290dfeafb5c33ce42e3
Parents: 064e48f
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Wed Jun 17 18:21:28 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Wed Jun 17 18:21:28 2015 -0700
----------------------------------------------------------------------
.../traversal/step/filter/GroovyAndTest.groovy | 5 +++++
.../traversal/step/filter/GroovyOrTest.groovy | 5 +++++
.../process/traversal/step/filter/AndTest.java | 18 ++++++++++++++++++
.../process/traversal/step/filter/OrTest.java | 19 +++++++++++++++++++
4 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2116901/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
index dbd7c9d..7567a15 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
@@ -43,5 +43,10 @@ public abstract class GroovyAndTest {
public Traversal<Vertex, Vertex> get_g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name() {
TraversalScriptHelper.compute("g.V.as('a').out('knows') & out('created').in('created').as('a').name", g)
}
+
+ @Override
+ public Traversal<Vertex, Vertex> get_g_V_asXaX_andXselectXaX_selectXaXX() {
+ TraversalScriptHelper.compute("g.V().as('a').and(__.select('a'), __.select('a'))", g);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2116901/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
index a647f36..1356540 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
@@ -38,5 +38,10 @@ public abstract class GroovyOrTest {
public Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
TraversalScriptHelper.compute("g.V.or(outE('knows'), has(T.label, 'software') | has('age', gte(35))).name", g)
}
+
+ @Override
+ public Traversal<Vertex, Vertex> get_g_V_asXaX_orXselectXaX_selectXaXX() {
+ TraversalScriptHelper.compute("g.V().as('a').or(__.select('a'), __.select('a'))", g);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2116901/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
index 7f01d5a..4a9fae3 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
@@ -29,10 +29,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
+import java.util.List;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
+import static org.junit.Assert.assertEquals;
/**
@@ -47,6 +50,8 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name();
+ public abstract Traversal<Vertex, Vertex> get_g_V_asXaX_andXselectXaX_selectXaXX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
@@ -71,6 +76,14 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
checkResults(Arrays.asList(convertToVertex(graph, "marko")), traversal);
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_asXaX_andXselectXaX_selectXaXX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_asXaX_andXselectXaX_selectXaXX();
+ printTraversalForm(traversal);
+ final List<Vertex> actual = traversal.toList();
+ assertEquals(6, actual.size());
+ }
public static class Traversals extends AndTest {
@@ -88,5 +101,10 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Vertex> get_g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name() {
return g.V().as("a").out("knows").and().out("created").in("created").as("a").values("name");
}
+
+ @Override
+ public Traversal<Vertex, Vertex> get_g_V_asXaX_andXselectXaX_selectXaXX() {
+ return g.V().as("a").and(select("a"), select("a"));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2116901/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrTest.java
index 239e089..ef8a260 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrTest.java
@@ -29,10 +29,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
+import java.util.List;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
+import static org.junit.Assert.assertEquals;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -44,6 +47,8 @@ public abstract class OrTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name();
+ public abstract Traversal<Vertex, Vertex> get_g_V_asXaX_orXselectXaX_selectXaXX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
@@ -60,6 +65,15 @@ public abstract class OrTest extends AbstractGremlinProcessTest {
checkResults(Arrays.asList("marko", "ripple", "lop", "peter"), traversal);
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_asXaX_orXselectXaX_selectXaXX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_asXaX_orXselectXaX_selectXaXX();
+ printTraversalForm(traversal);
+ final List<Vertex> actual = traversal.toList();
+ assertEquals(6, actual.size());
+ }
+
public static class Traversals extends OrTest {
@Override
public Traversal<Vertex, String> get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
@@ -70,5 +84,10 @@ public abstract class OrTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
return g.V().or(outE("knows"), has(T.label, "software").or().has("age", P.gte(35))).values("name");
}
+
+ @Override
+ public Traversal<Vertex, Vertex> get_g_V_asXaX_orXselectXaX_selectXaXX() {
+ return g.V().as("a").or(select("a"), select("a"));
+ }
}
}