From 8747bfbb879c0cec0c30527908a436478e4a6df1 Mon Sep 17 00:00:00 2001 From: Daniel Kuppitz Date: Fri, 27 Feb 2015 19:37:41 +0100 Subject: [PATCH 1/2] added tests for group-sideEffects --- .../step/sideEffect/GroovyGroupTest.groovy | 16 ++++++--- .../traversal/step/sideEffect/GroupTest.java | 35 ++++++++++--------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy index ddd7e196334..db721de92ec 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy @@ -18,11 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import org.apache.tinkerpop.gremlin.process.ComputerTestHelper -import org.apache.tinkerpop.gremlin.process.Scope -import org.apache.tinkerpop.gremlin.process.Traversal -import org.apache.tinkerpop.gremlin.process.TraversalEngine -import org.apache.tinkerpop.gremlin.process.UseEngine +import org.apache.tinkerpop.gremlin.process.* import org.apache.tinkerpop.gremlin.process.graph.traversal.__ import org.apache.tinkerpop.gremlin.structure.Vertex @@ -39,6 +35,11 @@ public abstract class GroovyGroupTest { g.V.group.by('name') } + @Override + public Traversal>> get_g_V_groupXaX_byXnameX_capXaX() { + g.V.group('a').by('name').cap('a') + } + @Override public Traversal>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() { g.V.has('lang').group('a').by('lang').by('name').out.cap('a') @@ -68,6 +69,11 @@ public abstract class GroovyGroupTest { ComputerTestHelper.compute("g.V.group.by('name')", g) } + @Override + public Traversal>> get_g_V_groupXaX_byXnameX_capXaX() { + ComputerTestHelper.compute("g.V.group('a').by('name').cap('a')", g) + } + @Override public Traversal>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() { ComputerTestHelper.compute("g.V.has('lang').group('a').by('lang').by('name').out.cap('a')", g) diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java index da68e1d3a24..a5dc7e281dc 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java @@ -19,18 +19,11 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; import org.apache.tinkerpop.gremlin.LoadGraphWith; -import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import org.apache.tinkerpop.gremlin.process.Scope; -import org.apache.tinkerpop.gremlin.process.Traversal; -import org.apache.tinkerpop.gremlin.process.TraversalEngine; -import org.apache.tinkerpop.gremlin.process.UseEngine; +import org.apache.tinkerpop.gremlin.process.*; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*; @@ -44,6 +37,8 @@ public abstract class GroupTest extends AbstractGremlinProcessTest { public abstract Traversal>> get_g_V_group_byXnameX(); + public abstract Traversal>> get_g_V_groupXaX_byXnameX_capXaX(); + public abstract Traversal>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX(); public abstract Traversal> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX(); @@ -55,15 +50,16 @@ public abstract class GroupTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_group_byXnameX() { - final Traversal>> traversal = get_g_V_group_byXnameX(); - printTraversalForm(traversal); - final Map> map = traversal.next(); - assertEquals(6, map.size()); - map.forEach((key, values) -> { - assertEquals(1, values.size()); - assertEquals(convertToVertexId(key), values.iterator().next().id()); + Arrays.asList(get_g_V_group_byXnameX(), get_g_V_groupXaX_byXnameX_capXaX()).forEach(traversal -> { + printTraversalForm(traversal); + final Map> map = traversal.next(); + assertEquals(6, map.size()); + map.forEach((key, values) -> { + assertEquals(1, values.size()); + assertEquals(convertToVertexId(key), values.iterator().next().id()); + }); + assertFalse(traversal.hasNext()); }); - assertFalse(traversal.hasNext()); } @Test @@ -147,6 +143,11 @@ public Traversal>> get_g_V_group_byXnameX return g.V().>group().by("name"); } + @Override + public Traversal>> get_g_V_groupXaX_byXnameX_capXaX() { + return g.V().>group("a").by("name").cap("a"); + } + @Override public Traversal>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() { return g.V().has("lang").group("a").by("lang").by("name").out().cap("a"); From 49f9b4492326bf5ff573e018e5a23a334bad6bb2 Mon Sep 17 00:00:00 2001 From: Daniel Kuppitz Date: Tue, 3 Mar 2015 07:57:32 +0100 Subject: [PATCH 2/2] added tree tests (reducer) --- .../step/sideEffect/GroovyTreeTest.groovy | 20 +++++++++++-------- .../traversal/step/sideEffect/TreeTest.java | 16 ++++++++------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy index 16da9dd02d4..337d2ba4c1b 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy @@ -18,13 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect -import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest -import org.apache.tinkerpop.gremlin.process.T -import org.apache.tinkerpop.gremlin.process.Traversal -import org.apache.tinkerpop.gremlin.process.ComputerTestHelper -import org.apache.tinkerpop.gremlin.process.TraversalEngine -import org.apache.tinkerpop.gremlin.process.UseEngine -import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeTest +import org.apache.tinkerpop.gremlin.process.* import org.apache.tinkerpop.gremlin.process.graph.util.Tree import org.apache.tinkerpop.gremlin.structure.Vertex import org.junit.Test @@ -57,9 +51,14 @@ public abstract class GroovyTreeTest { g.V(v1Id).out.out.tree('a').by('name').both.both.cap('a'); } + @Override + public Traversal get_g_V_out_out_tree() { + g.V.out.out.tree(); + } + @Override public Traversal get_g_V_out_out_treeXaX_capXaX() { - g.V.out.out.tree("a").cap('a'); + g.V.out.out.tree('a').cap('a'); } } @@ -76,6 +75,11 @@ public abstract class GroovyTreeTest { ComputerTestHelper.compute("g.V.out.out.tree('a').by(id).cap('a')", g) } + @Override + public Traversal get_g_V_out_out_tree() { + ComputerTestHelper.compute("g.V.out.out.tree()", g) + } + @Override public Traversal get_g_V_out_out_treeXaX_capXaX() { ComputerTestHelper.compute("g.V.out.out.tree('a').cap('a')", g) diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java index d3d0cd81809..b1e467401e9 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java @@ -19,12 +19,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect; import org.apache.tinkerpop.gremlin.LoadGraphWith; -import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import org.apache.tinkerpop.gremlin.process.IgnoreEngine; -import org.apache.tinkerpop.gremlin.process.T; -import org.apache.tinkerpop.gremlin.process.Traversal; -import org.apache.tinkerpop.gremlin.process.TraversalEngine; -import org.apache.tinkerpop.gremlin.process.UseEngine; +import org.apache.tinkerpop.gremlin.process.*; import org.apache.tinkerpop.gremlin.process.graph.util.Tree; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; @@ -46,6 +41,8 @@ public abstract class TreeTest extends AbstractGremlinProcessTest { public abstract Traversal get_g_V_out_out_treeXaX_byXidX_capXaX(); + public abstract Traversal get_g_V_out_out_tree(); + public abstract Traversal get_g_V_out_out_treeXaX_capXaX(); public abstract Traversal get_g_VX1X_out_out_tree_byXnameX(final Object v1Id); @@ -92,7 +89,7 @@ public void g_V_out_out_tree_byXidX() { @Test @LoadGraphWith(MODERN) public void g_V_out_out_treeXaX_capXaX() { - List> traversals = Arrays.asList(get_g_V_out_out_treeXaX_capXaX()); + List> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX()); traversals.forEach(traversal -> { printTraversalForm(traversal); final Tree tree = traversal.next(); @@ -129,6 +126,11 @@ public Traversal get_g_V_out_out_treeXaX_byXidX_capXaX() { return (Traversal) g.V().out().out().tree("a").by(T.id).cap("a"); } + @Override + public Traversal get_g_V_out_out_tree() { + return (Traversal) g.V().out().out().tree(); + } + @Override public Traversal get_g_V_out_out_treeXaX_capXaX() { return (Traversal) g.V().out().out().tree("a").cap("a");