Skip to content
Open
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
50 changes: 50 additions & 0 deletions Src/Newtonsoft.Json.Tests/Issues/Issue2954.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
using System.Linq;
using Newtonsoft.Json.Linq;
#if DNXCORE50
using Xunit;
using Test = Xunit.FactAttribute;
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
using TestCase = Xunit.InlineDataAttribute;
#else
using NUnit.Framework;
#endif

namespace Newtonsoft.Json.Tests.Issues
{
public class Issue2954
{
private const string JsonToTest = "{\"arg\": 1, \"field\": null, \"fieldEnum\": null}";

[Test]
//https://github.com/JamesNK/Newtonsoft.Json/issues/2954
public void Test_Ignore_Null_Values()
{
var result = JsonConvert.DeserializeObject<A>(JsonToTest, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });

Assert.AreEqual(result.Field, 0);
Assert.AreEqual(result.FieldEnum, B.Option1);
}

[Test]
public void Test_Throw_JsonSerializationException()
{
ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<A>(JsonToTest));
}

class A
{
public A(int arg)
{
}

public int Field { get; set; }
public B FieldEnum { get; set; }
}

enum B
{
Option1,
Option2,
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,11 @@ private bool HasNoDefinedType(JsonContract? contract)
return null;
}

if (value == null && Serializer.NullValueHandling == NullValueHandling.Ignore)
{
return Activator.CreateInstance(targetType);
}

try
{
if (contract.IsConvertable)
Expand Down