-Added support for serializing const fields

-Fixed tests
This commit is contained in:
James Newton-King
2015-01-11 16:54:10 +13:00
parent 9a4f96aa8f
commit 6c1e1bfcba
10 changed files with 90 additions and 20 deletions
@@ -723,5 +723,26 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(1, (int)c.ExtensionData0["first"]);
Assert.AreEqual(2, (int)c.ExtensionData0["second"]);
}
public class Test
{
[JsonProperty("LastActivityDate")]
public DateTime? LastActivityDate { get; set; }
[JsonExtensionData]
public Dictionary<string, object> CustomFields { get; set; }
}
[Test]
public void DeserializeNullableProperty()
{
string json = @"{ ""LastActivityDate"":null, ""CustomField1"":""Testing"" }";
var c = JsonConvert.DeserializeObject<Test>(json);
Assert.AreEqual(null, c.LastActivityDate);
Assert.AreEqual(1, c.CustomFields.Count);
Assert.AreEqual("Testing", (string)c.CustomFields["CustomField1"]);
}
}
}
@@ -25,6 +25,7 @@
using System;
using System.Collections;
using System.Collections.Specialized;
#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50 || PORTABLE40)
using System.Collections.Concurrent;
#endif
@@ -57,6 +58,19 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class JsonSerializerCollectionsTests : TestFixtureBase
{
public class NameValueCollectionTestClass
{
public NameValueCollection Collection { get; set; }
}
[Test]
public void DeserializeNameValueCollection()
{
ExceptionAssert.Throws<JsonSerializationException>(
() => JsonConvert.DeserializeObject<NameValueCollectionTestClass>("{Collection:[]}"),
"Cannot create and populate list type System.Collections.Specialized.NameValueCollection. Path 'Collection', line 1, position 13.");
}
[Test]
public void MultiDObjectArray()
{
@@ -8472,6 +8472,27 @@ Path '', line 1, position 1.");
Assert.AreEqual(typeof(DateTimeOffset), v.Value.GetType());
Assert.AreEqual(dt, (DateTimeOffset)v.Value);
}
[DataContract]
public class ConstantTestClass
{
[DataMember]
public const char MY_CONSTANT = '.';
}
[Test]
public void DeserializeConstantProperty()
{
ConstantTestClass c1 = new ConstantTestClass();
string json = JsonConvert.SerializeObject(c1, Formatting.Indented);
StringAssert.AreEqual(@"{
""MY_CONSTANT"": "".""
}", json);
JsonConvert.DeserializeObject<ConstantTestClass>(json);
}
#endif
[Test]
@@ -8610,15 +8631,15 @@ Path '', line 1, position 1.");
""AlternateViews"": []
}";
System.Net.Mail.MailMessage mailMessage = JsonConvert.DeserializeObject<System.Net.Mail.MailMessage>(
JsonMessage,
new MailAddressReadConverter(),
new AttachmentReadConverter(),
new EncodingReadConverter());
Assert.AreEqual("Family tree", mailMessage.Subject);
Assert.AreEqual("Luke Skywalker", mailMessage.To[0].DisplayName);
Assert.AreEqual("skywalker family tree.jpg", mailMessage.Attachments[0].ContentDisposition.FileName);
ExceptionAssert.Throws<JsonSerializationException>(() =>
{
JsonConvert.DeserializeObject<System.Net.Mail.MailMessage>(
JsonMessage,
new MailAddressReadConverter(),
new AttachmentReadConverter(),
new EncodingReadConverter());
},
"Cannot populate list type System.Net.Mime.HeaderCollection. Path 'Headers', line 26, position 15.");
}
public class MailAddressReadConverter : JsonConverter