TINKERPOP-1976 Modified the nature of the pageRank() order() test The GLV test language doesn't support the kind of asserts that the java test was doing. Change the nature of the java test a bit to ensure it could be tested properly. Made the java test more succinct in the process.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d9c3f13 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d9c3f13 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d9c3f13 Branch: refs/heads/TINKERPOP-1990 Commit: 5d9c3f1335375caa1b4c0bd0cd97094f787e9dac Parents: 13440d6 Author: Stephen Mallette <[email protected]> Authored: Wed Aug 8 12:06:43 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Aug 9 07:28:09 2018 -0400 ---------------------------------------------------------------------- .../traversal/step/map/GroovyPageRankTest.groovy | 2 +- .../test/cucumber/feature-steps.js | 2 +- gremlin-test/features/map/PageRank.feature | 10 ++++------ .../process/traversal/step/map/PageRankTest.java | 18 +++++++++--------- 4 files changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/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 13787cc..78671da 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 @@ -41,7 +41,7 @@ public abstract class GroovyPageRankTest { } @Override - public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name() { + public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.order.by(PageRankVertexProgram.PAGE_RANK, decr).name") } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/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 e585fcc..fa609be 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 @@ -63,7 +63,7 @@ const ignoredScenarios = { // An associative array containing the scenario name as key, for example: 'g_V_pageRank': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX': new IgnoreError(ignoreReason.computerNotSupported), - 'g_V_pageRank_order_byXpageRank_decrX_name': 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), 'g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX': new IgnoreError(ignoreReason.computerNotSupported), 'g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX': new IgnoreError(ignoreReason.computerNotSupported), http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/gremlin-test/features/map/PageRank.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature index 049b8c2..ebf6489 100644 --- a/gremlin-test/features/map/PageRank.feature +++ b/gremlin-test/features/map/PageRank.feature @@ -48,21 +48,19 @@ Feature: Step - pageRank() | m[{"name": ["lop"], "projectRank": [3.0]}] | | m[{"name": ["ripple"], "projectRank": [1.0]}] | - # can't fully assert order here because some ranks are equivalent. the java test does an "or" type assert to deal - # with this, which we can't express here in these tests. should probably change the test or - Scenario: g_V_pageRank_order_byXpageRank_decrX_name + Scenario: g_V_pageRank_order_byXpageRank_decrX_byXnameX_name Given the modern graph And the traversal of """ - g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name") + g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).by("name").values("name") """ When iterated to list - Then the result should be unordered + Then the result should be ordered | result | | lop | | ripple | - | vadas | | josh | + | vadas | | marko | | peter | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/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 57a3b3f..8846099 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 @@ -51,7 +51,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); - public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name(); + public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name(); public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X(); @@ -99,17 +99,17 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) - public void g_V_pageRank_order_byXpageRank_decrX_name() { - final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_name(); + public void g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() { + final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name(); printTraversalForm(traversal); final List<String> names = traversal.toList(); assertEquals(6, names.size()); assertEquals("lop", names.get(0)); assertEquals("ripple", names.get(1)); - assertTrue(names.get(2).equals("josh") || names.get(2).equals("vadas")); - assertTrue(names.get(3).equals("josh") || names.get(3).equals("vadas")); - assertTrue(names.get(4).equals("marko") || names.get(4).equals("peter")); - assertTrue(names.get(5).equals("marko") || names.get(5).equals("peter")); + assertEquals("josh", names.get(2)); + assertEquals("vadas", names.get(3)); + assertEquals("marko", names.get(4)); + assertEquals("peter", names.get(5)); } @Test @@ -256,8 +256,8 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { } @Override - public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name() { - return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).values("name"); + public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() { + return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).by("name").values("name"); } @Override
