Add JObject.Property overload with a StringComparison and JsonMergeSettings.PropertyNameComparison (#1843)
This commit is contained in:
@@ -2063,5 +2063,28 @@ Parameter name: arrayIndex");
|
||||
Assert.AreEqual(1, (int)(JToken)value);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void Property()
|
||||
{
|
||||
JObject a = new JObject();
|
||||
a["Name"] = "Name!";
|
||||
a["name"] = "name!";
|
||||
a["title"] = "Title!";
|
||||
|
||||
Assert.AreEqual(null, a.Property("NAME", StringComparison.Ordinal));
|
||||
Assert.AreEqual(null, a.Property("NAME"));
|
||||
Assert.AreEqual(null, a.Property("TITLE"));
|
||||
Assert.AreEqual(null, a.Property(null, StringComparison.Ordinal));
|
||||
Assert.AreEqual(null, a.Property(null, StringComparison.OrdinalIgnoreCase));
|
||||
Assert.AreEqual(null, a.Property(null));
|
||||
|
||||
// Return first match when ignoring case
|
||||
Assert.AreEqual("Name", a.Property("NAME", StringComparison.OrdinalIgnoreCase).Name);
|
||||
// Return exact match before ignoring case
|
||||
Assert.AreEqual("name", a.Property("name", StringComparison.OrdinalIgnoreCase).Name);
|
||||
// Return exact match without ignoring case
|
||||
Assert.AreEqual("name", a.Property("name", StringComparison.Ordinal).Name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -666,5 +666,40 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
|
||||
StringAssert.AreEqual(newJson, newFoo.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Merge_IgnorePropertyCase()
|
||||
{
|
||||
JObject o1 = JObject.Parse(@"{
|
||||
'Id': '1',
|
||||
'Words': [ 'User' ]
|
||||
}");
|
||||
JObject o2 = JObject.Parse(@"{
|
||||
'Id': '1',
|
||||
'words': [ 'Name' ]
|
||||
}");
|
||||
|
||||
o1.Merge(o2, new JsonMergeSettings
|
||||
{
|
||||
MergeArrayHandling = MergeArrayHandling.Concat,
|
||||
MergeNullValueHandling = MergeNullValueHandling.Merge,
|
||||
PropertyNameComparison = StringComparison.OrdinalIgnoreCase
|
||||
});
|
||||
|
||||
Assert.IsNull(o1["words"]);
|
||||
Assert.IsNotNull(o1["Words"]);
|
||||
|
||||
JArray words = (JArray)o1["Words"];
|
||||
Assert.AreEqual("User", (string)words[0]);
|
||||
Assert.AreEqual("Name", (string)words[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void MergeSettingsComparisonDefault()
|
||||
{
|
||||
JsonMergeSettings settings = new JsonMergeSettings();
|
||||
|
||||
Assert.AreEqual(StringComparison.Ordinal, settings.PropertyNameComparison);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user