-Incremented version to 4.5.3

-Changed default DefaultContractResolver.IgnoreSerializableAttribute to true
-Fixed MaxDepth on JsonReader recursively throwing error
-Fixed SerializationBinder.BindToName not being called with full assembly names
This commit is contained in:
James Newton-King
2012-04-14 00:58:36 +12:00
parent 11310fdf05
commit adecef2126
11 changed files with 151 additions and 9 deletions
@@ -26,8 +26,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Runtime.Serialization.Formatters;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE
using NUnit.Framework;
@@ -949,6 +951,59 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(e, f, "Objects should be equal after round trip json serialization");
}
#endif
#if !(NET20 || NET35)
[Test]
public void SerializationBinderWithFullName()
{
Message message = new Message
{
Address = "jamesnk@testtown.com",
Body = new Version(1, 2, 3, 4)
};
string json = JsonConvert.SerializeObject(message, Formatting.Indented, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
Binder = new MetroBinder(),
ContractResolver = new DefaultContractResolver
{
#if !(SILVERLIGHT || NETFX_CORE)
IgnoreSerializableAttribute = true
#endif
}
});
Assert.AreEqual(@"{
""$type"": "":::MESSAGE:::, AssemblyName"",
""Address"": ""jamesnk@testtown.com"",
""Body"": {
""$type"": "":::VERSION:::, AssemblyName"",
""Major"": 1,
""Minor"": 2,
""Build"": 3,
""Revision"": 4,
""MajorRevision"": 0,
""MinorRevision"": 4
}
}", json);
}
public class MetroBinder : SerializationBinder
{
public override Type BindToType(string assemblyName, string typeName)
{
return null;
}
public override void BindToName(Type serializedType, out string assemblyName, out string typeName)
{
assemblyName = "AssemblyName";
typeName = ":::" + serializedType.Name.ToUpper(CultureInfo.InvariantCulture) + ":::";
}
}
#endif
}
public class Message
@@ -9,6 +9,7 @@ using NUnit.Framework;
#if !(SILVERLIGHT || NETFX_CORE || NET20)
using System.Runtime.Serialization.Json;
#endif
using Newtonsoft.Json.Serialization;
namespace Newtonsoft.Json.Tests.Serialization
{
@@ -39,7 +40,15 @@ namespace Newtonsoft.Json.Tests.Serialization
#endif
string expected = "{\"publicField\":\"public\",\"internalField\":\"internal\",\"protectedInternalField\":\"protected internal\",\"protectedField\":\"protected\",\"privateField\":\"private\"}";
string json = JsonConvert.SerializeObject(serializableType);
string json = JsonConvert.SerializeObject(serializableType, new JsonSerializerSettings
{
ContractResolver = new DefaultContractResolver
{
#if !(SILVERLIGHT || NETFX_CORE)
IgnoreSerializableAttribute = false
#endif
}
});
Assert.AreEqual(expected, json);
}