Merge branch 'tp32' into tp33

Conflicts:
        
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


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

Branch: refs/heads/TINKERPOP-1777
Commit: 247e008c4ef12cc2c12b731e445ffe743523ee5e
Parents: b516a6a 8ef717f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:34:44 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:34:44 2018 -0500

----------------------------------------------------------------------
 .../Gherkin/GherkinTestRunner.cs                | 32 +++++---------------
 .../ModernGraphTypeInformation.cs               |  4 ++-
 gremlin-test/features/map/Match.feature         |  2 +-
 gremlin-test/features/map/Min.feature           |  3 +-
 gremlin-test/features/map/Order.feature         | 16 +++++-----
 gremlin-test/features/map/Select.feature        | 16 +++++-----
 gremlin-test/features/sideEffect/Sack.feature   |  2 +-
 .../features/sideEffect/SideEffectCap.feature   |  2 +-
 8 files changed, 32 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
      public class GherkinTestRunner
      {
-         private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios =
-             new Dictionary<string, IgnoreReason>
-             {
-                 { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
-                 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
-                 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_foo_injectX9999999999X_min", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-                 { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
-                 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
-             };
 -        private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios = new Dictionary<string, IgnoreReason> {
++        private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios = new Dictionary<string, IgnoreReason>
++        {
++            { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
++            { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
+             { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 -            { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 -            { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
++            { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },    // TINKERPOP-1859??
++            { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }  // TINKERPOP-1907
+         };
          
          private static class Keywords
          {

Reply via email to