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/02/17 02:39:48 UTC
tinkerpop git commit: Fixed return type of failing tests.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1629 35bb17ebb -> 5910eace8
Fixed return type of failing tests.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5910eace
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5910eace
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5910eace
Branch: refs/heads/TINKERPOP-1629
Commit: 5910eace88de042038d041ace6883dd7294d3b67
Parents: 35bb17e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Feb 17 03:38:26 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Feb 17 03:38:26 2017 +0100
----------------------------------------------------------------------
.../step/branch/GroovyRepeatTest.groovy | 2 +-
.../traversal/step/branch/RepeatTest.java | 21 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5910eace/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 c2adf19..7bc504a 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
@@ -79,7 +79,7 @@ public abstract class GroovyRepeatTest {
}
@Override
- public Traversal<Vertex, List<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id) {
+ public Traversal<Vertex, Collection<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id) {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).repeat(aggregate('a').fold.store('x').unfold.both.where(without('a')).dedup).cap('x')", v1Id)
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5910eace/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 0232f47..a5947a0 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
@@ -31,7 +31,9 @@ import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -74,7 +76,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
// BARRIERS
- public abstract Traversal<Vertex, List<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id);
+ public abstract Traversal<Vertex, Collection<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id);
public abstract Traversal<Vertex, String> get_g_VX1X_repeatXbothE_weight_sum_chooseXisXgtX1XX_VX6X_VX4XX_outXcreatedX_dedupX_emit_name(final Object v1Id, final Object v4Id, final Object v6Id);
@@ -231,15 +233,18 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
Arrays.asList(v1),
Arrays.asList(v2, v3, v4),
Arrays.asList(v5, v6));
- final Traversal<Vertex, List<List<Vertex>>> traversal = get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(v1.id());
+ final Traversal<Vertex, Collection<List<Vertex>>> traversal = get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(v1.id());
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final List<List<Vertex>> result = traversal.next();
- assertEquals(expected.size(), result.size());
- for (int i = 0; i < expected.size(); i++) {
- assertEquals(expected.get(i).size(), result.get(i).size());
- assertTrue(result.get(i).stream().allMatch(expected.get(i)::contains));
+ final Collection<List<Vertex>> result = traversal.next();
+ final Iterator<List<Vertex>> itty = result.iterator();
+ for (final List<Vertex> expectedList : expected) {
+ assertTrue(itty.hasNext());
+ final List<Vertex> list = itty.next();
+ assertEquals(expectedList.size(), list.size());
+ assertTrue(list.stream().allMatch(expectedList::contains));
}
+ assertFalse(itty.hasNext());
assertFalse(traversal.hasNext());
}
@@ -334,7 +339,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, List<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id) {
+ public Traversal<Vertex, Collection<List<Vertex>>> get_g_VX1X_repeatXaggregateXaX_fold_storeXxX_unfold_both_whereXwithoutXaXX_dedupX_capXxX(final Object v1Id) {
return g.V(v1Id).repeat(aggregate("a").fold().store("x").unfold().both().where(without("a")).dedup()).cap("x");
}