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/08/31 23:07:22 UTC
[1/2] incubator-tinkerpop git commit: added RepeatTests around
until(barrier).
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d730fe6ea -> 12de51516
added RepeatTests around until(barrier).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/19923ffb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/19923ffb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/19923ffb
Branch: refs/heads/master
Commit: 19923ffb265f538eecf91ffc85eee6680ea0acbb
Parents: 2ffde6c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 31 15:05:53 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 31 15:05:53 2015 -0600
----------------------------------------------------------------------
.../traversal/step/branch/GroovyRepeatTest.groovy | 5 +++++
.../process/traversal/step/branch/RepeatTest.java | 15 +++++++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19923ffb/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
index 024ed6c..42b7a77 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
@@ -74,5 +74,10 @@ public abstract class GroovyRepeatTest {
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
TraversalScriptHelper.compute("g.V.repeat(groupCount('m').by('name').out).times(2).cap('m')", g)
}
+
+ @Override
+ public Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id) {
+ TraversalScriptHelper.compute("g.V(${v1Id}).repeat(out()).until(__.outE.count.is(0)).name", g, "v1Id", v1Id)
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19923ffb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index 550c7d2..1da33d9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@ -70,6 +70,8 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX();
+ public abstract Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id);
+
@Test
@LoadGraphWith(MODERN)
public void g_V_repeatXoutX_timesX2X_emit_path() {
@@ -212,6 +214,14 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
});
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name() {
+ final Traversal<Vertex, String> traversal = get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(convertToVertexId("marko"));
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("lop", "lop", "ripple", "vadas"), traversal);
+ }
+
public static class Traversals extends RepeatTest {
@Override
@@ -258,5 +268,10 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
return g.V().repeat(groupCount("m").by("name").out()).times(2).cap("m");
}
+
+ @Override
+ public Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id) {
+ return g.V(v1Id).repeat(out()).until(outE().count().is(0)).values("name");
+ }
}
}
\ No newline at end of file
[2/2] incubator-tinkerpop git commit: fix for RepeatTest. Sorry,
I got my branches all mixed up. This is basically me fixing things.
Posted by ok...@apache.org.
fix for RepeatTest. Sorry, I got my branches all mixed up. This is basically me fixing things.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/12de5151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/12de5151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/12de5151
Branch: refs/heads/master
Commit: 12de51516c30efd750987504b73dd42af78157ab
Parents: d730fe6 19923ff
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 31 15:07:27 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 31 15:07:27 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/branch/RepeatTest.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/12de5151/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index f5ecbf8,1da33d9..3d07ffd
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@@ -220,28 -216,12 +220,20 @@@ public abstract class RepeatTest extend
@Test
@LoadGraphWith(MODERN)
- public void g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(convertToVertexId("marko"));
+ public void g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX() {
+ final Traversal<Vertex, Map<String, Vertex>> traversal = get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX();
printTraversalForm(traversal);
- checkResults(Arrays.asList("lop", "lop", "ripple", "vadas"), traversal);
+ int counter = 0;
+ while (traversal.hasNext()) {
+ final Map<String, Vertex> map = traversal.next();
+ assertEquals(2, map.size());
+ assertTrue(map.get("a") instanceof Vertex);
+ assertTrue(map.get("b") instanceof Vertex);
+ counter++;
+ }
+ assertTrue(counter > 0);
}
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(convertToVertexId("marko"));
- printTraversalForm(traversal);
- checkResults(Arrays.asList("lop", "lop", "ripple", "vadas"), traversal);
- }
-
public static class Traversals extends RepeatTest {
@Override