Fix merging enumerable content and validate content (#2531)

This commit is contained in:
James Newton-King
2021-05-15 13:45:00 +12:00
committed by GitHub
parent 2b0f7a2492
commit e44ab3348f
2 changed files with 88 additions and 14 deletions
@@ -46,6 +46,18 @@ namespace Newtonsoft.Json.Tests.Linq
[TestFixture]
public class MergeTests : TestFixtureBase
{
[Test]
public void MergeInvalidObject()
{
var a = new JObject();
ExceptionAssert.Throws<ArgumentException>(
() => a.Merge(new Version()),
@"Could not determine JSON object type for type System.Version.
Parameter name: content",
@"Could not determine JSON object type for type System.Version. (Parameter 'content')");
}
[Test]
public void MergeArraySelf()
{
@@ -70,6 +82,38 @@ namespace Newtonsoft.Json.Tests.Linq
}, a);
}
[Test]
public void MergeArrayIntoArray_Replace()
{
var a = new JArray { "1", "2" };
a.Merge(new string[] { "3", "4" }, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
Assert.AreEqual(new JArray { "3", "4" }, a);
}
[Test]
public void MergeArrayIntoArray_Concat()
{
var a = new JArray { "1", "2" };
a.Merge(new string[] { "3", "4" }, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Concat });
Assert.AreEqual(new JArray { "1", "2", "3", "4" }, a);
}
[Test]
public void MergeArrayIntoArray_Union()
{
var a = new JArray { "1", "2" };
a.Merge(new string[] { "2", "3", "4" }, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Union });
Assert.AreEqual(new JArray { "1", "2", "3", "4" }, a);
}
[Test]
public void MergeArrayIntoArray_Merge()
{
var a = new JArray { "1", "2" };
a.Merge(new string[] { "2" }, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Merge });
Assert.AreEqual(new JArray { "2", "2" }, a);
}
[Test]
public void MergeNullString()
{