-Fixed StringEnumConverter to throw a JsonSerializerException like the serializer throws for invalid enums
-Changed Windows Phone and Portable builds to use Microsoft.CSharp.dll directly
This commit is contained in:
@@ -90,6 +90,40 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
[TestFixture]
|
||||
public class JsonSerializerTest : TestFixtureBase
|
||||
{
|
||||
//[DataContract]
|
||||
//public class BaseDataContract1
|
||||
//{
|
||||
// [DataMember(Name = "virtualMember")]
|
||||
// public virtual string VirtualMember { get; set; }
|
||||
|
||||
// [DataMember(Name = "nonVirtualMember")]
|
||||
// public string NonVirtualMember { get; set; }
|
||||
|
||||
// public virtual object NewMember { get; set; }
|
||||
//}
|
||||
|
||||
//public class ChildDataContract1 : BaseDataContract1
|
||||
//{
|
||||
// [DataMember(Name = "NewMember")]
|
||||
// public virtual new string NewMember { get; set; }
|
||||
// public override string VirtualMember { get; set; }
|
||||
// public string AddedMember { get; set; }
|
||||
//}
|
||||
|
||||
//[Test]
|
||||
//public void ChildDataContractTest1()
|
||||
//{
|
||||
// var cc = new ChildDataContract1
|
||||
// {
|
||||
// VirtualMember = "VirtualMember!",
|
||||
// NonVirtualMember = "NonVirtualMember!",
|
||||
// NewMember = "NewMember!"
|
||||
// };
|
||||
|
||||
// string result = JsonConvert.SerializeObject(cc);
|
||||
// Assert.AreEqual(@"{""NewMember"":""NewMember!"",""virtualMember"":""VirtualMember!"",""nonVirtualMember"":""NonVirtualMember!""}", result);
|
||||
//}
|
||||
|
||||
[Test]
|
||||
public void PersonTypedObjectDeserialization()
|
||||
{
|
||||
@@ -6450,6 +6484,21 @@ Parameter name: value",
|
||||
}", json);
|
||||
}
|
||||
|
||||
#if !(NET20 || NET35)
|
||||
public class IgnoreDataMemberTestClass
|
||||
{
|
||||
[IgnoreDataMember]
|
||||
public int Ignored { get; set; }
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IgnoreDataMemberTest()
|
||||
{
|
||||
string json = JsonConvert.SerializeObject(new IgnoreDataMemberTestClass() { Ignored = int.MaxValue }, Formatting.Indented);
|
||||
Assert.AreEqual(@"{}", json);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !(NET20 || NET35)
|
||||
[Test]
|
||||
public void SerializeDataContractSerializationAttributes()
|
||||
@@ -6462,6 +6511,12 @@ Parameter name: value",
|
||||
IgnoreDataMemberAndDataMemberAttribute = "Value!"
|
||||
};
|
||||
|
||||
//MemoryStream ms = new MemoryStream();
|
||||
//DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(DataContractSerializationAttributesClass));
|
||||
//serializer.WriteObject(ms, dataContract);
|
||||
|
||||
//Console.WriteLine(Encoding.UTF8.GetString(ms.ToArray()));
|
||||
|
||||
string json = JsonConvert.SerializeObject(dataContract, Formatting.Indented);
|
||||
Assert.AreEqual(@"{
|
||||
""DataMemberAttribute"": ""Value!"",
|
||||
|
||||
Reference in New Issue
Block a user