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/11/21 20:53:51 UTC

[17/50] tinkerpop git commit: TINKERPOP-1784 radish bumped version and broke stuff

TINKERPOP-1784 radish bumped version and broke stuff

Tables now return a list of maps that required a header so all feature files needed header.


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

Branch: refs/heads/TINKERPOP-1784
Commit: 33146446fe67ff25e378e2025d2b03e2c207d119
Parents: 1588d3e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Oct 31 08:24:28 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Nov 21 15:52:52 2017 -0500

----------------------------------------------------------------------
 .../src/main/jython/radish/feature_steps.py     |  4 +--
 gremlin-python/src/main/jython/setup.py         |  2 +-
 gremlin-test/features/branch/Branch.feature     |  3 ++
 gremlin-test/features/branch/Choose.feature     |  6 ++++
 gremlin-test/features/branch/Local.feature      | 11 +++++++
 gremlin-test/features/branch/Optional.feature   |  4 +++
 gremlin-test/features/branch/Repeat.feature     | 13 ++++++++
 gremlin-test/features/branch/Union.feature      |  7 ++++
 gremlin-test/features/filter/And.feature        |  4 +++
 gremlin-test/features/filter/Coin.feature       |  1 +
 gremlin-test/features/filter/CyclicPath.feature |  2 ++
 gremlin-test/features/filter/Dedup.feature      | 15 +++++++++
 gremlin-test/features/filter/Filter.feature     |  5 +++
 gremlin-test/features/filter/Has.feature        |  2 ++
 gremlin-test/features/filter/Is.feature         |  5 +++
 gremlin-test/features/filter/Or.feature         |  3 ++
 gremlin-test/features/filter/Range.feature      | 15 +++++++++
 gremlin-test/features/filter/SimplePath.feature |  7 ++--
 gremlin-test/features/map/Constant.feature      |  2 ++
 gremlin-test/features/map/Count.feature         |  9 ++++++
 gremlin-test/features/map/Max.feature           |  3 ++
 gremlin-test/features/map/Min.feature           |  3 ++
 gremlin-test/features/map/Path.feature          |  7 ++++
 gremlin-test/features/map/Project.feature       |  2 ++
 gremlin-test/features/map/Select.feature        | 20 ++++++++++++
 gremlin-test/features/map/ValueMap.feature      |  3 ++
 gremlin-test/features/map/Vertex.feature        | 34 +++++++++++++++++++-
 .../features/sideEffect/Aggregate.feature       |  4 +++
 .../features/sideEffect/GroupCount.feature      | 10 ++++++
 gremlin-test/features/sideEffect/Inject.feature |  2 ++
 gremlin-test/features/sideEffect/Store.feature  |  3 ++
 31 files changed, 205 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/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 14a0153..b48b7ef 100644
--- a/gremlin-python/src/main/jython/radish/feature_steps.py
+++ b/gremlin-python/src/main/jython/radish/feature_steps.py
@@ -168,7 +168,7 @@ def _convert_results(val):
 
 
 def _any_assertion(data, result, ctx):
-    converted = [_convert(line[0], ctx) for line in data]
+    converted = [_convert(line['result'], ctx) for line in data]
     for r in result:
         assert_that(r, is_in(converted))
 
@@ -182,7 +182,7 @@ def _table_assertion(data, result, ctx, ordered):
     # finds a match in the results for each line of data to assert and then removes that item
     # from the list - in the end there should be no items left over and each will have been asserted
     for ix, line in enumerate(data):
-        val = _convert(line[0], ctx)
+        val = _convert(line['result'], ctx)
 
         # clear the labels since we don't define them in .feature files
         if isinstance(val, Path):

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-python/src/main/jython/setup.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/setup.py b/gremlin-python/src/main/jython/setup.py
index 9a66c81..c72a4d3 100644
--- a/gremlin-python/src/main/jython/setup.py
+++ b/gremlin-python/src/main/jython/setup.py
@@ -71,7 +71,7 @@ setup(
     tests_require=[
         'pytest',
         'mock',
-        'radish-bdd',
+        'radish-bdd==0.8.0',
         'PyHamcrest'
     ],
     install_requires=install_requires,

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Branch.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Branch.feature b/gremlin-test/features/branch/Branch.feature
index d306c3b..b8690c6 100644
--- a/gremlin-test/features/branch/Branch.feature
+++ b/gremlin-test/features/branch/Branch.feature
@@ -30,6 +30,7 @@ Feature: Step - branch()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | java |
       | java |
       | lop |
@@ -51,6 +52,7 @@ Feature: Step - branch()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | java |
       | java |
       | lop |
@@ -73,6 +75,7 @@ Feature: Step - branch()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | java |
       | java |
       | lop |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Choose.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Choose.feature b/gremlin-test/features/branch/Choose.feature
index 0b5f00d..aa5a545 100644
--- a/gremlin-test/features/branch/Choose.feature
+++ b/gremlin-test/features/branch/Choose.feature
@@ -27,6 +27,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"name":["marko"], "age":[29]}] |
       | josh |
 
