Merge branch 'tp32'
Conflicts:
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c041d1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c041d1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c041d1b
Branch: refs/heads/master
Commit: 1c041d1bbc8452c1a6b6e2aa266c345cfcb94dd6
Parents: fa0a0ee 7e17d4f
Author: Jorge Bay Gondra <jorgebaygon...@gmail.com>
Authored: Tue Dec 5 14:06:04 2017 +0100
Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com>
Committed: Tue Dec 5 14:06:04 2017 +0100
----------------------------------------------------------------------
.../Structure/IO/GraphSON/DateDeserializer.cs | 43 --------------------
.../Structure/IO/GraphSON/DateSerializer.cs | 16 +++++---
.../Structure/IO/GraphSON/GraphSONReader.cs | 4 +-
.../Structure/IO/GraphSON/GraphSONWriter.cs | 2 +-
.../IO/GraphSON/GraphSONReaderTests.cs | 16 ++++----
.../IO/GraphSON/GraphSONWriterTests.cs | 6 +--
.../Structure/IO/GraphSON/TestUtils.cs | 8 ++--
7 files changed, 28 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
----------------------------------------------------------------------
diff --cc
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
index e958e06,cb70530..3a2e21f
---
a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
@@@ -92,23 -71,23 +92,23 @@@ namespace Gremlin.Net.UnitTest.Structur
customSerializerMock.Verify(m => m.Objectify(It.IsAny<JToken>(),
It.IsAny<GraphSONReader>()));
}
- [Fact]
- public void ShouldDeserializeDateToDateTimeOffset()
+ [Theory, MemberData(nameof(Versions))]
- public void ShouldDeserializeDateToDateTime(int version)
++ public void ShouldDeserializeDateToDateTimeOffset(int version)
{
var graphSon = "{\"@type\":\"g:Date\",\"@value\":1475583442552}";
- var reader = CreateStandardGraphSONReader();
+ var reader = CreateStandardGraphSONReader(version);
- DateTime readDateTime = reader.ToObject(JObject.Parse(graphSon));
+ DateTimeOffset deserializedValue =
reader.ToObject(JObject.Parse(graphSon));
- var expectedDateTime = TestUtils.FromJavaTime(1475583442552);
- Assert.Equal(expectedDateTime, readDateTime);
+ var expectedDateTimeOffset =
TestUtils.FromJavaTime(1475583442552);
+ Assert.Equal(expectedDateTimeOffset, deserializedValue);
}
- [Fact]
- public void ShouldDeserializeDictionary()
+ [Theory, MemberData(nameof(Versions))]
+ public void ShouldDeserializeDictionary(int version)
{
var serializedDict =
"{\"age\":[{\"@type\":\"g:Int32\",\"@value\":29}],\"name\":[\"marko\"]}";
- var reader = CreateStandardGraphSONReader();
+ var reader = CreateStandardGraphSONReader(version);
var jObject = JObject.Parse(serializedDict);
var deserializedDict = reader.ToObject(jObject);
@@@ -247,23 -210,23 +247,23 @@@
Assert.Equal("y", edge.OutV.Id);
}
- [Fact]
- public void ShouldDeserializeTimestampToDateTimeOffset()
+ [Theory, MemberData(nameof(Versions))]
- public void ShouldDeserializeTimestampToDateTime(int version)
++ public void ShouldDeserializeTimestampToDateTimeOffset(int version)
{
var graphSon =
"{\"@type\":\"g:Timestamp\",\"@value\":1475583442558}";
- var reader = CreateStandardGraphSONReader();
+ var reader = CreateStandardGraphSONReader(version);
- DateTime readDateTime = reader.ToObject(JObject.Parse(graphSon));
+ DateTimeOffset deserializedValue =
reader.ToObject(JObject.Parse(graphSon));
- var expectedDateTime = TestUtils.FromJavaTime(1475583442558);
- Assert.Equal(expectedDateTime, readDateTime);
+ var expectedDateTimeOffset =
TestUtils.FromJavaTime(1475583442558);
+ Assert.Equal(expectedDateTimeOffset, deserializedValue);
}
- [Fact]
- public void ShouldDeserializeGuid()
+ [Theory, MemberData(nameof(Versions))]
+ public void ShouldDeserializeGuid(int version)
{
var graphSon =
"{\"@type\":\"g:UUID\",\"@value\":\"41d2e28a-20a4-4ab0-b379-d810dede3786\"}";
- var reader = CreateStandardGraphSONReader();
+ var reader = CreateStandardGraphSONReader(version);
Guid readGuid = reader.ToObject(JObject.Parse(graphSon));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
----------------------------------------------------------------------
diff --cc
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
index ca38555,1f5e087..4b347fe
---
a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
@@@ -165,13 -144,13 +165,13 @@@ namespace Gremlin.Net.UnitTest.Structur
customSerializerMock.Verify(m => m.Dictify(It.Is<int>(v => v ==
12), It.IsAny<GraphSONWriter>()));
}
- [Fact]
- public void ShouldSerializeDateTimeOffset()
+ [Theory, MemberData(nameof(Versions))]
- public void ShouldSerializeDateTime(int version)
++ public void ShouldSerializeDateTimeOffset(int version)
{
- var writer = CreateStandardGraphSONWriter();
+ var writer = CreateGraphSONWriter(version);
- var dateTime = TestUtils.FromJavaTime(1475583442552);
+ var dateTimeOffset = TestUtils.FromJavaTime(1475583442552);
- var graphSon = writer.WriteObject(dateTime);
+ var graphSon = writer.WriteObject(dateTimeOffset);
const string expected =
"{\"@type\":\"g:Date\",\"@value\":1475583442552}";
Assert.Equal(expected, graphSon);
