Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions JsonSubTypes.Tests/DatesTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using Newtonsoft.Json;
using NUnit.Framework;

namespace JsonSubTypes.Tests
{
[TestFixture]
public class DatesTest
{
[JsonConverter(typeof(JsonSubtypes), nameof(SubTypeClass.Discriminator))]
[JsonSubtypes.KnownSubType(typeof(SubTypeClass), "SubTypeClass")]
public abstract class MainClass
{
}

public class SubTypeClass : MainClass
{
public string Discriminator => "SubTypeClass";

public DateTimeOffset? Date { get; set; }
}

[Test]
public void DeserializingSubTypeWithDateParsesCorrectly()
{
var json = "{ \"Discriminator\": \"SubTypeClass\", \"Date\": \"2020-06-28T00:00:00.00000+00:00\" }";

var obj = JsonConvert.DeserializeObject<MainClass>(json);

Assert.That(obj, Is.Not.Null);
Assert.That(obj, Is.InstanceOf<SubTypeClass>());
Assert.That(((SubTypeClass)obj).Date.HasValue, Is.True);
Assert.That(((SubTypeClass)obj).Date.Value.Offset, Is.EqualTo(TimeSpan.Zero));
}
}
}
5 changes: 5 additions & 0 deletions JsonSubTypes/JsonSubtypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ private static Type GetElementType(Type arrayOrGenericContainer)

private object ReadObject(JsonReader reader, Type objectType, JsonSerializer serializer)
{
// I would prefer to create a new reader, but can't work out how to
// This seems a reasonable alternative - https://github.com/JamesNK/Newtonsoft.Json/issues/1605#issuecomment-602673364
var savedDateParseSettings = reader.DateParseHandling;
reader.DateParseHandling = DateParseHandling.None;
var jObject = JObject.Load(reader);
reader.DateParseHandling = savedDateParseSettings;

var targetType = GetType(jObject, objectType, serializer) ?? objectType;

Expand Down