TINKERPOP-1976 Changed the context of tests to be better suited to GLVs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a533878c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a533878c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a533878c Branch: refs/heads/TINKERPOP-1967 Commit: a533878cb71eef970bdca366ed1c4ae1e5d87f20 Parents: 8c2313e Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Aug 9 08:32:17 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Aug 9 08:32:17 2018 -0400 ---------------------------------------------------------------------- .../traversal/step/map/GroovyPageRankTest.groovy | 4 ++-- .../step/map/GroovyPeerPressureTest.groovy | 4 ++-- .../test/cucumber/feature-steps.js | 4 ++-- gremlin-test/features/map/PageRank.feature | 4 ++-- gremlin-test/features/map/PeerPressure.feature | 4 ++-- .../process/traversal/step/map/PageRankTest.java | 19 +++++++------------ .../traversal/step/map/PeerPressureTest.java | 19 +++++++------------ 7 files changed, 24 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy index 7554092..6b8d7b2 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy @@ -31,8 +31,8 @@ public abstract class GroovyPageRankTest { public static class Traversals extends PageRankTest { @Override - public Traversal<Vertex, Vertex> get_g_V_pageRank() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank") + public Traversal<Vertex, Vertex> get_g_V_pageRank_hasXpageRankX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.has(PageRankVertexProgram.PAGE_RANK)") } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy index 6ec0750..cdd383c 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy @@ -31,8 +31,8 @@ public abstract class GroovyPeerPressureTest { public static class Traversals extends PeerPressureTest { @Override - public Traversal<Vertex, Vertex> get_g_V_peerPressure() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V.peerPressure") + public Traversal<Vertex, Vertex> get_g_V_peerPressure_hasXclusterX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.V.peerPressure.has(PeerPressureVertexProgram.CLUSTER)") } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js ---------------------------------------------------------------------- diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js index fa609be..3e6824c 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js @@ -61,7 +61,7 @@ const ignoreReason = { const ignoredScenarios = { // An associative array containing the scenario name as key, for example: - 'g_V_pageRank': new IgnoreError(ignoreReason.computerNotSupported), + 'g_V_pageRank_hasXpageRankX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_pageRank_order_byXpageRank_decrX_byXnameX_name': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_pageRank_order_byXpageRank_decrX_name_limitX2X': new IgnoreError(ignoreReason.computerNotSupported), @@ -70,7 +70,7 @@ const ignoredScenarios = { 'g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX': new IgnoreError(ignoreReason.computerNotSupported), - 'g_V_peerPressure': new IgnoreError(ignoreReason.computerNotSupported), + 'g_V_peerPressure_hasXclusterX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX': new IgnoreError(ignoreReason.computerNotSupported), }; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-test/features/map/PageRank.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature index ebf6489..bf2ed26 100644 --- a/gremlin-test/features/map/PageRank.feature +++ b/gremlin-test/features/map/PageRank.feature @@ -17,11 +17,11 @@ Feature: Step - pageRank() - Scenario: g_V_pageRank + Scenario: g_V_pageRank_hasXpageRankX Given the modern graph And the traversal of """ - g.withComputer().V().pageRank() + g.withComputer().V().pageRank().has("gremlin.pageRankVertexProgram.pageRank") """ When iterated to list Then the result should be unordered http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-test/features/map/PeerPressure.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/PeerPressure.feature b/gremlin-test/features/map/PeerPressure.feature index d23fa31..83f5bb2 100644 --- a/gremlin-test/features/map/PeerPressure.feature +++ b/gremlin-test/features/map/PeerPressure.feature @@ -17,11 +17,11 @@ Feature: Step - peerPressure() - Scenario: g_V_peerPressure + Scenario: g_V_peerPressure_hasXclusterX Given the modern graph And the traversal of """ - g.withComputer().V().peerPressure() + g.withComputer().V().peerPressure().has("gremlin.peerPressureVertexProgram.cluster") """ When iterated to list Then the result should be unordered http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java index 8846099..0c0a91d 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java @@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +48,7 @@ import static org.junit.Assert.fail; @RunWith(GremlinProcessRunner.class) public abstract class PageRankTest extends AbstractGremlinProcessTest { - public abstract Traversal<Vertex, Vertex> get_g_V_pageRank(); + public abstract Traversal<Vertex, Vertex> get_g_V_pageRank_hasXpageRankX(); public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); @@ -67,16 +68,10 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) - public void g_V_pageRank() { - final Traversal<Vertex, Vertex> traversal = get_g_V_pageRank(); + public void g_V_pageRank_hasXpageRankX() { + final Traversal<Vertex, Vertex> traversal = get_g_V_pageRank_hasXpageRankX(); printTraversalForm(traversal); - int counter = 0; - while (traversal.hasNext()) { - final Vertex vertex = traversal.next(); - counter++; - assertTrue(vertex.property(PageRankVertexProgram.PAGE_RANK).isPresent()); - } - assertEquals(6, counter); + assertEquals(6, IteratorUtils.count(traversal)); } @Test @@ -241,8 +236,8 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { public static class Traversals extends PageRankTest { @Override - public Traversal<Vertex, Vertex> get_g_V_pageRank() { - return g.V().pageRank(); + public Traversal<Vertex, Vertex> get_g_V_pageRank_hasXpageRankX() { + return g.V().pageRank().has(PageRankVertexProgram.PAGE_RANK); } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a533878c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java index 67ed267..e19f96d 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java @@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.Pee import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +48,7 @@ import static org.junit.Assert.assertTrue; @RunWith(GremlinProcessRunner.class) public abstract class PeerPressureTest extends AbstractGremlinProcessTest { - public abstract Traversal<Vertex, Vertex> get_g_V_peerPressure(); + public abstract Traversal<Vertex, Vertex> get_g_V_peerPressure_hasXclusterX(); public abstract Traversal<Vertex, Map<Object, Number>> get_g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X(); @@ -55,16 +56,10 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) - public void g_V_peerPressure() { - final Traversal<Vertex, Vertex> traversal = get_g_V_peerPressure(); + public void g_V_peerPressure_hasXclusterX() { + final Traversal<Vertex, Vertex> traversal = get_g_V_peerPressure_hasXclusterX(); printTraversalForm(traversal); - int counter = 0; - while (traversal.hasNext()) { - final Vertex vertex = traversal.next(); - counter++; - assertTrue(vertex.property(PeerPressureVertexProgram.CLUSTER).isPresent()); - } - assertEquals(6, counter); + assertEquals(6, IteratorUtils.count(traversal)); } @Test @@ -106,8 +101,8 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { public static class Traversals extends PeerPressureTest { @Override - public Traversal<Vertex, Vertex> get_g_V_peerPressure() { - return g.V().peerPressure(); + public Traversal<Vertex, Vertex> get_g_V_peerPressure_hasXclusterX() { + return g.V().peerPressure().has(PeerPressureVertexProgram.CLUSTER); } @Override