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 16:13:04 UTC
tinkerpop git commit: Simplified test queries and tweaked the
assertions so that they should now work in STANDARD and COMPUTER mode.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1643 741ca36a9 -> 565522d2c
Simplified test queries and tweaked the assertions so that they should now work in STANDARD and COMPUTER mode.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/565522d2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/565522d2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/565522d2
Branch: refs/heads/TINKERPOP-1643
Commit: 565522d2c8ae1df86bb3a976507b17379e7fd67b
Parents: 741ca36
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 2 17:11:16 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 2 17:11:16 2017 +0100
----------------------------------------------------------------------
.../step/branch/GroovyRepeatTest.groovy | 8 +-
.../traversal/step/branch/RepeatTest.java | 104 ++++++++++---------
2 files changed, 61 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/565522d2/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 0de5d78..ec2c80a 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
@@ -91,13 +91,13 @@ public abstract class GroovyRepeatTest {
}
@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")
+ public Traversal<Vertex, Long> get_g_V_emit_repeatXboth_dedupX_count() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.emit.repeat(both.dedup).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))")
+ public Traversal<Vertex, List<Vertex>> get_g_V_emit_repeatXboth_dedupX_order_byXcountXlocalXX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.emit.repeat(both.dedup).order.by(count(local))")
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/565522d2/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 a05d1a3..7210d2d 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,7 +22,6 @@ 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;
@@ -37,10 +36,18 @@ 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.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.count;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.groupCount;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -51,37 +58,58 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
// DO/WHILE
+ private static void assertPath(final Traversal<Vertex, Path> traversal) {
+ int path1 = 0;
+ int path2 = 0;
+ int path3 = 0;
+ while (traversal.hasNext()) {
+ final Path path = traversal.next();
+ if (path.size() == 1) {
+ path1++;
+ } else if (path.size() == 2) {
+ path2++;
+ } else if (path.size() == 3) {
+ path3++;
+ } else {
+ fail("Only path lengths of 1, 2, or 3 should be seen");
+ }
+ }
+ assertEquals(6, path1);
+ assertEquals(6, path2);
+ assertEquals(2, path3);
+ }
+
public abstract Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path();
public abstract Traversal<Vertex, String> get_g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name();
public abstract Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X();
- public abstract Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X_emit();
-
// WHILE/DO
+ public abstract Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X_emit();
+
public abstract Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id);
public abstract Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path();
public abstract Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path();
- public abstract Traversal<Vertex, String> get_g_VX1X_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id);
-
// SIDE-EFFECTS
- public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX();
+ public abstract Traversal<Vertex, String> get_g_VX1X_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id);
//
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX();
+
public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX();
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, Long> get_g_V_emit_repeatXboth_dedupX_count();
- public abstract Traversal<Vertex, List<Vertex>> get_g_V_asXvX_emit_repeatXboth_asXvX_dedupX_selectXall_vX_order_byXcountXlocalXX();
+ public abstract Traversal<Vertex, Vertex> get_g_V_emit_repeatXboth_dedupX_order_byXcountXlocalXX();
@Test
@LoadGraphWith(MODERN)
@@ -171,27 +199,6 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
assertPath(traversal);
}
- private static void assertPath(final Traversal<Vertex, Path> traversal) {
- int path1 = 0;
- int path2 = 0;
- int path3 = 0;
- while (traversal.hasNext()) {
- final Path path = traversal.next();
- if (path.size() == 1) {
- path1++;
- } else if (path.size() == 2) {
- path2++;
- } else if (path.size() == 3) {
- path3++;
- } else {
- fail("Only path lengths of 1, 2, or 3 should be seen");
- }
- }
- assertEquals(6, path1);
- assertEquals(6, path2);
- assertEquals(2, path3);
- }
-
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_emitXhasXlabel_personXX_repeatXoutX_name() {
@@ -243,8 +250,8 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
@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();
+ public void g_V_emit_repeatXboth_dedupX_count() {
+ final Traversal<Vertex, Long> traversal = get_g_V_emit_repeatXboth_dedupX_count();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals(12L, traversal.next().longValue());
@@ -253,16 +260,19 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
@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();
+ public void g_V_emit_repeatXboth_dedupX_order_byXcountXlocalXXv() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_emit_repeatXboth_dedupX_order_byXcountXlocalXX();
printTraversalForm(traversal);
- for (int j = 1; j <= 2; j++) {
+ final Map<Vertex, Integer> tmp = new HashMap<>(6);
+ for (int j = 0; j < 2; j++) {
for (int i = 0; i < 6; i++) {
assertTrue(traversal.hasNext());
- assertEquals(j, traversal.next().size());
+ tmp.compute(traversal.next(), (k, v) -> v != null ? v + 1 : 1);
}
- assertFalse(traversal.hasNext());
}
+ assertFalse(traversal.hasNext());
+ assertEquals(6, tmp.size());
+ assertTrue(tmp.values().stream().noneMatch(v -> v != 2));
}
public static class Traversals extends RepeatTest {
@@ -293,13 +303,13 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path() {
- return g.V().emit().repeat(out()).times(2).path();
+ public Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path() {
+ return g.V().emit().times(2).repeat(out()).path();
}
@Override
- public Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path() {
- return g.V().emit().times(2).repeat(out()).path();
+ public Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path() {
+ return g.V().emit().repeat(out()).times(2).path();
}
@Override
@@ -323,13 +333,13 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
}
@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();
+ public Traversal<Vertex, Long> get_g_V_emit_repeatXboth_dedupX_count() {
+ return g.V().emit().repeat(both().dedup()).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));
+ public Traversal<Vertex, Vertex> get_g_V_emit_repeatXboth_dedupX_order_byXcountXlocalXX() {
+ return g.V().emit().repeat(both().dedup()).order().by(count(local));
}
}
}
\ No newline at end of file