@@ -39,6 +40,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | josh |
       | vadas |
       | josh |
@@ -57,6 +59,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | ripple |
       | josh |
@@ -75,6 +78,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | peter |
@@ -92,6 +96,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | vadas |
       | josh |
       | vadas |
@@ -111,6 +116,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"p1":"marko", "p2":"vadas"}] |
       | m[{"p1":"marko", "p2":"josh"}] |
       | m[{"p1":"vadas", "p2":"vadas"}] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Local.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Local.feature b/gremlin-test/features/branch/Local.feature
index fa12d8c..4b33d62 100644
--- a/gremlin-test/features/branch/Local.feature
+++ b/gremlin-test/features/branch/Local.feature
@@ -25,6 +25,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | brussels       |
       | san diego      |
       | centreville    |
@@ -42,6 +43,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a":"marko","b":3}] |
       | m[{"a":"josh","b":5}]  |
       | m[{"a":"josh","b":3}]  |
@@ -55,6 +57,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[3] |
       | d[0] |
       | d[0] |
@@ -71,6 +74,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | vadas |
       | josh  |
     And should have a result count of 1
@@ -83,6 +87,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | marko  |
       | lop    |
       | ripple |
@@ -99,6 +104,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | e[josh-created->lop]    |
       | e[josh-created->ripple] |
     And should have a result count of 1
@@ -112,6 +118,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | e[marko-knows->josh]    |
       | e[josh-created->lop]    |
       | e[josh-created->ripple] |
@@ -126,6 +133,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | marko  |
       | ripple |
       | lop    |
@@ -140,6 +148,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | marko  |
       | ripple |
       | lop    |
@@ -153,6 +162,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | marko |
 
@@ -166,6 +176,7 @@ Feature: Step - local()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"name":"marko","project":"lop"}]   |
       | m[{"name":"josh","project":"lop"}]    |
       | m[{"name":"peter","project":"lop"}]   |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Optional.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Optional.feature b/gremlin-test/features/branch/Optional.feature
index 258230c..5d2be8d 100644
--- a/gremlin-test/features/branch/Optional.feature
+++ b/gremlin-test/features/branch/Optional.feature
@@ -26,6 +26,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
 
   Scenario: g_VX2X_optionalXinXknowsXX
@@ -37,6 +38,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_V_hasLabelXpersonX_optionalXoutXknowsX_optionalXoutXcreatedXXX_path
@@ -50,6 +52,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[vadas]] |
       | p[v[marko],v[josh],v[ripple]] |
       | p[v[marko],v[josh],v[lop]] |
@@ -65,6 +68,7 @@ Feature: Step - choose()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop]] |
       | p[v[marko],v[vadas]] |
       | p[v[marko],v[josh],v[ripple]] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Repeat.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Repeat.feature b/gremlin-test/features/branch/Repeat.feature
index 6d97fc0..082a3c6 100644
--- a/gremlin-test/features/branch/Repeat.feature
+++ b/gremlin-test/features/branch/Repeat.feature
@@ -25,6 +25,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop]] |
       | p[v[marko],v[vadas]] |
       | p[v[marko],v[josh]] |
@@ -42,6 +43,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | marko |
 
@@ -53,6 +55,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[ripple] |
       | v[lop] |
 
@@ -64,6 +67,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[ripple] |
       | v[lop] |
       | v[josh] |
@@ -79,6 +83,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | ripple |
       | lop |
 
@@ -90,6 +95,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko]] |
       | p[v[marko],v[lop]] |
       | p[v[marko],v[vadas]] |
