Merge branch 'TINKERPOP-1827' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e60a290 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e60a290 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e60a290 Branch: refs/heads/master Commit: 6e60a290615aad406cf0a08049044f26b379dbac Parents: b3adadc 2e5d893 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Tue Dec 5 14:21:18 2017 +0100 Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com> Committed: Tue Dec 5 14:21:18 2017 +0100 ---------------------------------------------------------------------- .../Process/Traversal/DefaultTraversal.cs | 5 + .../Gremlin.Net/Process/Traversal/ITraversal.cs | 11 +- .../Process/Traversal/Instruction.cs | 2 +- .../Structure/IO/GraphSON/DecimalConverter.cs | 35 ++ .../Structure/IO/GraphSON/GraphSONReader.cs | 21 +- .../Structure/IO/GraphSON/GraphSONWriter.cs | 1 + .../Structure/IO/GraphSON/NumberConverter.cs | 9 +- .../Gherkin/Attributes/BddAttribute.cs | 37 ++ .../Gherkin/Attributes/GivenAttribute.cs | 33 ++ .../Gherkin/Attributes/ThenAttribute.cs | 33 ++ .../Gherkin/Attributes/WhenAttribute.cs | 33 ++ .../Gherkin/CommonSteps.cs | 321 +++++++++++++ .../Gherkin/GherkinTestRunner.cs | 381 +++++++++++++++ .../Gherkin/IgnoreException.cs | 55 +++ .../Gherkin/ScenarioData.cs | 168 +++++++ .../Gherkin/StepDefinition.cs | 39 ++ .../ContextBasedParameter.cs | 83 ++++ .../TraversalEvaluation/ITokenParameter.cs | 46 ++ .../TraversalEvaluation/LiteralParameter.cs | 87 ++++ .../ModernGraphTypeInformation.cs | 89 ++++ .../StaticTraversalParameter.cs | 77 +++ .../TraversalEvaluation/StringParameter.cs | 85 ++++ .../Gherkin/TraversalEvaluation/Token.cs | 92 ++++ .../TraversalEnumParameter.cs | 103 ++++ .../TraversalEvaluationTests.cs | 114 +++++ .../TraversalEvaluation/TraversalParser.cs | 474 +++++++++++++++++++ .../TraversalPredicateParameter.cs | 93 ++++ .../Gremlin.Net.IntegrationTest.csproj | 12 +- .../GraphTraversalTests.cs | 17 - .../RemoteConnectionFactory.cs | 18 +- .../IO/GraphSON/GraphSONReaderTests.cs | 24 + .../IO/GraphSON/GraphSONWriterTests.cs | 10 + gremlin-test/features/map/Match.feature | 12 +- gremlin-test/features/sideEffect/Group.feature | 2 +- 34 files changed, 2578 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e60a290/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e60a290/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs index 4d99864,ab7e7d0..a60a558 --- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs @@@ -49,8 -49,9 +49,9 @@@ namespace Gremlin.Net.Structure.IO.Grap {typeof(long), new Int64Converter()}, {typeof(float), new FloatConverter()}, {typeof(double), new DoubleConverter()}, + {typeof(decimal), new DecimalConverter()}, {typeof(Guid), new UuidSerializer()}, - {typeof(DateTime), new DateSerializer()}, + {typeof(DateTimeOffset), new DateSerializer()}, {typeof(Type), new ClassSerializer()}, {typeof(Enum), new EnumSerializer()}, {typeof(TraversalPredicate), new TraversalPredicateSerializer()}, http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e60a290/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e60a290/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs ----------------------------------------------------------------------
