Merge branch 'tp32' into tp33 Conflicts: gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/94484e27 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/94484e27 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/94484e27 Branch: refs/heads/tp33 Commit: 94484e278481e0bb7add3400981993118d127fbe Parents: 764e888 8c87fcf Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Mar 19 10:55:23 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Mar 19 10:55:23 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + gremlin-dotnet/glv/P.template | 17 ++++++++++++++- .../src/Gremlin.Net/Process/Traversal/P.cs | 22 ++++++++++++++++++-- .../Gherkin/GherkinTestRunner.cs | 4 +--- .../Gherkin/IgnoreException.cs | 10 +++------ 5 files changed, 41 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs index 2dac7c4,6d38ccc..02bf546 --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs @@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G public class GherkinTestRunner { private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = - new Dictionary<string, IgnoreReason>(); + new Dictionary<string, IgnoreReason> + { + { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866 + { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866 - { "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866 - {"g_V_hasIdXwithinXemptyXX_count", IgnoreReason.PWithinWrapsArgumentsInArray}, - {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.PWithinWrapsArgumentsInArray} ++ { "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866 + }; private static class Keywords { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs index 9bcb860,860c11d..9eb3021 --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs @@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G string reasonSuffix = null; switch (reason) { + case IgnoreReason.TraversalTDeserializationNotSupported: + reasonSuffix = " as deserialization of g:T on GraphSON3 is not supported"; + break; - case IgnoreReason.PWithinWrapsArgumentsInArray: - reasonSuffix = " because P.Within() arguments are incorrectly wrapped in an array (TINKERPOP-1920)"; - break; - case IgnoreReason.PNotDeserializationProblem: - reasonSuffix = " because P.Not() cannot be deserialized by Gremlin Server (TINKERPOP-1922)"; + case IgnoreReason.NoReason: + reasonSuffix = ""; break; } return $"Scenario ignored" + reasonSuffix; @@@ -56,11 -50,6 +53,10 @@@ public enum IgnoreReason { + /// <summary> + /// Deserialization of g:T on GraphSON3 is not supported. + /// </summary> + TraversalTDeserializationNotSupported, - PWithinWrapsArgumentsInArray, - PNotDeserializationProblem + NoReason } }