@@ -113,6 +119,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko]] |
       | p[v[marko],v[lop]] |
       | p[v[marko],v[vadas]] |
@@ -137,6 +144,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | josh  |
@@ -149,6 +157,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"ripple":2,"peter":1,"vadas":2,"josh":2,"lop":4,"marko":1}] |
 
   Scenario: g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_timesX3X_capXmX
@@ -174,6 +183,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[43958] |
 
   Scenario: g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name
@@ -185,6 +195,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | vadas |
       | ripple  |
@@ -200,6 +211,7 @@ Feature: Step - repeat()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"ripple":3,"vadas":3,"josh":4,"lop":10,"marko":4}] |
 
   Scenario: g_V_hasXname_markoX_repeatXoutE_inV_simplePathX_untilXhasXname_rippleXX_path_byXnameX_byXlabelX
@@ -210,6 +222,7 @@ Feature: Step - repeat()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | marko |
       | knows |
       | josh  |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/branch/Union.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Union.feature b/gremlin-test/features/branch/Union.feature
index 938f51a..6178092 100644
--- a/gremlin-test/features/branch/Union.feature
+++ b/gremlin-test/features/branch/Union.feature
@@ -25,6 +25,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | vadas |
       | josh |
@@ -47,6 +48,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | ripple |
       | lop |
       | lop   |
@@ -61,6 +63,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | java   |
       | lop    |
       | vadas  |
@@ -84,6 +87,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"java":4,"ripple":1,"person":4,"vadas":1,"josh":1,"lop":3}] |
 
   Scenario: g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount
@@ -99,6 +103,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"software":12,"person":20}] |
 
   Scenario: g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX
@@ -111,6 +116,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[3]   |
       | d[1.9] |
       | d[1]   |
@@ -125,6 +131,7 @@ Feature: Step - union()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[3]   |
       | d[0]   |
       | d[1.9] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/And.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/And.feature b/gremlin-test/features/filter/And.feature
index c47ec6e..1e8732e 100644
--- a/gremlin-test/features/filter/And.feature
+++ b/gremlin-test/features/filter/And.feature
@@ -25,6 +25,7 @@ Feature: Step - and()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | josh |
 
@@ -36,6 +37,7 @@ Feature: Step - and()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | josh |
       | peter  |
 
@@ -47,6 +49,7 @@ Feature: Step - and()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_V_asXaX_andXselectXaX_selectXaXX
@@ -57,6 +60,7 @@ Feature: Step - and()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Coin.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Coin.feature b/gremlin-test/features/filter/Coin.feature
index 569f1db..b9e8ac8 100644
--- a/gremlin-test/features/filter/Coin.feature
+++ b/gremlin-test/features/filter/Coin.feature
@@ -25,6 +25,7 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/CyclicPath.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/CyclicPath.feature b/gremlin-test/features/filter/CyclicPath.feature
index d07e4ad..bfbb3a9 100644
--- a/gremlin-test/features/filter/CyclicPath.feature
+++ b/gremlin-test/features/filter/CyclicPath.feature
@@ -26,6 +26,7 @@ Feature: Step - cyclicPath()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path
@@ -37,6 +38,7 @@ Feature: Step - cyclicPath()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop],v[marko]] |
 
   Scenario: g_VX1X_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_cyclicPath_fromXaX_toXbX_path

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Dedup.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Dedup.feature b/gremlin-test/features/filter/Dedup.feature
index 7433da2..a19a0bf 100644
--- a/gremlin-test/features/filter/Dedup.feature
+++ b/gremlin-test/features/filter/Dedup.feature
@@ -25,6 +25,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | josh  |
       | peter |
@@ -37,6 +38,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"x":"lop","y":"marko"}] |
       | m[{"x":"lop","y":"josh"}] |
       | m[{"x":"lop","y":"peter"}] |
@@ -52,6 +54,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | vadas |
       | josh  |
@@ -67,6 +70,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
 
   Scenario: g_V_both_name_order_byXa_bX_dedup_value
@@ -78,6 +82,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | josh |
       | lop  |
       | marko |
@@ -93,6 +98,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | josh |
       | lop  |
       | marko |
@@ -108,6 +114,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
       | v[lop]  |
       | v[marko] |
@@ -132,6 +139,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"software":[1.0,0.4,0.2],"person":[0.5,1.0,0.4,0.2]}] |
 
   Scenario: g_V_asXaX_both_asXbX_dedupXa_bX_byXlabelX_selectXa_bX
