You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/03/02 11:42:39 UTC
tinkerpop git commit: Added failing tests for TINKERPOP-1643.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1643 [created] 741ca36a9
Added failing tests for TINKERPOP-1643.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/741ca36a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/741ca36a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/741ca36a
Branch: refs/heads/TINKERPOP-1643
Commit: 741ca36a96e898ea2d7e547e9669649881012c88
Parents: 13bcdb4
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 2 12:41:48 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 2 12:41:48 2017 +0100
----------------------------------------------------------------------
.../step/branch/GroovyRepeatTest.groovy | 17 +++++++-
.../traversal/step/branch/RepeatTest.java | 41 ++++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/741ca36a/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 c132e6c..0de5d78 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
@@ -23,6 +23,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal
import org.apache.tinkerpop.gremlin.structure.Vertex
+import static org.apache.tinkerpop.gremlin.process.traversal.Pop.all
+import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.count
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -77,12 +82,22 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.repeat(both()).times(10).as('a').out().as('b').select('a', 'b')");
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.repeat(both()).times(10).as('a').out().as('b').select('a', 'b')")
}
@Override
public Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id) {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).repeat(out()).until(__.outE.count.is(0)).name", "v1Id", v1Id)
}
+
+ @Override
+ public Traversal<Vertex, Long> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXvX_count() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.as('v').emit.repeat(both.as('v').dedup).select('v').count")
+ }
+
+ @Override
+ public Traversal<Vertex, List<Vertex>> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.as('v').emit.repeat(both.as('v').dedup).select(all, 'v').order().by(count(local))")
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/741ca36a/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 db230d4..a05d1a3 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
@@ -22,6 +22,7 @@ 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.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.MapHelper;
import org.apache.tinkerpop.gremlin.structure.T;
@@ -36,6 +37,8 @@ import java.util.List;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.process.traversal.Pop.all;
+import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
import static org.junit.Assert.*;
@@ -76,6 +79,10 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id);
+ public abstract Traversal<Vertex, Long> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXvX_count();
+
+ public abstract Traversal<Vertex, List<Vertex>> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_repeatXoutX_timesX2X_emit_path() {
@@ -234,6 +241,30 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
checkResults(Arrays.asList("lop", "lop", "ripple", "vadas"), traversal);
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXvX_count() {
+ final Traversal<Vertex, Long> traversal = get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXvX_count();
+ printTraversalForm(traversal);
+ assertTrue(traversal.hasNext());
+ assertEquals(12L, traversal.next().longValue());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX() {
+ final Traversal<Vertex, List<Vertex>> traversal = get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX();
+ printTraversalForm(traversal);
+ for (int j = 1; j <= 2; j++) {
+ for (int i = 0; i < 6; i++) {
+ assertTrue(traversal.hasNext());
+ assertEquals(j, traversal.next().size());
+ }
+ assertFalse(traversal.hasNext());
+ }
+ }
+
public static class Traversals extends RepeatTest {
@Override
@@ -290,5 +321,15 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
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");
}
+
+ @Override
+ public Traversal<Vertex, Long> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXvX_count() {
+ return g.V().as("v").emit().repeat(both().as("v").dedup()).select("v").count();
+ }
+
+ @Override
+ public Traversal<Vertex, List<Vertex>> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX() {
+ return g.V().as("v").emit().repeat(both().as("v").dedup()).<List<Vertex>>select(all, "v").order().by(count(local));
+ }
}
}
\ No newline at end of file