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/11/10 22:35:08 UTC
incubator-tinkerpop git commit: Fixed a bug in the
AbstractGrelminProcessTest.checkMap() method. This exposed a bug in two
GroupTestV3d0 tests. These have been fixed as well.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 3d34d1b3c -> cab1a8fd0
Fixed a bug in the AbstractGrelminProcessTest.checkMap() method. This exposed a bug in two GroupTestV3d0 tests. These have been fixed as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cab1a8fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cab1a8fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cab1a8fd
Branch: refs/heads/master
Commit: cab1a8fd0bd76ef086dd248c232def64db8227ec
Parents: 3d34d1b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Nov 10 14:35:18 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Nov 10 14:35:18 2015 -0700
----------------------------------------------------------------------
.../step/sideEffect/GroovyGroupTestV3d0.groovy | 8 ++++----
.../gremlin/process/AbstractGremlinProcessTest.java | 14 ++++++++++++--
.../traversal/step/sideEffect/GroupTestV3d0.java | 16 ++++++++--------
3 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cab1a8fd/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTestV3d0.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTestV3d0.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTestV3d0.groovy
index 03bff37..61ba1a7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTestV3d0.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTestV3d0.groovy
@@ -62,13 +62,13 @@ public abstract class GroovyGroupTestV3d0 {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX() {
- TraversalScriptHelper.compute("g.V.repeat(both('followedBy')).times(2).groupV3d0.by('songType').by(count())", g)
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
+ TraversalScriptHelper.compute("g.V.repeat(both('followedBy')).times(2).groupV3d0.by('songType').by(inject(1)).by(count(local))", g)
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX() {
- TraversalScriptHelper.compute("g.V.repeat(both('followedBy')).times(2).groupV3d0('a').by('songType').by(count()).cap('a')", g)
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
+ TraversalScriptHelper.compute("g.V.repeat(both('followedBy')).times(2).groupV3d0('a').by('songType').by(inject(1)).by(count(local)).cap('a')", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cab1a8fd/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index a209c92..246f048 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -83,7 +83,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
for (T t : results) {
if (t instanceof Map) {
- assertTrue("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).filter(e -> checkMap((Map) e, (Map) t)).findAny().isPresent());
+ assertTrue("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).filter(e -> internalCheckMap((Map) e, (Map) t)).findAny().isPresent());
} else {
assertTrue("Checking result existence: " + t, expectedResults.contains(t));
}
@@ -107,7 +107,17 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
checkResults(list, traversal);
}
- public static <A, B> boolean checkMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
+ public static <A, B> void checkMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
+ final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
+ final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
+ assertEquals(expectedList.size(), actualList.size());
+ for (int i = 0; i < actualList.size(); i++) {
+ assertEquals(expectedList.get(i).getKey(), actualList.get(i).getKey());
+ assertEquals(expectedList.get(i).getValue(), actualList.get(i).getValue());
+ }
+ }
+
+ private static <A, B> boolean internalCheckMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cab1a8fd/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
index 50256ed..d48ba0c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
@@ -57,9 +57,9 @@ public abstract class GroupTestV3d0 extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<Long, Collection<String>>> get_g_V_group_byXoutE_countX_byXnameX();
- public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX();
- public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX();
@Test
@LoadGraphWith(MODERN)
@@ -159,7 +159,7 @@ public abstract class GroupTestV3d0 extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(GRATEFUL)
public void g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX() {
- final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX();
checkMap(new HashMap<String, Long>() {{
put("original", 771317l);
put("", 160968l);
@@ -171,7 +171,7 @@ public abstract class GroupTestV3d0 extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(GRATEFUL)
public void g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX() {
- final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX();
checkMap(new HashMap<String, Long>() {{
put("original", 771317l);
put("", 160968l);
@@ -213,13 +213,13 @@ public abstract class GroupTestV3d0 extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX() {
- return g.V().repeat(both("followedBy")).times(2).<String, Long>groupV3d0().by("songType").by(count());
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
+ return g.V().repeat(both("followedBy")).times(2).<String, Long>groupV3d0().by("songType").by(inject(1)).by(count(Scope.local));
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX() {
- return g.V().repeat(both("followedBy")).times(2).<String, Long>groupV3d0("a").by("songType").by(count()).cap("a");
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
+ return g.V().repeat(both("followedBy")).times(2).<String, Long>groupV3d0("a").by("songType").by(inject(1)).by(count(Scope.local)).cap("a");
}
}
}
\ No newline at end of file