@@ -142,6 +150,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a":"v[marko]","b":"v[lop]"}] |
       | m[{"a":"v[marko]","b":"v[vadas]"}] |
       | m[{"a":"v[lop]","b":"v[marko]"}] |
@@ -154,6 +163,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop],v[marko]] |
       | p[v[josh],v[ripple],v[josh]] |
       | p[v[josh],v[lop],v[marko]] |
@@ -167,6 +177,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | vadas |
       | josh |
@@ -180,6 +191,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | josh |
       | peter |
@@ -193,6 +205,7 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[1] |
 
   Scenario: g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup
@@ -203,6 +216,7 @@ Feature: Step - dedup()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | josh |
       | lop  |
       | marko |
@@ -218,5 +232,6 @@ Feature: Step - dedup()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[0] |
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Filter.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Filter.feature b/gremlin-test/features/filter/Filter.feature
index 05e7cea..76a5d7d 100644
--- a/gremlin-test/features/filter/Filter.feature
+++ b/gremlin-test/features/filter/Filter.feature
@@ -36,6 +36,7 @@ Feature: Step - filter()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |
@@ -52,6 +53,7 @@ Feature: Step - filter()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[ripple] |
       | v[lop]  |
 
@@ -65,6 +67,7 @@ Feature: Step - filter()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
 
   Scenario: g_V_filterXname_startsWith_m_OR_name_startsWith_pX
@@ -76,6 +79,7 @@ Feature: Step - filter()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[peter]  |
 
@@ -98,6 +102,7 @@ Feature: Step - filter()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-created->lop] |
       | e[marko-knows->josh] |
       | e[marko-knows->vadas] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Has.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Has.feature b/gremlin-test/features/filter/Has.feature
index fb140a9..797a1ec 100644
--- a/gremlin-test/features/filter/Has.feature
+++ b/gremlin-test/features/filter/Has.feature
@@ -25,6 +25,7 @@ Feature: Step - has()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
       | v[peter] |
 
@@ -37,6 +38,7 @@ Feature: Step - has()
     """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
       | v[josh] |
       | v[peter] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Is.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Is.feature b/gremlin-test/features/filter/Is.feature
index 9a00945..5ed0485 100644
--- a/gremlin-test/features/filter/Is.feature
+++ b/gremlin-test/features/filter/Is.feature
@@ -25,6 +25,7 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[32] |
 
   Scenario: g_V_valuesXageX_isXlte_30X
@@ -35,6 +36,7 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[27] |
       | d[29] |
 
@@ -46,6 +48,7 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[29] |
       | d[32] |
 
@@ -57,6 +60,7 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | ripple |
 
   Scenario: g_V_whereXinXcreatedX_count_isXgte_2XX_valuesXnameX
@@ -67,4 +71,5 @@ Feature: Step - coin()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Or.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Or.feature b/gremlin-test/features/filter/Or.feature
index 111315a..7f4782d 100644
--- a/gremlin-test/features/filter/Or.feature
+++ b/gremlin-test/features/filter/Or.feature
@@ -25,6 +25,7 @@ Feature: Step - or()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | josh  |
       | peter |
@@ -37,6 +38,7 @@ Feature: Step - or()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | ripple |
       | lop  |
@@ -50,6 +52,7 @@ Feature: Step - or()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/Range.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Range.feature b/gremlin-test/features/filter/Range.feature
index d5ea3bc..da02849 100644
--- a/gremlin-test/features/filter/Range.feature
+++ b/gremlin-test/features/filter/Range.feature
@@ -26,6 +26,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[josh] |
       | v[vadas] |
       | v[lop] |
@@ -39,6 +40,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[josh] |
       | v[vadas] |
       | v[lop] |
@@ -54,6 +56,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[lop] |
       | v[ripple] |
     And should have a result count of 1
@@ -67,6 +70,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[lop] |
       | v[ripple] |
     And should have a result count of 1
@@ -80,6 +84,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[marko] |
       | v[josh] |
       | v[peter] |
@@ -94,6 +99,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[marko] |
       | v[josh] |
       | v[peter] |
@@ -107,6 +113,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be of
+      | result |
       | v[marko] |
       | v[josh] |
       | v[peter] |
@@ -123,6 +130,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | l[lop,josh] |
       | l[ripple,josh] |
 
@@ -134,6 +142,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | ripple |
 
@@ -145,6 +154,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | l[josh,ripple] |
       | l[josh,lop] |
 
@@ -156,6 +166,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | josh |
       | josh |
 
@@ -176,6 +187,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a":"lop","b":"josh"}] |
       | m[{"a":"ripple","b":"josh"}] |
 
@@ -187,6 +199,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a":"lop"}] |
       | m[{"a":"ripple"}] |
 
@@ -198,6 +211,7 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"b":"josh","c":"lop"}] |
       | m[{"b":"josh","c":"ripple"}] |
 
@@ -209,5 +223,6 @@ Feature: Step - range()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"b":"josh"}] |
       | m[{"b":"josh"}] |
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/filter/SimplePath.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/SimplePath.feature b/gremlin-test/features/filter/SimplePath.feature
index c8091af..ed66e8b 100644
--- a/gremlin-test/features/filter/SimplePath.feature
+++ b/gremlin-test/features/filter/SimplePath.feature
@@ -26,10 +26,11 @@ Feature: Step - simplePath()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
       | v[peter] |
 
-  Scenario: get_g_V_repeatXboth_simplePathX_timesX3X_path
+  Scenario: g_V_repeatXboth_simplePathX_timesX3X_path
     Given the modern graph
     And the traversal of
       """
