TINKERPOP-1968 Enabled GLV tests for self loops
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c50772c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c50772c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c50772c Branch: refs/heads/TINKERPOP-1643 Commit: 5c50772cb6b3d1287ff9e726f89816f3de9562ce Parents: 8e2749e Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri May 18 14:39:53 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu May 31 16:18:09 2018 -0400 ---------------------------------------------------------------------- .../traversal/step/map/GroovyVertexTest.groovy | 8 +++--- gremlin-test/features/map/Vertex.feature | 26 ++++++++++++++++++- .../process/traversal/step/map/VertexTest.java | 27 ++++++++++---------- .../gremlin/process/FeatureCoverageTest.java | 3 --- 4 files changed, 42 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c50772c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy index ff6275d..cd43ad0 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy @@ -185,13 +185,13 @@ public abstract class GroovyVertexTest { } @Override - public Traversal<Vertex, Edge> get_g_V_bothEXselfX() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V().bothE('self')") + public Traversal<Vertex, Edge> get_g_V_hasLabelXloopsX_bothEXselfX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('loops').bothE('self')") } @Override - public Traversal<Vertex, Vertex> get_g_V_bothXselfX() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V().both('self')") + public Traversal<Vertex, Vertex> get_g_V_hasLabelXloopsX_bothXselfX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('loops').both('self')") } } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c50772c/gremlin-test/features/map/Vertex.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Vertex.feature b/gremlin-test/features/map/Vertex.feature index 569fb6f..8642693 100644 --- a/gremlin-test/features/map/Vertex.feature +++ b/gremlin-test/features/map/Vertex.feature @@ -472,4 +472,28 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE() | ripple | | ripple | | ripple | - | ripple | \ No newline at end of file + | ripple | + + Scenario: g_V_hasLabelXloopsX_bothEXselfX + Given the sink graph + And the traversal of + """ + g.V().hasLabel("loops").bothE("self") + """ + When iterated to list + Then the result should be unordered + | result | + | e[loop-self->loop] | + | e[loop-self->loop] | + + Scenario: g_V_hasLabelXloopsX_bothXselfX + Given the sink graph + And the traversal of + """ + g.V().hasLabel("loops").both("self") + """ + When iterated to list + Then the result should be unordered + | result | + | v[loop] | + | v[loop] | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c50772c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java index 8a57535..7908952 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java @@ -41,6 +41,7 @@ import java.util.Map; import java.util.Set; import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; +import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.SINK; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -113,9 +114,9 @@ public abstract class VertexTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name(); - public abstract Traversal<Vertex, Edge> get_g_V_bothEXselfX(); + public abstract Traversal<Vertex, Edge> get_g_V_hasLabelXloopsX_bothEXselfX(); - public abstract Traversal<Vertex, Vertex> get_g_V_bothXselfX(); + public abstract Traversal<Vertex, Vertex> get_g_V_hasLabelXloopsX_bothXselfX(); // GRAPH VERTEX/EDGE @@ -575,10 +576,9 @@ public abstract class VertexTest extends AbstractGremlinProcessTest { } @Test - @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) - public void g_V_bothEXselfX() { - g.addV().as("a").addE("self").to("a").iterate(); - final Traversal<Vertex, Edge> traversal = get_g_V_bothEXselfX(); + @LoadGraphWith(SINK) + public void g_V_hasLabelXloopsX_bothEXselfX() { + final Traversal<Vertex, Edge> traversal = get_g_V_hasLabelXloopsX_bothEXselfX(); printTraversalForm(traversal); List<Edge> edges = traversal.toList(); @@ -587,10 +587,9 @@ public abstract class VertexTest extends AbstractGremlinProcessTest { } @Test - @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES) - public void g_V_bothXselfX() { - g.addV().as("a").addE("self").to("a").iterate(); - final Traversal<Vertex, Vertex> traversal = get_g_V_bothXselfX(); + @LoadGraphWith(SINK) + public void g_V_hasLabelXloopsX_bothXselfX() { + final Traversal<Vertex, Vertex> traversal = get_g_V_hasLabelXloopsX_bothXselfX(); printTraversalForm(traversal); List<Vertex> vertices = traversal.toList(); @@ -751,13 +750,13 @@ public abstract class VertexTest extends AbstractGremlinProcessTest { } @Override - public Traversal<Vertex, Edge> get_g_V_bothEXselfX() { - return g.V().bothE("self"); + public Traversal<Vertex, Edge> get_g_V_hasLabelXloopsX_bothEXselfX() { + return g.V().hasLabel("loops").bothE("self"); } @Override - public Traversal<Vertex, Vertex> get_g_V_bothXselfX() { - return g.V().both("self"); + public Traversal<Vertex, Vertex> get_g_V_hasLabelXloopsX_bothXselfX() { + return g.V().hasLabel("loops").both("self"); } } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c50772c/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java index 28c6d77..00391bf 100644 --- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java +++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java @@ -127,9 +127,6 @@ public class FeatureCoverageTest { "g_V_selectXaX", // assertion doesn't seem to want to work right for embedded lists "g_V_asXa_bX_out_asXcX_path_selectXkeysX", - // probably need TINKERPOP-1877 - "g_V_bothEXselfX", - "g_V_bothXselfX", // ugh - BigInteger? "g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", // ugh - clone
