Clean up merge changes
This commit is contained in:
@@ -47,11 +47,27 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
public class MergeTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void MergeSelf()
|
||||
public void MergeArraySelf()
|
||||
{
|
||||
var a = new JArray { "1", "2" };
|
||||
a.Merge(a, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
|
||||
Assert.AreEqual(a, new JArray { "1", "2" });
|
||||
Assert.AreEqual(new JArray { "1", "2" }, a);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void MergeObjectSelf()
|
||||
{
|
||||
var a = new JObject
|
||||
{
|
||||
["1"] = 1,
|
||||
["2"] = 2
|
||||
};
|
||||
a.Merge(a, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
|
||||
Assert.AreEqual(new JObject
|
||||
{
|
||||
["1"] = 1,
|
||||
["2"] = 2
|
||||
}, a);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -1165,7 +1165,9 @@ namespace Newtonsoft.Json.Linq
|
||||
break;
|
||||
case MergeArrayHandling.Replace:
|
||||
if (target == content)
|
||||
{
|
||||
break;
|
||||
}
|
||||
target.ClearItems();
|
||||
foreach (JToken item in content)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user