@@ -37,6 +38,7 @@ Feature: Step - simplePath()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop],v[josh],v[ripple]] |
       | p[v[marko],v[josh],v[lop],v[peter]] |
       | p[v[vadas],v[marko],v[lop],v[josh]] |
@@ -56,7 +58,7 @@ Feature: Step - simplePath()
       | p[v[peter],v[lop],v[josh],v[ripple]] |
       | p[v[peter],v[lop],v[josh],v[marko]] |
 
-  Scenario: get_g_V_asXaX_out_asXbX_out_asXcX_simplePath_byXlabelX_fromXbX_toXcX_path_byXnameX
+  Scenario: g_V_asXaX_out_asXbX_out_asXcX_simplePath_byXlabelX_fromXbX_toXcX_path_byXnameX
     Given the modern graph
     And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
@@ -65,5 +67,6 @@ Feature: Step - simplePath()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[marko,josh,ripple] |
       | p[marko,josh,lop]    |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Constant.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Constant.feature b/gremlin-test/features/map/Constant.feature
index f4ff337..9fb3dfb 100644
--- a/gremlin-test/features/map/Constant.feature
+++ b/gremlin-test/features/map/Constant.feature
@@ -26,6 +26,7 @@ Feature: Step - constant()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[123] |
       | d[123] |
       | d[123] |
@@ -41,6 +42,7 @@ Feature: Step - constant()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | inhuman |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Count.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Count.feature b/gremlin-test/features/map/Count.feature
index 7f708ee..1d98464 100644
--- a/gremlin-test/features/map/Count.feature
+++ b/gremlin-test/features/map/Count.feature
@@ -25,6 +25,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[6] |
 
   Scenario: g_V_out_count
@@ -35,6 +36,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[6] |
 
   Scenario: g_V_both_both_count
@@ -45,6 +47,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[30] |
 
   Scenario: g_V_fold_countXlocalX
@@ -55,6 +58,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[6] |
 
   Scenario: g_V_hasXnoX_count
@@ -65,6 +69,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[0] |
 
   Scenario: g_V_whereXinXkknowsX_outXcreatedX_count_is_0XX_name
@@ -75,6 +80,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | lop  |
       | ripple |
@@ -88,6 +94,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[2505037961767380] |
 
   Scenario: g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count
@@ -103,6 +110,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[24309134024] |
 
   Scenario: g_V_repeatXoutX_timesX3X_count
@@ -113,4 +121,5 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[14465066] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Max.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Max.feature b/gremlin-test/features/map/Max.feature
index c36177d..24cb81a 100644
--- a/gremlin-test/features/map/Max.feature
+++ b/gremlin-test/features/map/Max.feature
@@ -25,6 +25,7 @@ Feature: Step - max()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[35] |
 
   Scenario: g_V_repeatXbothX_timesX5X_age_max
@@ -35,6 +36,7 @@ Feature: Step - max()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[35] |
 
   Scenario: get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_maxX
