Merge branch 'issue/1429' of https://github.com/paulirwin/Newtonsoft.Json into paulirwin-issue/1429

This commit is contained in:
James Newton-King
2017-11-08 14:52:07 +13:00
5 changed files with 161 additions and 13 deletions
@@ -40,6 +40,20 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class NullValueHandlingTests : TestFixtureBase
{
private const string MovieNullValueHandlingIncludeExpectedResult = @"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys"",
""Classification"": null,
""Studio"": null,
""ReleaseDate"": null,
""ReleaseCountries"": null
}";
private const string MovieNullValueHandlingIgnoreExpectedResult = @"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys""
}";
#if !NET20
[Test]
public void DeserializeNullIntoDateTime()
@@ -110,19 +124,55 @@ namespace Newtonsoft.Json.Tests.Serialization
// "Description": "It's no Bad Boys"
// }
StringAssert.AreEqual(@"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys"",
""Classification"": null,
""Studio"": null,
""ReleaseDate"": null,
""ReleaseCountries"": null
}", included);
StringAssert.AreEqual(MovieNullValueHandlingIncludeExpectedResult, included);
StringAssert.AreEqual(@"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys""
}", ignored);
StringAssert.AreEqual(MovieNullValueHandlingIgnoreExpectedResult, ignored);
}
[Test]
public void JsonObjectNullValueHandlingIgnore()
{
var movie = new MovieWithJsonObjectNullValueHandlingIgnore
{
Name = "Bad Boys III",
Description = "It's no Bad Boys"
};
string ignored = JsonConvert.SerializeObject(movie,
Formatting.Indented,
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Include });
// {
// "Name": "Bad Boys III",
// "Description": "It's no Bad Boys"
// }
StringAssert.AreEqual(MovieNullValueHandlingIgnoreExpectedResult, ignored);
}
[Test]
public void JsonObjectNullValueHandlingInclude()
{
var movie = new MovieWithJsonObjectNullValueHandlingInclude
{
Name = "Bad Boys III",
Description = "It's no Bad Boys"
};
string included = JsonConvert.SerializeObject(movie,
Formatting.Indented,
new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
// {
// "Name": "Bad Boys III",
// "Description": "It's no Bad Boys",
// "Classification": null,
// "Studio": null,
// "ReleaseDate": null,
// "ReleaseCountries": null
// }
StringAssert.AreEqual(MovieNullValueHandlingIncludeExpectedResult, included);
}
}
}