-Fixed handling error when reading metadata property
This commit is contained in:
@@ -52,6 +52,54 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class SerializationErrorHandlingTests : TestFixtureBase
|
public class SerializationErrorHandlingTests : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
[Test]
|
||||||
|
public void ErrorHandlingMetadata()
|
||||||
|
{
|
||||||
|
List<Exception> errors = new List<Exception>();
|
||||||
|
|
||||||
|
AAA a2 = JsonConvert.DeserializeObject<AAA>(@"{""MyTest"":{""$type"":""<Namespace>.JsonTest+MyTest2, <Assembly>""}}", new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
TypeNameHandling = TypeNameHandling.Auto,
|
||||||
|
Error = (object sender, Json.Serialization.ErrorEventArgs e) =>
|
||||||
|
{
|
||||||
|
errors.Add(e.ErrorContext.Error);
|
||||||
|
e.ErrorContext.Handled = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.IsNotNull(a2);
|
||||||
|
Assert.AreEqual(1, errors.Count);
|
||||||
|
Assert.AreEqual("Error resolving type specified in JSON '<Namespace>.JsonTest+MyTest2, <Assembly>'. Path 'MyTest.$type', line 1, position 61.", errors[0].Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ErrorHandlingMetadata_TopLevel()
|
||||||
|
{
|
||||||
|
List<Exception> errors = new List<Exception>();
|
||||||
|
|
||||||
|
JObject a2 = (JObject)JsonConvert.DeserializeObject(@"{""$type"":""<Namespace>.JsonTest+MyTest2, <Assembly>""}", new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
TypeNameHandling = TypeNameHandling.Auto,
|
||||||
|
Error = (object sender, Json.Serialization.ErrorEventArgs e) =>
|
||||||
|
{
|
||||||
|
errors.Add(e.ErrorContext.Error);
|
||||||
|
e.ErrorContext.Handled = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.IsNull(a2);
|
||||||
|
Assert.AreEqual(1, errors.Count);
|
||||||
|
Assert.AreEqual("Error resolving type specified in JSON '<Namespace>.JsonTest+MyTest2, <Assembly>'. Path '$type', line 1, position 51.", errors[0].Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class AAA
|
||||||
|
{
|
||||||
|
public ITest MyTest { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface ITest { }
|
||||||
|
public class MyTest : ITest { }
|
||||||
|
|
||||||
public class MyClass1
|
public class MyClass1
|
||||||
{
|
{
|
||||||
[JsonProperty("myint")]
|
[JsonProperty("myint")]
|
||||||
|
|||||||
@@ -2408,7 +2408,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
{
|
{
|
||||||
if (IsErrorHandled(newObject, contract, memberName, reader as IJsonLineInfo, reader.Path, ex))
|
if (IsErrorHandled(newObject, contract, memberName, reader as IJsonLineInfo, reader.Path, ex))
|
||||||
{
|
{
|
||||||
HandleError(reader, true, initialDepth);
|
HandleError(reader, true, initialDepth - 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user