-Fixed merging null string values

This commit is contained in:
James Newton-King
2017-12-04 18:53:50 +13:00
parent 977884d779
commit d0d01f2a36
2 changed files with 26 additions and 1 deletions
@@ -46,6 +46,16 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture]
public class MergeTests : TestFixtureBase
{
[Test]
public void MergeNullString()
{
var a = new JObject { ["a"] = 1 };
var b = new JObject { ["a"] = false ? "2" : null };
a.Merge(b);
Assert.AreEqual(1, (int)a["a"]);
}
[Test]
public void MergeObjectProperty()
{