TINKERPOP-1857 Fixed up union() and range() tests that were failing

Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d556f779
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d556f779
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d556f779

Branch: refs/heads/TINKERPOP-1857
Commit: d556f77994712c3fb91ab09e08720ced273b4474
Parents: 68669ea
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 24 10:27:13 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Feb 14 15:34:09 2018 -0500

----------------------------------------------------------------------
 gremlin-test/features/branch/Union.feature |  2 +-
 gremlin-test/features/filter/Range.feature | 26 +------------------------
 gremlin-test/features/filter/Where.feature | 26 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d556f779/gremlin-test/features/branch/Union.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Union.feature 
b/gremlin-test/features/branch/Union.feature
index 2380246..83318f6 100644
--- a/gremlin-test/features/branch/Union.feature
+++ b/gremlin-test/features/branch/Union.feature
@@ -145,7 +145,7 @@ Feature: Step - union()
     And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
       """
-      g.V(v1Id, v2Id).local(union(count()))
+      g.V(v1Id, v2Id).local(__.union(__.count()))
       """
     When iterated to list
     Then the result should be unordered

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d556f779/gremlin-test/features/filter/Range.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Range.feature 
b/gremlin-test/features/filter/Range.feature
index 066960a..18aae9f 100644
--- a/gremlin-test/features/filter/Range.feature
+++ b/gremlin-test/features/filter/Range.feature
@@ -225,28 +225,4 @@ Feature: Step - range()
     Then the result should be unordered
       | result |
       | m[{"b":"josh"}] |
-      | m[{"b":"josh"}] |
-
-  Scenario: g_V_repeatXbothX_timesX3X_rangeX5_11X
-    Given the modern graph
-    And the traversal of
-      """
-      g.V().repeat(both()).times(3).range(5, 11)
-      """
-    When iterated to list
-    Then the result should be ordered
-      | result |
-      | d[6].l |
-
-  Scenario: g_V_repeatXbothX_timesX3X_rangeX5_11X
-    Given the modern graph
-    And using the parameter v1Id defined as "v[marko].id"
-    And the traversal of
-      """
-      g.V(v1Id).out("created").inE("created").range(1, 3).outV()
-      """
-    When iterated to list
-    Then the result should be unordered
-      | result |
-      | v[marko] |
-      | v[ripple] |
\ No newline at end of file
+      | m[{"b":"josh"}] |
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d556f779/gremlin-test/features/filter/Where.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Where.feature 
b/gremlin-test/features/filter/Where.feature
index 5c520da..c13703c 100644
--- a/gremlin-test/features/filter/Where.feature
+++ b/gremlin-test/features/filter/Where.feature
@@ -103,3 +103,29 @@ Feature: Step - where()
       | josh |
       | peter |
 
+  Scenario: g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_neqXbXX_name
+    Given the modern graph
+    And using the parameter v1Id defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(v1Id).as("a").out("created").in("created").as("b").where("a", 
P.neq("b")).values("name")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | josh |
+      | peter |
+
+  Scenario: 
g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXbX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX
+    Given the modern graph
+    And using the parameter v1Id defined as "v[marko].id"
+    And the traversal of
+      """
+      
g.V(v1Id).as("a").out("created").in("created").as("b").where(__.as("b").out("created").has("name",
 "ripple")).values("age", "name")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | josh |
+      | d[32].i |
+

Reply via email to