@@ -45,4 +47,5 @@ Feature: Step - max()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"ripple":1.0,"lop":0.4}] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Min.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Min.feature b/gremlin-test/features/map/Min.feature
index 48ceeb9..172fbaf 100644
--- a/gremlin-test/features/map/Min.feature
+++ b/gremlin-test/features/map/Min.feature
@@ -25,6 +25,7 @@ Feature: Step - min()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[27] |
 
   Scenario: g_V_repeatXbothX_timesX5X_age_min
@@ -35,6 +36,7 @@ Feature: Step - min()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | d[27] |
 
   Scenario: get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_minX
@@ -45,4 +47,5 @@ Feature: Step - min()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"ripple":1.0,"lop":0.2}] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Path.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Path.feature b/gremlin-test/features/map/Path.feature
index 2126138..ea98a7a 100644
--- a/gremlin-test/features/map/Path.feature
+++ b/gremlin-test/features/map/Path.feature
@@ -26,6 +26,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],marko] |
 
   Scenario: g_VX1X_out_path_byXageX_byXnameX
@@ -37,6 +38,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[d[29],lop] |
       | p[d[29],vadas] |
       | p[d[29],josh] |
@@ -49,6 +51,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],josh,java] |
       | p[v[marko],josh,java] |
 
@@ -60,6 +63,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[marko,d[32],ripple] |
       | p[marko,d[32],lop] |
 
@@ -71,6 +75,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko]] |
 
   Scenario: g_VX1X_outEXcreatedX_inV_inE_outV_path
@@ -82,6 +87,7 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],e[marko-created->lop],v[lop],e[marko-created->lop],v[marko]] |
       | p[v[marko],e[marko-created->lop],v[lop],e[josh-created->lop],v[josh]] |
       | p[v[marko],e[marko-created->lop],v[lop],e[peter-created->lop],v[peter]] |
@@ -94,5 +100,6 @@ Feature: Step - count()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[josh,ripple] |
       | p[josh,lop] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Project.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Project.feature b/gremlin-test/features/map/Project.feature
index 3d8b9cc..8a781f2 100644
--- a/gremlin-test/features/map/Project.feature
+++ b/gremlin-test/features/map/Project.feature
@@ -28,6 +28,7 @@ Feature: Step - project()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a":3, "b":29}] |
       | m[{"a":0, "b":27}] |
       | m[{"a":2, "b":32}] |
@@ -47,6 +48,7 @@ Feature: Step - project()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | lop |
       | lop |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index 317dad8..538a734 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -26,6 +26,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": "v[marko]", "b": "v[vadas]"}] |
       | m[{"a": "v[marko]", "b": "v[josh]"}] |
 
@@ -39,6 +40,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": "marko", "b": "vadas"}] |
       | m[{"a": "marko", "b": "josh"}] |
 
@@ -51,6 +53,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[marko] |
 
@@ -64,6 +67,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | marko |
 
@@ -76,6 +80,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": "marko", "b": "lop"}] |
       | m[{"a": "marko", "b": "vadas"}] |
       | m[{"a": "marko", "b": "josh"}] |
@@ -92,6 +97,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": "marko", "b": "lop"}] |
       | m[{"a": "marko", "b": "vadas"}] |
       | m[{"a": "marko", "b": "josh"}] |
@@ -111,6 +117,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": "marko", "b": "marko"}] |
       | m[{"a": "vadas", "b": "vadas"}] |
       | m[{"a": "josh", "b": "josh"}] |
@@ -132,6 +139,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"a": 3, "b": "matthias"}] |
       | m[{"a": 4, "b": "marko"}] |
       | m[{"a": 5, "b": "stephen"}] |
@@ -145,6 +153,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_V_label_groupCount_asXxX_selectXxX
@@ -155,6 +164,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"software": 2, "person": 4}] |
 
   Scenario: g_V_hasLabelXpersonX_asXpX_mapXbothE_label_groupCountX_asXrX_selectXp_rX
@@ -167,6 +177,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"p": "v[marko]", "r": {"created": 1, "knows": 2}}] |
       | m[{"p": "v[vadas]", "r": {"knows": 1}}] |
       | m[{"p": "v[josh]", "r": {"created": 2, "knows": 1}}] |
@@ -185,6 +196,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |
@@ -201,6 +213,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[marko] |
       | v[marko] |
