You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/10/26 17:15:42 UTC

[50/50] tinkerpop git commit: TINKERPOP-1784 Changed language of parameters

TINKERPOP-1784 Changed language of parameters

Used "defined as" instead of "is" since the line reads more clearly with the former.


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

Branch: refs/heads/TINKERPOP-1784
Commit: c8016df09f25fba1af9912041dcb06c3c0223658
Parents: 08fd4b0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Oct 16 12:16:36 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Oct 26 13:14:37 2017 -0400

----------------------------------------------------------------------
 .../src/main/jython/radish/feature_steps.py     |  2 +-
 gremlin-test/features/branch/Branch.feature     |  2 +-
 gremlin-test/features/branch/Choose.feature     |  2 +-
 gremlin-test/features/branch/Optional.feature   |  4 +-
 gremlin-test/features/filter/Has.feature        |  2 +-
 gremlin-test/features/map/Path.feature          |  6 +--
 gremlin-test/features/map/Select.feature        | 20 ++++----
 gremlin-test/features/map/Vertex.feature        | 54 ++++++++++----------
 8 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-python/src/main/jython/radish/feature_steps.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/radish/feature_steps.py b/gremlin-python/src/main/jython/radish/feature_steps.py
index c753323..5040896 100644
--- a/gremlin-python/src/main/jython/radish/feature_steps.py
+++ b/gremlin-python/src/main/jython/radish/feature_steps.py
@@ -46,7 +46,7 @@ def unsupported_scenario(step):
     return
 
 
-@given("using the parameter {param_name:w} is {param:QuotedString}")
+@given("using the parameter {param_name:w} defined as {param:QuotedString}")
 def add_parameter(step, param_name, param):
     if not hasattr(step.context, "traversal_params"):
         step.context.traversal_params = {}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/branch/Branch.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Branch.feature b/gremlin-test/features/branch/Branch.feature
index 49864e0..d306c3b 100644
--- a/gremlin-test/features/branch/Branch.feature
+++ b/gremlin-test/features/branch/Branch.feature
@@ -19,7 +19,7 @@ Feature: Step - branch()
 
   Scenario: g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX
     Given the modern graph
-    And using the parameter l1 is "c[it.get().label() == 'person' ? 'a' : 'b']"
+    And using the parameter l1 defined as "c[it.get().label() == 'person' ? 'a' : 'b']"
     And the traversal of
       """
       g.V().

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/branch/Choose.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Choose.feature b/gremlin-test/features/branch/Choose.feature
index de70485..0b5f00d 100644
--- a/gremlin-test/features/branch/Choose.feature
+++ b/gremlin-test/features/branch/Choose.feature
@@ -32,7 +32,7 @@ Feature: Step - choose()
 
   Scenario: g_V_chooseXlabel_eqXpersonX__outXknowsX__inXcreatedXX_name
     Given the modern graph
-    And using the parameter l1 is "c[it.label() == 'person']"
+    And using the parameter l1 defined as "c[it.label() == 'person']"
     And the traversal of
       """
       g.V().choose(l1, __.out("knows"), __.in("created")).values("name")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/branch/Optional.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Optional.feature b/gremlin-test/features/branch/Optional.feature
index ebd0de2..258230c 100644
--- a/gremlin-test/features/branch/Optional.feature
+++ b/gremlin-test/features/branch/Optional.feature
@@ -19,7 +19,7 @@ Feature: Step - choose()
 
   Scenario: g_VX2X_optionalXoutXknowsXX
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
       """
       g.V(v2Id).optional(__.out("knows"))
@@ -30,7 +30,7 @@ Feature: Step - choose()
 
   Scenario: g_VX2X_optionalXinXknowsXX
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
       """
       g.V(v2Id).optional(__.in("knows"))

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/filter/Has.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Has.feature b/gremlin-test/features/filter/Has.feature
index 8ff3a2b..fb140a9 100644
--- a/gremlin-test/features/filter/Has.feature
+++ b/gremlin-test/features/filter/Has.feature
@@ -30,7 +30,7 @@ Feature: Step - has()
 
   Scenario: Use hasId() with P
     Given the modern graph
-    And using the parameter v1 is "v[marko].id"
+    And using the parameter v1 defined as "v[marko].id"
     And the traversal of
     """
     g.V().in().hasId(P.neq(v1))

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/map/Path.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Path.feature b/gremlin-test/features/map/Path.feature
index e7904db..2126138 100644
--- a/gremlin-test/features/map/Path.feature
+++ b/gremlin-test/features/map/Path.feature
@@ -19,7 +19,7 @@ Feature: Step - count()
 
   Scenario: g_VX1X_name_path
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).values("name").path()
@@ -30,7 +30,7 @@ Feature: Step - count()
 
   Scenario: g_VX1X_out_path_byXageX_byXnameX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out().path().by("age").by("name")
@@ -75,7 +75,7 @@ Feature: Step - count()
 
   Scenario: g_VX1X_outEXcreatedX_inV_inE_outV_path
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("created").inV().inE().outV().path()

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index 74cd4ec..317dad8 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -19,7 +19,7 @@ Feature: Step - select()
 
   Scenario: get_g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).as("a").out("knows").as("b").select("a", "b")
@@ -31,7 +31,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX_byXnameX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).as("a").out("knows").as("b").
@@ -44,7 +44,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_asXaX_outXknowsX_asXbX_selectXaX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).as("a").out("knows").as("b").select("a")
@@ -56,7 +56,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).as("a").out("knows").as("b").
@@ -194,7 +194,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_asXhereX_out_selectXhereX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).as("here").out().select("here")
@@ -207,7 +207,7 @@ Feature: Step - select()
 
   Scenario: g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
       """
       g.V(v4Id).as("here").out().select("here")
