Merge branch 'tp32' into tp33

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

Branch: refs/heads/TRAVIS-TEST
Commit: 53c84bdb49386e16ca6d955941be101a0fd8e1d1
Parents: 99b6da2 bbb1377
Author: Florian Hockmann <f...@florian-hockmann.de>
Authored: Sun Mar 11 16:16:17 2018 +0100
Committer: Florian Hockmann <f...@florian-hockmann.de>
Committed: Sun Mar 11 16:16:17 2018 +0100

----------------------------------------------------------------------
 .../Gherkin/GherkinTestRunner.cs                | 37 +++++++++++++++-----
 .../Gherkin/IgnoreException.cs                  | 20 +++++++----
 2 files changed, 42 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index eb0a7e1,4a1d646..08693b2
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,14 -37,33 +37,35 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
      public class GherkinTestRunner
      {
-         private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios = new Dictionary<string, IgnoreReason>
-         {
-             { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
-             { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
-             { 
"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
-         };
+         private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios =
+             new Dictionary<string, IgnoreReason>
+             {
++                { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
++                { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+                 {
+                     
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+                     IgnoreReason.NumericalValuesHaveWrongTypes
+                 },
+                 {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
+                 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+                 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+                 {
+                     
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name",
+                     IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+                 },
+                 {
+                     
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX",
+                     IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+                 },
+                 {
+                     
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+                     IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+                 },
+                 {
+                     
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+                     IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+                 }
+             };
          
          private static class Keywords
          {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 7733f34,c8cb29a..337a6c9
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -41,13 -41,17 +41,20 @@@ namespace Gremlin.Net.IntegrationTest.G
              switch (reason)
              {
                  case IgnoreReason.LambdaNotSupported:
-                     reasonSuffix = " because lambdas are not supported in 
Gremlin.NET";
+                     reasonSuffix = " because lambdas are not supported in 
Gremlin.NET (TINKERPOP-1854)";
                      break;
 +                case IgnoreReason.TraversalTDeserializationNotSupported:
 +                    reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +                    break;
-                 case IgnoreReason.NeedsFurtherInvestigation:
-                     reasonSuffix = " as further investigation is required";
+                 case IgnoreReason.PNotCreatedCorrectlyByGherkinRunner:
+                     reasonSuffix =
+                         " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
+                     break;
+                 case IgnoreReason.NumericalValuesHaveWrongTypes:
+                     reasonSuffix = " because the asserts currently fail due 
to type mismatches (TINKERPOP-1918)";
+                     break;
+                 case IgnoreReason.PWithinWrapsArgumentsInArray:
+                     reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
                      break;
              }
              return $"Scenario ignored" + reasonSuffix;
@@@ -56,19 -60,9 +63,18 @@@
      
      public enum IgnoreReason
      {
 +        /// <summary>
 +        /// Lambdas are not supported on Gremlin.NET yet.
 +        /// </summary>
          LambdaNotSupported,
 +
 +        /// <summary>
 +        /// Deserialization of g:T on GraphSON3 is not supported.
 +        /// </summary>
 +        TraversalTDeserializationNotSupported,
 +
-         /// <summary>
-         /// Problem not yet classified and needs additional review.
-         /// </summary>
-         NeedsFurtherInvestigation
+         PNotCreatedCorrectlyByGherkinRunner,
+         NumericalValuesHaveWrongTypes,
+         PWithinWrapsArgumentsInArray
      }
  }

Reply via email to