Added the deserialize fix and test for the UTC DateTime

aaubry · May 25, 2021 · 5653d3c · 5653d3c
1 parent 9def445
commit 5653d3c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/YamlDotNet.Test/Serialization/DeserializerTest.cs b/YamlDotNet.Test/Serialization/DeserializerTest.cs
@@ -19,6 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+using System;
 using System.Collections.Generic;
 using FluentAssertions;
 using Xunit;
@@ -34,6 +35,7 @@ public void Deserialize_YamlWithInterfaceTypeAndMapping_ReturnsModel()
         {
             var yaml = @"
 name: Jack
+momentOfBirth: 1983-04-21T20:21:03.0041599Z
 cars:
 - name: Mercedes
   year: 2018
@@ -48,6 +50,13 @@ public void Deserialize_YamlWithInterfaceTypeAndMapping_ReturnsModel()
 
             var person = sut.Deserialize<Person>(yaml);
             person.Name.Should().Be("Jack");
+            person.MomentOfBirth.Kind.Should().Be(DateTimeKind.Utc);
+            person.MomentOfBirth.ToUniversalTime().Year.Should().Be(1983);
+            person.MomentOfBirth.ToUniversalTime().Month.Should().Be(4);
+            person.MomentOfBirth.ToUniversalTime().Day.Should().Be(21);
+            person.MomentOfBirth.ToUniversalTime().Hour.Should().Be(20);
+            person.MomentOfBirth.ToUniversalTime().Minute.Should().Be(21);
+            person.MomentOfBirth.ToUniversalTime().Second.Should().Be(3);
             person.Cars.Should().HaveCount(2);
             person.Cars[0].Name.Should().Be("Mercedes");
             person.Cars[0].Spec.Should().BeNull();
@@ -60,6 +69,7 @@ public void Deserialize_YamlWithTwoInterfaceTypesAndMappings_ReturnsModel()
         {
             var yaml = @"
 name: Jack
+momentOfBirth: 1983-04-21T20:21:03.0041599Z
 cars:
 - name: Mercedes
   year: 2018
@@ -81,6 +91,13 @@ public void Deserialize_YamlWithTwoInterfaceTypesAndMappings_ReturnsModel()
 
             var person = sut.Deserialize<Person>(yaml);
             person.Name.Should().Be("Jack");
+            person.MomentOfBirth.Kind.Should().Be(DateTimeKind.Utc);
+            person.MomentOfBirth.ToUniversalTime().Year.Should().Be(1983);
+            person.MomentOfBirth.ToUniversalTime().Month.Should().Be(4);
+            person.MomentOfBirth.ToUniversalTime().Day.Should().Be(21);
+            person.MomentOfBirth.ToUniversalTime().Hour.Should().Be(20);
+            person.MomentOfBirth.ToUniversalTime().Minute.Should().Be(21);
+            person.MomentOfBirth.ToUniversalTime().Second.Should().Be(3);
             person.Cars.Should().HaveCount(2);
             person.Cars[0].Name.Should().Be("Mercedes");
             person.Cars[0].Spec.EngineType.Should().Be("V6");
@@ -94,6 +111,8 @@ public class Person
         {
             public string Name { get; private set; }
 
+            public DateTime MomentOfBirth { get; private set; }
+
             public IList<ICar> Cars { get; private set; }
         }
 

diff --git a/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs b/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs
@@ -91,7 +91,10 @@ bool INodeDeserializer.Deserialize(IParser parser, Type expectedType, Func<IPars
 
                 case TypeCode.DateTime:
                     // TODO: This is probably incorrect. Use the correct regular expression.
-                    value = DateTime.Parse(scalar.Value, CultureInfo.InvariantCulture);
+                    var style = scalar.Value.EndsWith("Z")
+                        ? DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal
+                        : scalar.Value.Length > 27 ? DateTimeStyles.AssumeLocal : DateTimeStyles.None;
+                    value = DateTime.Parse(scalar.Value, CultureInfo.InvariantCulture, style);
                     break;
 
                 default: