TINKERPOP-1784 Introduced types for all numerics of the feature test
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/014d552f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/014d552f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/014d552f Branch: refs/heads/tp32 Commit: 014d552fac9174c0fc3b0d6c3174269f7386f25c Parents: 5286c20 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Nov 17 08:37:17 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Nov 21 15:53:14 2017 -0500 ---------------------------------------------------------------------- .../src/main/jython/radish/feature_steps.py | 2 +- gremlin-test/features/branch/Branch.feature | 24 ++++++++++---------- gremlin-test/features/branch/Local.feature | 22 +++++++++--------- gremlin-test/features/branch/Repeat.feature | 6 ++--- gremlin-test/features/branch/Union.feature | 22 +++++++++--------- gremlin-test/features/filter/Dedup.feature | 4 ++-- gremlin-test/features/filter/Is.feature | 10 ++++---- gremlin-test/features/filter/Tail.feature | 2 +- gremlin-test/features/map/Coalesce.feature | 2 +- gremlin-test/features/map/Constant.feature | 12 +++++----- gremlin-test/features/map/Count.feature | 16 ++++++------- gremlin-test/features/map/Fold.feature | 2 +- gremlin-test/features/map/Map.feature | 12 +++++----- gremlin-test/features/map/Match.feature | 12 +++++----- gremlin-test/features/map/Max.feature | 6 ++--- gremlin-test/features/map/Mean.feature | 4 ++-- gremlin-test/features/map/Min.feature | 6 ++--- gremlin-test/features/map/Order.feature | 12 +++++----- gremlin-test/features/map/Path.feature | 10 ++++---- gremlin-test/features/map/Project.feature | 8 +++---- gremlin-test/features/map/Properties.feature | 16 ++++++------- gremlin-test/features/map/Select.feature | 20 ++++++++-------- gremlin-test/features/map/Sum.feature | 4 ++-- .../features/sideEffect/Aggregate.feature | 8 +++---- gremlin-test/features/sideEffect/Group.feature | 18 +++++++-------- .../features/sideEffect/GroupCount.feature | 14 ++++++------ gremlin-test/features/sideEffect/Inject.feature | 8 +++---- gremlin-test/features/sideEffect/Sack.feature | 6 ++--- gremlin-test/features/sideEffect/Store.feature | 16 ++++++------- 29 files changed, 152 insertions(+), 152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/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 94b0c77..9f00535 100644 --- a/gremlin-python/src/main/jython/radish/feature_steps.py +++ b/gremlin-python/src/main/jython/radish/feature_steps.py @@ -136,7 +136,7 @@ def _convert(val, ctx): return list(map((lambda x: _convert(x, ctx)), val[2:-1].split(","))) elif isinstance(val, str) and re.match("^s\[.*\]$", val): # parse set return set(map((lambda x: _convert(x, ctx)), val[2:-1].split(","))) - elif isinstance(val, str) and re.match("^d\[.*\]$", val): # parse numeric + elif isinstance(val, str) and re.match("^d\[.*\][ilfd]$", val): # parse numeric return float(val[2:-1]) if val[2:-1].__contains__(".") else long(val[2:-1]) elif isinstance(val, str) and re.match("^v\[.*\]\.id$", val): # parse vertex id return ctx.lookup_v["modern"][val[2:-4]].id http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/branch/Branch.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/branch/Branch.feature b/gremlin-test/features/branch/Branch.feature index b8690c6..6ee261f 100644 --- a/gremlin-test/features/branch/Branch.feature +++ b/gremlin-test/features/branch/Branch.feature @@ -35,10 +35,10 @@ Feature: Step - branch() | java | | lop | | ripple | - | d[29] | - | d[27] | - | d[32] | - | d[35] | + | d[29].i | + | d[27].i | + | d[32].i | + | d[35].i | Scenario: g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX Given the modern graph @@ -57,10 +57,10 @@ Feature: Step - branch() | java | | lop | | ripple | - | d[29] | - | d[27] | - | d[32] | - | d[35] | + | d[29].i | + | d[27].i | + | d[32].i | + | d[35].i | Scenario: g_V_branchXlabel_isXpersonX_countX_optionX1__ageX_optionX0__langX_optionX0__nameX_optionXany__labelX Given the modern graph @@ -80,10 +80,10 @@ Feature: Step - branch() | java | | lop | | ripple | - | d[29] | - | d[27] | - | d[32] | - | d[35] | + | d[29].i | + | d[27].i | + | d[32].i | + | d[35].i | | person | | person | | person | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/branch/Local.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/branch/Local.feature b/gremlin-test/features/branch/Local.feature index fbc0dec..d6e809e 100644 --- a/gremlin-test/features/branch/Local.feature +++ b/gremlin-test/features/branch/Local.feature @@ -44,26 +44,26 @@ 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}] | - | m[{"a":"peter","b":3}] | + | m[{"a":"marko","b":"d[3].i"}] | + | m[{"a":"josh","b":"d[5].i"}] | + | m[{"a":"josh","b":"d[3].i"}] | + | m[{"a":"peter","b":"d[3].i}] | Scenario: g_V_localXoutE_countX Given the modern graph And the traversal of """ - g.V().local(__.outE().count()) + g.V().local(__.outE().count()) """ When iterated to list Then the result should be unordered | result | - | d[3] | - | d[0] | - | d[0] | - | d[2] | - | d[0] | - | d[1] | + | d[3].l | + | d[0].l | + | d[0].l | + | d[2].l | + | d[0].l | + | d[1].l | Scenario: g_VX1X_localXoutEXknowsX_limitX1XX_inV_name Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/branch/Repeat.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/branch/Repeat.feature b/gremlin-test/features/branch/Repeat.feature index 1a76452..89eb002 100644 --- a/gremlin-test/features/branch/Repeat.feature +++ b/gremlin-test/features/branch/Repeat.feature @@ -158,7 +158,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}] | + | m[{"ripple":"d[2].l","peter":"d[1].l","vadas":"d[2].l","josh":"d[2].l","lop":"d[4].l","marko":"d[1].l"}] | Scenario: g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_timesX3X_capXmX Given the modern graph @@ -184,7 +184,7 @@ Feature: Step - repeat() When iterated to list Then the result should be ordered | result | - | d[43958] | + | d[43958].l | Scenario: g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name Given the modern graph @@ -212,7 +212,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}] | + | m[{"ripple":"d[3].l,"vadas":"d[3].l","josh":"d[4].l","lop":"d[10].l","marko":"d[4].l"}] | Scenario: g_V_hasXname_markoX_repeatXoutE_inV_simplePathX_untilXhasXname_rippleXX_path_byXnameX_byXlabelX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/branch/Union.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/branch/Union.feature b/gremlin-test/features/branch/Union.feature index 6178092..30eb53c 100644 --- a/gremlin-test/features/branch/Union.feature +++ b/gremlin-test/features/branch/Union.feature @@ -88,7 +88,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}] | + | m[{"java":"d[4].l","ripple":"d[1].l","person":"d[4].l","vadas":"d[1].l","josh":"d[1].l","lop":"d[3].l"}] | Scenario: g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount Given the modern graph @@ -104,7 +104,7 @@ Feature: Step - union() When iterated to list Then the result should be unordered | result | - | m[{"software":12,"person":20}] | + | m[{"software":"d[12].l","person":"d[20].l"}] | Scenario: g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX Given the modern graph @@ -117,9 +117,9 @@ Feature: Step - union() When iterated to list Then the result should be unordered | result | - | d[3] | - | d[1.9] | - | d[1] | + | d[3].l | + | d[1.9].d | + | d[1].l | Scenario: get_g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX Given the modern graph @@ -132,9 +132,9 @@ Feature: Step - union() When iterated to list Then the result should be unordered | result | - | d[3] | - | d[0] | - | d[1.9] | - | d[0] | - | d[0] | - | d[1] | \ No newline at end of file + | d[3].l | + | d[0].l | + | d[1.9].d | + | d[0].i | + | d[0].l | + | d[1].l | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/filter/Dedup.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/filter/Dedup.feature b/gremlin-test/features/filter/Dedup.feature index 805497f..c502c96 100644 --- a/gremlin-test/features/filter/Dedup.feature +++ b/gremlin-test/features/filter/Dedup.feature @@ -206,7 +206,7 @@ Feature: Step - dedup() When iterated to list Then the result should be unordered | result | - | d[1] | + | d[1].l | Scenario: g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup Given the modern graph @@ -233,5 +233,5 @@ Feature: Step - dedup() When iterated to list Then the result should be unordered | result | - | d[0] | + | d[0].l | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/filter/Is.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/filter/Is.feature b/gremlin-test/features/filter/Is.feature index 5ed0485..4eec274 100644 --- a/gremlin-test/features/filter/Is.feature +++ b/gremlin-test/features/filter/Is.feature @@ -26,7 +26,7 @@ Feature: Step - coin() When iterated to list Then the result should be unordered | result | - | d[32] | + | d[32].i | Scenario: g_V_valuesXageX_isXlte_30X Given the modern graph @@ -37,8 +37,8 @@ Feature: Step - coin() When iterated to list Then the result should be unordered | result | - | d[27] | - | d[29] | + | d[27].i | + | d[29].i | Scenario: g_V_valuesXageX_isXgte_29X_isXlt_34X Given the modern graph @@ -49,8 +49,8 @@ Feature: Step - coin() When iterated to list Then the result should be unordered | result | - | d[29] | - | d[32] | + | d[29].i | + | d[32].i | Scenario: g_V_whereXinXcreatedX_count_isX1XX_valuesXnameX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/filter/Tail.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/filter/Tail.feature b/gremlin-test/features/filter/Tail.feature index 35083ef..b2daa2b 100644 --- a/gremlin-test/features/filter/Tail.feature +++ b/gremlin-test/features/filter/Tail.feature @@ -94,7 +94,7 @@ Feature: Step - tail() When iterated to list Then the result should be unordered | result | - | d[7] | + | d[7].l | Scenario: g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Coalesce.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Coalesce.feature b/gremlin-test/features/map/Coalesce.feature index f7786ff..8bdac15 100644 --- a/gremlin-test/features/map/Coalesce.feature +++ b/gremlin-test/features/map/Coalesce.feature @@ -60,7 +60,7 @@ Feature: Step - coalesce() When iterated to list Then the result should be unordered | result | - | m[{"ripple":1, "vadas":1, "josh":1, "lop":2}] | + | m[{"ripple":"d[1].l", "vadas":"d[1].l", "josh":"d[1].l", "lop":"d[2].l"}] | Scenario: g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Constant.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Constant.feature b/gremlin-test/features/map/Constant.feature index 9fb3dfb..9ad8d13 100644 --- a/gremlin-test/features/map/Constant.feature +++ b/gremlin-test/features/map/Constant.feature @@ -27,12 +27,12 @@ Feature: Step - constant() When iterated to list Then the result should be unordered | result | - | d[123] | - | d[123] | - | d[123] | - | d[123] | - | d[123] | - | d[123] | + | d[123].i | + | d[123].i | + | d[123].i | + | d[123].i | + | d[123].i | + | d[123].i | Scenario: g_V_chooseXhasLabelXpersonX_valuesXnameX_constantXinhumanXX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Count.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Count.feature b/gremlin-test/features/map/Count.feature index 1d98464..6e47ab7 100644 --- a/gremlin-test/features/map/Count.feature +++ b/gremlin-test/features/map/Count.feature @@ -26,7 +26,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[6] | + | d[6].l | Scenario: g_V_out_count Given the modern graph @@ -37,7 +37,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[6] | + | d[6].l | Scenario: g_V_both_both_count Given the modern graph @@ -48,7 +48,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[30] | + | d[30].l | Scenario: g_V_fold_countXlocalX Given the modern graph @@ -59,7 +59,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[6] | + | d[6].l | Scenario: g_V_hasXnoX_count Given the modern graph @@ -70,7 +70,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[0] | + | d[0].l | Scenario: g_V_whereXinXkknowsX_outXcreatedX_count_is_0XX_name Given the modern graph @@ -95,7 +95,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[2505037961767380] | + | d[2505037961767380].l | Scenario: g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count Given the grateful graph @@ -111,7 +111,7 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[24309134024] | + | d[24309134024].l | Scenario: g_V_repeatXoutX_timesX3X_count Given the grateful graph @@ -122,4 +122,4 @@ Feature: Step - count() When iterated to list Then the result should be ordered | result | - | d[14465066] | + | d[14465066].l | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Fold.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Fold.feature b/gremlin-test/features/map/Fold.feature index 1c71b27..83f4be4 100644 --- a/gremlin-test/features/map/Fold.feature +++ b/gremlin-test/features/map/Fold.feature @@ -53,5 +53,5 @@ Feature: Step - fold() When iterated to list Then the result should be unordered | result | - | d[123] | + | d[123].l | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Map.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Map.feature b/gremlin-test/features/map/Map.feature index 573b404..8d1029f 100644 --- a/gremlin-test/features/map/Map.feature +++ b/gremlin-test/features/map/Map.feature @@ -41,9 +41,9 @@ Feature: Step - map() When iterated to list Then the result should be unordered | result | - | d[7] | - | d[5] | - | d[5] | + | d[7].i | + | d[5].i | + | d[5].i | Scenario: g_VX1X_out_mapXnameX_mapXlengthX Given the modern graph @@ -57,9 +57,9 @@ Feature: Step - map() When iterated to list Then the result should be unordered | result | - | d[3] | - | d[5] | - | d[4] | + | d[3].i | + | d[5].i | + | d[4].i | Scenario: g_withPath_V_asXaX_out_mapXa_nameX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Match.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Match.feature b/gremlin-test/features/map/Match.feature index 59c56fd..c55a3825 100644 --- a/gremlin-test/features/map/Match.feature +++ b/gremlin-test/features/map/Match.feature @@ -58,12 +58,12 @@ Feature: Step - match() When iterated to list Then the result should be unordered | result | - | d[3] | - | d[2] | - | d[4] | - | d[5] | - | d[3] | - | d[3] | + | d[3].l | + | d[2].l | + | d[4].l | + | d[5].l | + | d[3].l | + | d[3].l | Scenario: g_V_matchXa_knows_b__b_created_cX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Max.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Max.feature b/gremlin-test/features/map/Max.feature index bb7e3d4..ad0a270 100644 --- a/gremlin-test/features/map/Max.feature +++ b/gremlin-test/features/map/Max.feature @@ -26,7 +26,7 @@ Feature: Step - max() When iterated to list Then the result should be unordered | result | - | d[35] | + | d[35].i | Scenario: g_V_repeatXbothX_timesX5X_age_max Given the modern graph @@ -37,7 +37,7 @@ Feature: Step - max() When iterated to list Then the result should be unordered | result | - | d[35] | + | d[35].i | Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_maxX Given the modern graph @@ -48,4 +48,4 @@ Feature: Step - max() When iterated to list Then the result should be unordered | result | - | m[{"ripple":1.0,"lop":0.4}] | + | m[{"ripple":"d[1.0].d","lop":"d[0.4].d"}] | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Mean.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Mean.feature b/gremlin-test/features/map/Mean.feature index 22fab7d..b716bde 100644 --- a/gremlin-test/features/map/Mean.feature +++ b/gremlin-test/features/map/Mean.feature @@ -26,7 +26,7 @@ Feature: Step - mean() When iterated to list Then the result should be unordered | result | - | d[30.75] | + | d[30.75].d | Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_meanX Given the modern graph @@ -37,4 +37,4 @@ Feature: Step - mean() When iterated to list Then the result should be unordered | result | - | m[{"ripple":1.0,"lop":0.3333333333333333}] | \ No newline at end of file + | m[{"ripple":"d[1.0]".d,"lop":"d[0.3333333333333333].d"}] | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Min.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Min.feature b/gremlin-test/features/map/Min.feature index c4b86c6..3cdb7e3 100644 --- a/gremlin-test/features/map/Min.feature +++ b/gremlin-test/features/map/Min.feature @@ -26,7 +26,7 @@ Feature: Step - min() When iterated to list Then the result should be unordered | result | - | d[27] | + | d[27].i | Scenario: g_V_repeatXbothX_timesX5X_age_min Given the modern graph @@ -37,7 +37,7 @@ Feature: Step - min() When iterated to list Then the result should be unordered | result | - | d[27] | + | d[27].i | Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_minX Given the modern graph @@ -48,4 +48,4 @@ Feature: Step - min() When iterated to list Then the result should be unordered | result | - | m[{"ripple":1.0,"lop":0.2}] | + | m[{"ripple":"d[1.0].d","lop":"d[0.2]d"}] | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Order.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature index 9005465..879bfd0 100644 --- a/gremlin-test/features/map/Order.feature +++ b/gremlin-test/features/map/Order.feature @@ -92,12 +92,12 @@ Feature: Step - order() When iterated to list Then the result should be ordered | result | - | d[1.0] | - | d[1.0] | - | d[0.5] | - | d[0.4] | - | d[0.4] | - | d[0.2] | + | d[1.0].d | + | d[1.0].d | + | d[0.5].d | + | d[0.4].d | + | d[0.4].d | + | d[0.2].d] | Scenario: g_V_order_byXname_a1_b1X_byXname_b2_a2X_name Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Path.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Path.feature b/gremlin-test/features/map/Path.feature index ea98a7a..b0cb9dd 100644 --- a/gremlin-test/features/map/Path.feature +++ b/gremlin-test/features/map/Path.feature @@ -39,9 +39,9 @@ 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] | + | p[d[29].i,lop] | + | p[d[29].i,vadas] | + | p[d[29].i,josh] | Scenario: g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX Given the modern graph @@ -64,8 +64,8 @@ Feature: Step - count() When iterated to list Then the result should be unordered | result | - | p[marko,d[32],ripple] | - | p[marko,d[32],lop] | + | p[marko,d[32].i,ripple] | + | p[marko,d[32].i,lop] | Scenario: g_V_asXaX_hasXname_markoX_asXbX_hasXage_29X_asXcX_path Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Project.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Project.feature b/gremlin-test/features/map/Project.feature index 8a781f2..cda2029 100644 --- a/gremlin-test/features/map/Project.feature +++ b/gremlin-test/features/map/Project.feature @@ -29,10 +29,10 @@ 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}] | - | m[{"a":1, "b":35}] | + | m[{"a":"d[3].l", "b":"d[29].i"}] | + | m[{"a":"d[0].l", "b":"d[27].i"}] | + | m[{"a":"d[2].l", "b":"d[32].i"}] | + | m[{"a":"d[1].l", "b":"d[35].i"}] | Scenario: g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Properties.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Properties.feature b/gremlin-test/features/map/Properties.feature index 35ccd77..88f8d70 100644 --- a/gremlin-test/features/map/Properties.feature +++ b/gremlin-test/features/map/Properties.feature @@ -27,13 +27,13 @@ Feature: Step - properties() Then the result should be unordered | result | | marko | - | d[29] | + | d[29].i | | vadas | - | d[27] | + | d[27].i | | josh | - | d[32] | + | d[32].i | | peter | - | d[35] | + | d[35.i] | Scenario: g_V_hasXageX_propertiesXage_nameX_value Given the modern graph @@ -45,13 +45,13 @@ Feature: Step - properties() Then the result should be unordered | result | | marko | - | d[29] | + | d[29].i | | vadas | - | d[27] | + | d[27].i | | josh | - | d[32] | + | d[32].i | | peter | - | d[35] | + | d[35].i | Scenario: g_V_hasXageX_properties_hasXid_nameIdX_value Given an unsupported test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Select.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature index 538a734..06f00d2 100644 --- a/gremlin-test/features/map/Select.feature +++ b/gremlin-test/features/map/Select.feature @@ -140,10 +140,10 @@ 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"}] | - | m[{"a": 5, "b": "daniel"}] | + | m[{"a":"d[3].i", "b": "matthias"}] | + | m[{"a":"d[4].i", "b": "marko"}] | + | m[{"a":"d[5].i", "b": "stephen"}] | + | m[{"a":"d[5].i", "b": "daniel"}] | Scenario: g_V_hasXname_isXmarkoXX_asXaX_selectXaX Given the modern graph @@ -165,7 +165,7 @@ Feature: Step - select() When iterated to list Then the result should be unordered | result | - | m[{"software": 2, "person": 4}] | + | m[{"software":"d[2].l", "person":"d[4].l"}] | Scenario: g_V_hasLabelXpersonX_asXpX_mapXbothE_label_groupCountX_asXrX_selectXp_rX Given the modern graph @@ -178,10 +178,10 @@ 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}}] | - | m[{"p": "v[peter]", "r": {"created": 1}}] | + | m[{"p": "v[marko]", "r": {"created": "d[1].l", "knows": "d[2].l"}}] | + | m[{"p": "v[vadas]", "r": {"knows": "d[1].l"}}] | + | m[{"p": "v[josh]", "r": {"created": "d[2].l", "knows": "d[1].l"}}] | + | m[{"p": "v[peter]", "r": {"created": "d[1].l"}}] | Scenario: g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX Given the modern graph @@ -321,4 +321,4 @@ 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 + | m[{"ripple":"d[1].l", "lop":"d[6].l"}] | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/map/Sum.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/map/Sum.feature b/gremlin-test/features/map/Sum.feature index 35571fa..2c89946 100644 --- a/gremlin-test/features/map/Sum.feature +++ b/gremlin-test/features/map/Sum.feature @@ -26,7 +26,7 @@ Feature: Step - sum() When iterated to list Then the result should be unordered | result | - | d[123] | + | d[123].l | Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX Given the modern graph @@ -37,4 +37,4 @@ Feature: Step - sum() When iterated to list Then the result should be unordered | result | - | m[{"ripple":1.0,"lop":1.0}] | \ No newline at end of file + | m[{"ripple":"d[1.0].d","lop":"d[1.0].d"}] | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/Aggregate.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Aggregate.feature b/gremlin-test/features/sideEffect/Aggregate.feature index 52454f4..2ab35ef 100644 --- a/gremlin-test/features/sideEffect/Aggregate.feature +++ b/gremlin-test/features/sideEffect/Aggregate.feature @@ -74,7 +74,7 @@ Feature: Step - aggregate() When iterated next Then the result should be unordered | result | - | d[29] | - | d[27] | - | d[32] | - | d[35] | \ No newline at end of file + | d[29].i | + | d[27].i | + | d[32].i | + | d[35].i | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/Group.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Group.feature b/gremlin-test/features/sideEffect/Group.feature index ac89e7d..3b9bb11 100644 --- a/gremlin-test/features/sideEffect/Group.feature +++ b/gremlin-test/features/sideEffect/Group.feature @@ -70,7 +70,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"java":2}] | + | m[{"java":"d[2].l"}] | Scenario: g_V_repeatXout_groupXaX_byXnameX_byXcountX_timesX2X_capXaX Given the modern graph @@ -81,7 +81,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"ripple":2, "vadas":1, "josh":1, "lop":4}] | + | m[{"ripple":"d[2].l", "vadas":"d[1].l", "josh":"d[1].l", "lop":"d[4].l"}] | Scenario: g_V_group_byXoutE_countX_byXnameX Given an unsupported test @@ -101,7 +101,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"software":0, "person":3.5}] | + | m[{"software":"d[0].i", "person":"d[3.5].d}] | Scenario: g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX Given the grateful graph @@ -112,7 +112,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"original":771317, "":160968, "cover":368579}] | + | m[{"original":"d[771317].l", "":"d[160968].l", "cover":"d[368579].l"}] | Scenario: g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX Given the grateful graph @@ -123,7 +123,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"original":771317, "":160968, "cover":368579}] | + | m[{"original":"d[771317].l", "":"d[160968].l", "cover":"d[368579].l"}] | Scenario: g_V_group_byXname_substring_1X_byXconstantX1XX Given the modern graph @@ -135,7 +135,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"p":1, "r":1, "v":1, "j":1, "l":1, "m":1}] | + | m[{"p":"d[1].i", "r":"d[1].i", "v":"d[1].i", "j":"d[1].i", "l":"d[1].i", "m":"d[1].i"}] | Scenario: g_V_groupXaX_byXname_substring_1X_byXconstantX1XX_capXaX Given the modern graph @@ -147,7 +147,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"p":1, "r":1, "v":1, "j":1, "l":1, "m":1}] | + | m[{"p":"d[1].i", "r":"d[1].i", "v":"d[1].i", "j":"d[1].i", "l":"d[1].i", "m":"d[1].i"}] | Scenario: g_V_out_group_byXlabelX_selectXpersonX_unfold_outXcreatedX_name_limitX2X Given the modern graph @@ -207,7 +207,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"cover":{"followedBy":777982, "sungBy":0, "writtenBy":0}, "":{"followedBy":179350}, "original":{"followedBy":2185613, "sungBy":0, "writtenBy":0}}] | + | m[{"cover":{"followedBy":"d[777982].l", "sungBy":"d[0].l", "writtenBy":"d[0].l"}, "":{"followedBy":"d[179350].l"}, "original":{"followedBy":"d[2185613].l", "sungBy":"d[0].l", "writtenBy":"d[0].l"}}] | Scenario: g_V_groupXmX_byXnameX_byXinXknowsX_nameX_capXmX Given the modern graph @@ -229,7 +229,7 @@ Feature: Step - group() When iterated to list Then the result should be unordered | result | - | m[{"software":2.0, "person":5.0}] | + | m[{"software":"d[2.0].d", "person":"d[5.0].d"}] | Scenario: g_withSideEffectXa__marko_666_noone_blahX_V_groupXaX_byXnameX_byXoutE_label_foldX_capXaX Given the modern graph http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/GroupCount.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/GroupCount.feature b/gremlin-test/features/sideEffect/GroupCount.feature index 8803722..c5422a2 100644 --- a/gremlin-test/features/sideEffect/GroupCount.feature +++ b/gremlin-test/features/sideEffect/GroupCount.feature @@ -26,7 +26,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"ripple": 1, "lop": 3}] | + | m[{"ripple":"d[1].l", "lop":"d[3].l"}] | Scenario: g_V_outXcreatedX_name_groupCount Given the modern graph @@ -37,7 +37,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"ripple": 1, "lop": 3}] | + | m[{"ripple":"d[1].l", "lop":"d[3].l"}] | Scenario: g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX Given the modern graph @@ -51,7 +51,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"ripple": 1, "lop": 3}] | + | m[{"ripple":"d[1].l", "lop":"d[3].l"}] | Scenario: g_V_outXcreatedX_name_groupCountXaX_capXaX Given the modern graph @@ -64,7 +64,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"ripple": 1, "lop": 3}] | + | m[{"ripple":"d[1].l", "lop":"d[3].l"}] | Scenario: g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX Given the modern graph @@ -78,7 +78,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"ripple":2, "lop": 4, "josh": 1, "vadas": 1}] | + | m[{"ripple":"d[2].l", "lop":"d[4].l", "josh":"d[1].l", "vadas":"d[1].l"}] | Scenario: g_V_both_groupCountXaX_byXlabelX_asXbX_barrier_whereXselectXaX_selectXsoftwareX_isXgtX2XXX_selectXbX_name Given the modern graph @@ -123,7 +123,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | d[12] | + | d[12].l | Scenario: g_V_hasXnoX_groupCount Given the modern graph @@ -157,7 +157,7 @@ Feature: Step - groupCount() When iterated to list Then the result should be ordered | result | - | m[{"marko": 2, "java": 2}] | + | m[{"marko":"d[2].l", "java":"d[2].l"}] | Scenario: g_V_outXcreatedX_groupCountXxX_capXxX Given an unsupported test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/Inject.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Inject.feature b/gremlin-test/features/sideEffect/Inject.feature index 532dbe1..61ffb58 100644 --- a/gremlin-test/features/sideEffect/Inject.feature +++ b/gremlin-test/features/sideEffect/Inject.feature @@ -45,7 +45,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]] | - | p[v[marko],v[josh],josh,d[4]] | + | p[daniel,d[6].i] | + | p[v[marko],v[lop],lop,d[3].i] | + | p[v[marko],v[vadas],vadas,d[5].i] | + | p[v[marko],v[josh],josh,d[4].i] | http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/Sack.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Sack.feature b/gremlin-test/features/sideEffect/Sack.feature index b0d4cc0..487f31b 100644 --- a/gremlin-test/features/sideEffect/Sack.feature +++ b/gremlin-test/features/sideEffect/Sack.feature @@ -42,7 +42,7 @@ Feature: Step - sack() When iterated to list Then the result should be unordered | result | - | d[3.5] | + | d[3.5].d | Scenario: g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack Given the modern graph @@ -53,8 +53,8 @@ Feature: Step - sack() When iterated to list Then the result should be unordered | result | - | d[2.0] | - | d[1.4] | + | d[2.0].d | + | d[1.4].d | Scenario: g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum Given an unsupported test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/014d552f/gremlin-test/features/sideEffect/Store.feature ---------------------------------------------------------------------- diff --git a/gremlin-test/features/sideEffect/Store.feature b/gremlin-test/features/sideEffect/Store.feature index 2cb7faf..aa58621 100644 --- a/gremlin-test/features/sideEffect/Store.feature +++ b/gremlin-test/features/sideEffect/Store.feature @@ -77,11 +77,11 @@ Feature: Step - store() When iterated next Then the result should be unordered | result | - | d[1] | - | d[1] | - | d[0] | - | d[0] | - | d[0] | - | d[2] | - | d[1.0] | - | d[1.0] | \ No newline at end of file + | d[1].l | + | d[1].l | + | d[0].l | + | d[0].l | + | d[0].l | + | d[2].l | + | d[1.0].d | + | d[1.0].d | \ No newline at end of file