-Fixed error when reusing JsonSerializer with preserve references enabled

This commit is contained in:
JamesNK
2011-03-22 05:15:55 +00:00
parent 9e1c9e96fb
commit 6f0c382ba7
8 changed files with 161 additions and 59 deletions
@@ -4203,5 +4203,20 @@ keyword such as type of business.""
Assert.AreEqual(44.4, p.Height);
Assert.AreEqual(4d, p.Price);
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "Error converting value {null} to type 'System.DateTime'.")]
public void DeserializeNullDateTimeValueTest()
{
JsonConvert.DeserializeObject("null", typeof(DateTime));
}
[Test]
public void DeserializeNullNullableDateTimeValueTest()
{
object dateTime = JsonConvert.DeserializeObject("null", typeof(DateTime?));
Assert.IsNull(dateTime);
}
}
}
@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
@@ -283,7 +284,7 @@ namespace Newtonsoft.Json.Tests.Serialization
{
CircularReferenceClass circularReferenceClass = (CircularReferenceClass)value;
string reference = serializer.ReferenceResolver.GetReference(circularReferenceClass);
string reference = serializer.ReferenceResolver.GetReference(serializer, circularReferenceClass);
JObject me = new JObject();
me["$id"] = new JValue(reference);
@@ -309,7 +310,7 @@ namespace Newtonsoft.Json.Tests.Serialization
else
{
string reference = (string)o["$ref"];
return serializer.ReferenceResolver.ResolveReference(reference);
return serializer.ReferenceResolver.ResolveReference(serializer, reference);
}
}
@@ -802,5 +803,61 @@ namespace Newtonsoft.Json.Tests.Serialization
User deserializedUser = JsonConvert.DeserializeObject<User>(json, serializerSettings);
Assert.IsNotNull(deserializedUser);
}
[Test]
public void PreserveReferencesHandlingWithReusedJsonSerializer()
{
MyClass c = new MyClass();
IList<MyClass> myClasses1 = new List<MyClass>
{
c,
c
};
var ser = new JsonSerializer()
{
PreserveReferencesHandling = PreserveReferencesHandling.All
};
MemoryStream ms = new MemoryStream();
using (var sw = new StreamWriter(ms))
using (var writer = new JsonTextWriter(sw) { Formatting = Formatting.Indented })
{
ser.Serialize(writer, myClasses1);
}
byte[] data = ms.ToArray();
string json = Encoding.UTF8.GetString(data, 0, data.Length);
Assert.AreEqual(@"{
""$id"": ""1"",
""$values"": [
{
""$id"": ""2"",
""PreProperty"": 0,
""PostProperty"": 0
},
{
""$ref"": ""2""
}
]
}", json);
ms = new MemoryStream(data);
IList<MyClass> myClasses2;
using (var sr = new StreamReader(ms))
using (var reader = new JsonTextReader(sr))
{
myClasses2 = ser.Deserialize<IList<MyClass>>(reader);
}
Assert.AreEqual(2, myClasses2.Count);
Assert.AreEqual(myClasses2[0], myClasses2[1]);
Assert.AreNotEqual(myClasses1[0], myClasses2[0]);
}
}
}