@@ -219,7 +219,7 @@ Feature: Step - select()
 
   Scenario: g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX_name
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
       """
       g.V(v4Id).out().as("here").
@@ -233,7 +233,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_outE_asXhereX_inV_hasXname_vadasX_selectXhereX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE().as("here").
@@ -246,7 +246,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_outEXknowsX_hasXweight_1X_asXhereX_inV_hasXname_joshX_selectXhereX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("knows").
@@ -260,7 +260,7 @@ Feature: Step - select()
 
   Scenario: g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_asXfakeX_inV_hasXname_joshX_selectXhereX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("knows").as("here").

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8016df0/gremlin-test/features/map/Vertex.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Vertex.feature b/gremlin-test/features/map/Vertex.feature
index 1c9849e..9dff917 100644
--- a/gremlin-test/features/map/Vertex.feature
+++ b/gremlin-test/features/map/Vertex.feature
@@ -19,7 +19,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VXlistX1_2_3XX_name
     Given the modern graph
-    And using the parameter vx is "l[v[marko].id,v[vadas].id,v[lop].id]"
+    And using the parameter vx defined as "l[v[marko].id,v[vadas].id,v[lop].id]"
     And the traversal of
       """
       g.V(vx).values("name")
@@ -32,7 +32,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VXlistXv1_v2_v3XX_name
     Given the modern graph
-    And using the parameter vx is "l[v[marko],v[vadas],v[lop]]"
+    And using the parameter vx defined as "l[v[marko],v[vadas],v[lop]]"
     And the traversal of
       """
       g.V(vx).values("name")
@@ -60,7 +60,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_out
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out()
@@ -73,7 +73,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX2X_in
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
       """
       g.V(v2Id).in()
@@ -84,7 +84,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX4X_both
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
       """
       g.V(v4Id).both()
@@ -112,7 +112,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_EX11X
     Given the modern graph
-    And using the parameter e11Id is "e[josh-created->lop].id"
+    And using the parameter e11Id defined as "e[josh-created->lop].id"
     And the traversal of
     """
       g.E(e11Id)
@@ -123,7 +123,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_EX11AsStringX
     Given the modern graph
-    And using the parameter e11Id is "e[josh-created->lop].sid"
+    And using the parameter e11Id defined as "e[josh-created->lop].sid"
     And the traversal of
     """
       g.E(e11Id)
@@ -134,7 +134,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outE
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
     """
       g.V(v1Id).outE()
@@ -147,7 +147,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX2X_outE
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
     """
       g.V(v2Id).inE()
@@ -158,7 +158,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX4X_bothEXcreatedX
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
     """
       g.V(v4Id).bothE("created")
@@ -170,7 +170,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX4X_bothE
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
     """
       g.V(v4Id).bothE()
@@ -183,7 +183,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outE_inV
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).both()
@@ -196,7 +196,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX2X_inE_outV
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
       """
       g.V(v2Id).inE().outV()
@@ -237,7 +237,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outEXknowsX_bothV_name
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("knows").bothV().values("name")
@@ -251,7 +251,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outE_otherV
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE().otherV()
@@ -264,7 +264,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX4X_bothE_otherV
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
       """
       g.V(v4Id).bothE().otherV()
@@ -277,7 +277,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX4X_bothE_hasXweight_lt_1X_otherV
     Given the modern graph
-    And using the parameter v4Id is "v[josh].id"
+    And using the parameter v4Id defined as "v[josh].id"
     And the traversal of
       """
       g.V(v4Id).bothE().has("weight", P.lt(1.0)).otherV()
@@ -288,7 +288,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX2X_inE
     Given the modern graph
-    And using the parameter v2Id is "v[vadas].id"
+    And using the parameter v2Id defined as "v[vadas].id"
     And the traversal of
     """
       g.V(v2Id).bothE()
@@ -299,7 +299,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: get_g_VX1X_outE_otherV
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE().otherV()
@@ -312,7 +312,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outXknowsX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out("knows")
@@ -324,7 +324,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1AsStringX_outXknowsX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].sid"
+    And using the parameter v1Id defined as "v[marko].sid"
     And the traversal of
       """
       g.V(v1Id).out("knows")
@@ -336,7 +336,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outXknows_createdX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out("knows","created")
@@ -349,7 +349,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outEXknowsX_inV
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("knows").inV()
@@ -361,7 +361,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_outEXknows_createdX_inV
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).outE("knows","created").inV()
@@ -385,7 +385,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_out_out_out
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out().out().out()
@@ -395,7 +395,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_out_name
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).out().values("name")
@@ -408,7 +408,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
 
   Scenario: g_VX1X_to_XOUT_knowsX
     Given the modern graph
-    And using the parameter v1Id is "v[marko].id"
+    And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
       g.V(v1Id).to(Direction.OUT, "knows")