@@ -214,6 +227,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[josh] |
       | v[josh] |
 
@@ -228,6 +242,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | ripple |
       | lop |
 
@@ -242,6 +257,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-knows->vadas] |
 
   Scenario: g_VX1X_outEXknowsX_hasXweight_1X_asXhereX_inV_hasXname_joshX_selectXhereX
@@ -256,6 +272,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-knows->josh] |
 
   Scenario: g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_asXfakeX_inV_hasXname_joshX_selectXhereX
@@ -270,6 +287,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-knows->josh] |
 
   Scenario: g_V_asXhereXout_name_selectXhereX
@@ -282,6 +300,7 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[marko] |
       | v[marko] |
@@ -301,4 +320,5 @@ Feature: Step - select()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"ripple": 1, "lop": 6}] |
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/ValueMap.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/ValueMap.feature b/gremlin-test/features/map/ValueMap.feature
index 0a2220e..2390512 100644
--- a/gremlin-test/features/map/ValueMap.feature
+++ b/gremlin-test/features/map/ValueMap.feature
@@ -25,6 +25,7 @@ Feature: Step - valueMap()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"name": ["marko"], "age": [29]}] |
       | m[{"name": ["josh"], "age": [32]}] |
       | m[{"name": ["peter"], "age": [35]}] |
@@ -40,6 +41,7 @@ Feature: Step - valueMap()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"name": ["marko"], "age": [29]}] |
       | m[{"name": ["josh"], "age": [32]}] |
       | m[{"name": ["peter"], "age": [35]}] |
@@ -56,4 +58,5 @@ Feature: Step - valueMap()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | m[{"name": ["lop"], "lang": ["java"]}] |
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/map/Vertex.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Vertex.feature b/gremlin-test/features/map/Vertex.feature
index 9dff917..569fb6f 100644
--- a/gremlin-test/features/map/Vertex.feature
+++ b/gremlin-test/features/map/Vertex.feature
@@ -26,6 +26,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | lop |
@@ -39,6 +40,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | lop |
@@ -51,6 +53,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[vadas] |
       | v[lop] |
@@ -67,6 +70,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[lop] |
       | v[josh] |
@@ -80,6 +84,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_VX4X_both
@@ -91,6 +96,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[lop] |
       | v[ripple] |
@@ -103,6 +109,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-created->lop] |
       | e[marko-knows->josh] |
       | e[marko-knows->vadas] |
@@ -119,6 +126,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[josh-created->lop] |
 
   Scenario: g_EX11AsStringX
@@ -130,6 +138,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[josh-created->lop] |
 
   Scenario: g_VX1X_outE
@@ -141,6 +150,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-created->lop] |
       | e[marko-knows->josh] |
       | e[marko-knows->vadas] |
@@ -154,6 +164,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-knows->vadas] |
 
   Scenario: g_VX4X_bothEXcreatedX
@@ -165,6 +176,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[josh-created->lop] |
       | e[josh-created->ripple] |
 
@@ -177,6 +189,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[josh-created->lop] |
       | e[josh-created->ripple] |
       | e[marko-knows->josh] |
@@ -190,6 +203,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
       | v[lop] |
@@ -203,6 +217,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
 
   Scenario: g_V_outE_hasXweight_1X_outV
@@ -213,6 +228,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[josh] |
 
@@ -224,6 +240,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | marko |
       | marko |
@@ -244,6 +261,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | marko |
       | marko |
       | josh |
@@ -258,6 +276,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
       | v[lop] |
@@ -271,6 +290,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[marko] |
       | v[ripple] |
       | v[lop] |
@@ -284,6 +304,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[lop] |
 
   Scenario: g_VX2X_inE
@@ -295,6 +316,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | e[marko-knows->vadas] |
 
   Scenario: get_g_VX1X_outE_otherV
@@ -306,7 +328,8 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
-      | v[vadas] |                               
+      | result |
+      | v[vadas] |
       | v[josh] |
       | v[lop] |
 
@@ -319,6 +342,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
 
@@ -331,6 +355,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
 
@@ -343,6 +368,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
       | v[lop] |
@@ -356,6 +382,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
 
@@ -368,6 +395,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
       | v[lop] |
@@ -380,6 +408,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[ripple] |
       | v[lop] |
 
@@ -402,6 +431,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | vadas |
       | josh |
       | lop |
@@ -415,6 +445,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | v[vadas] |
       | v[josh] |
 
@@ -433,6 +464,7 @@ Feature: Step - V(), E(), out(), in(), both(), inE(), outE(), bothE()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | lop |
       | lop |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/sideEffect/Aggregate.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Aggregate.feature b/gremlin-test/features/sideEffect/Aggregate.feature
index 1a5634d..52454f4 100644
--- a/gremlin-test/features/sideEffect/Aggregate.feature
+++ b/gremlin-test/features/sideEffect/Aggregate.feature
@@ -25,6 +25,7 @@ Feature: Step - aggregate()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | marko |
       | josh |
       | peter |
@@ -40,6 +41,7 @@ Feature: Step - aggregate()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | marko |
       | josh |
       | peter |
@@ -55,6 +57,7 @@ Feature: Step - aggregate()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[v[marko],v[lop]] |
       | p[v[marko],v[vadas]] |
       | p[v[marko],v[josh]] |
@@ -70,6 +73,7 @@ Feature: Step - aggregate()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | d[29] |
       | d[27] |
       | d[32] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/sideEffect/GroupCount.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/GroupCount.feature b/gremlin-test/features/sideEffect/GroupCount.feature
index 35ac8d3..8803722 100644
--- a/gremlin-test/features/sideEffect/GroupCount.feature
+++ b/gremlin-test/features/sideEffect/GroupCount.feature
@@ -25,6 +25,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"ripple": 1, "lop": 3}] |
 
   Scenario: g_V_outXcreatedX_name_groupCount
@@ -35,6 +36,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"ripple": 1, "lop": 3}] |
 
   Scenario: g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX
@@ -48,6 +50,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"ripple": 1, "lop": 3}] |
 
   Scenario: g_V_outXcreatedX_name_groupCountXaX_capXaX
@@ -60,6 +63,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"ripple": 1, "lop": 3}] |
 
   Scenario: g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX
@@ -73,6 +77,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"ripple":2, "lop": 4, "josh": 1, "vadas": 1}] |
 
   Scenario: g_V_both_groupCountXaX_byXlabelX_asXbX_barrier_whereXselectXaX_selectXsoftwareX_isXgtX2XXX_selectXbX_name
@@ -90,6 +95,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | lop |
       | lop |
       | lop |
@@ -116,6 +122,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | d[12] |
 
   Scenario: g_V_hasXnoX_groupCount
@@ -126,6 +133,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{}] |
 
   Scenario: g_V_hasXnoX_groupCountXaX_capXaX
@@ -136,6 +144,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{}] |
 
   Scenario: g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX
@@ -147,6 +156,7 @@ Feature: Step - groupCount()
       """
     When iterated to list
     Then the result should be ordered
+      | result |
       | m[{"marko": 2, "java": 2}] |
 
   Scenario: g_V_outXcreatedX_groupCountXxX_capXxX

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/sideEffect/Inject.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Inject.feature b/gremlin-test/features/sideEffect/Inject.feature
index fcb5ff4..532dbe1 100644
--- a/gremlin-test/features/sideEffect/Inject.feature
+++ b/gremlin-test/features/sideEffect/Inject.feature
@@ -27,6 +27,7 @@ Feature: Step - inject()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | vadas |
       | lop   |
       | vadas |
@@ -43,6 +44,7 @@ Feature: Step - inject()
       """
     When iterated to list
     Then the result should be unordered
+      | result |
       | p[daniel,d[6]] |
       | p[v[marko],v[lop],lop,d[3]] |
       | p[v[marko],v[vadas],vadas,d[5]] |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33146446/gremlin-test/features/sideEffect/Store.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Store.feature b/gremlin-test/features/sideEffect/Store.feature
index ef66c5e..2cb7faf 100644
--- a/gremlin-test/features/sideEffect/Store.feature
+++ b/gremlin-test/features/sideEffect/Store.feature
@@ -25,6 +25,7 @@ Feature: Step - store()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | lop |
@@ -41,6 +42,7 @@ Feature: Step - store()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | marko |
       | vadas |
       | lop |
@@ -74,6 +76,7 @@ Feature: Step - store()
       """
     When iterated next
     Then the result should be unordered
+      | result |
       | d[1] |
       | d[1] |
       | d[0] |