-Added Path to JsonReader/JsonWriter/ErrorContext with the JSON path of the current position
-Changed collection type on JsonArrayContract to public -Changed dictionary key type and dictionary value type on JsonDictionaryContract to public -Fixed error handling when failing to parse array content -Fixed error handling when there are missing required properties
This commit is contained in:
@@ -272,75 +272,127 @@ namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
string input = @"{
|
||||
value:'Purple',
|
||||
array:[1,2],
|
||||
subobject:{prop:1}
|
||||
array:[1,2,new Date(1)],
|
||||
subobject:{prop:1,proparray:[1]}
|
||||
}";
|
||||
|
||||
StringReader sr = new StringReader(input);
|
||||
|
||||
using (JsonReader jsonReader = new JsonTextReader(sr))
|
||||
using (JsonReader reader = new JsonTextReader(sr))
|
||||
{
|
||||
Assert.AreEqual(0, jsonReader.Depth);
|
||||
Assert.AreEqual(0, reader.Depth);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartObject);
|
||||
Assert.AreEqual(0, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.StartObject);
|
||||
Assert.AreEqual(0, reader.Depth);
|
||||
Assert.AreEqual("", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("value", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.String);
|
||||
Assert.AreEqual(jsonReader.Value, @"Purple");
|
||||
Assert.AreEqual(jsonReader.QuoteChar, '\'');
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.String);
|
||||
Assert.AreEqual(reader.Value, @"Purple");
|
||||
Assert.AreEqual(reader.QuoteChar, '\'');
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("value", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("array", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartArray);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.StartArray);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("array", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(1, jsonReader.Value);
|
||||
Assert.AreEqual(2, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(1, reader.Value);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("array[0]", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(2, jsonReader.Value);
|
||||
Assert.AreEqual(2, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(2, reader.Value);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("array[1]", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndArray);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.StartConstructor);
|
||||
Assert.AreEqual("Date", reader.Value);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("array[2]", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(1, reader.Value);
|
||||
Assert.AreEqual(3, reader.Depth);
|
||||
Assert.AreEqual("array[2][0]", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartObject);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.EndConstructor);
|
||||
Assert.AreEqual(null, reader.Value);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("array[2]", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(2, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.EndArray);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("array", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(2, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("subobject", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndObject);
|
||||
Assert.AreEqual(1, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.StartObject);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("subobject", reader.Path);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndObject);
|
||||
Assert.AreEqual(0, jsonReader.Depth);
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("subobject.prop", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("subobject.prop", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.StartArray);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.Integer);
|
||||
Assert.AreEqual(3, reader.Depth);
|
||||
Assert.AreEqual("subobject.proparray[0]", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.EndArray);
|
||||
Assert.AreEqual(2, reader.Depth);
|
||||
Assert.AreEqual("subobject.proparray", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.EndObject);
|
||||
Assert.AreEqual(1, reader.Depth);
|
||||
Assert.AreEqual("subobject", reader.Path);
|
||||
|
||||
reader.Read();
|
||||
Assert.AreEqual(reader.TokenType, JsonToken.EndObject);
|
||||
Assert.AreEqual(0, reader.Depth);
|
||||
Assert.AreEqual("", reader.Path);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -199,6 +199,85 @@ namespace Newtonsoft.Json.Tests
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteEnd()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.Formatting = Formatting.Indented;
|
||||
|
||||
jsonWriter.WriteStartObject();
|
||||
jsonWriter.WritePropertyName("CPU");
|
||||
jsonWriter.WriteValue("Intel");
|
||||
jsonWriter.WritePropertyName("PSU");
|
||||
jsonWriter.WriteValue("500W");
|
||||
jsonWriter.WritePropertyName("Drives");
|
||||
jsonWriter.WriteStartArray();
|
||||
jsonWriter.WriteValue("DVD read/writer");
|
||||
jsonWriter.WriteComment("(broken)");
|
||||
jsonWriter.WriteValue("500 gigabyte hard drive");
|
||||
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||
jsonWriter.WriteEndObject();
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
}
|
||||
|
||||
string expected = @"{
|
||||
""CPU"": ""Intel"",
|
||||
""PSU"": ""500W"",
|
||||
""Drives"": [
|
||||
""DVD read/writer""
|
||||
/*(broken)*/,
|
||||
""500 gigabyte hard drive"",
|
||||
""200 gigabype hard drive""
|
||||
]
|
||||
}";
|
||||
string result = sb.ToString();
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CloseWithRemainingContent()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.Formatting = Formatting.Indented;
|
||||
|
||||
jsonWriter.WriteStartObject();
|
||||
jsonWriter.WritePropertyName("CPU");
|
||||
jsonWriter.WriteValue("Intel");
|
||||
jsonWriter.WritePropertyName("PSU");
|
||||
jsonWriter.WriteValue("500W");
|
||||
jsonWriter.WritePropertyName("Drives");
|
||||
jsonWriter.WriteStartArray();
|
||||
jsonWriter.WriteValue("DVD read/writer");
|
||||
jsonWriter.WriteComment("(broken)");
|
||||
jsonWriter.WriteValue("500 gigabyte hard drive");
|
||||
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||
jsonWriter.Close();
|
||||
}
|
||||
|
||||
string expected = @"{
|
||||
""CPU"": ""Intel"",
|
||||
""PSU"": ""500W"",
|
||||
""Drives"": [
|
||||
""DVD read/writer""
|
||||
/*(broken)*/,
|
||||
""500 gigabyte hard drive"",
|
||||
""200 gigabype hard drive""
|
||||
]
|
||||
}";
|
||||
string result = sb.ToString();
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Indenting()
|
||||
{
|
||||
@@ -222,6 +301,7 @@ namespace Newtonsoft.Json.Tests
|
||||
jsonWriter.WriteValue("200 gigabype hard drive");
|
||||
jsonWriter.WriteEnd();
|
||||
jsonWriter.WriteEndObject();
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
}
|
||||
|
||||
// {
|
||||
@@ -247,9 +327,6 @@ namespace Newtonsoft.Json.Tests
|
||||
}";
|
||||
string result = sb.ToString();
|
||||
|
||||
Console.WriteLine("Indenting");
|
||||
Console.WriteLine(result);
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
@@ -265,27 +342,34 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
jsonWriter.WriteStartObject();
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual("", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WritePropertyName("CPU");
|
||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||
Assert.AreEqual("CPU", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WriteValue("Intel");
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual("CPU", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WritePropertyName("Drives");
|
||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||
Assert.AreEqual("Drives", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WriteStartArray();
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
|
||||
jsonWriter.WriteValue("DVD read/writer");
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
Assert.AreEqual("Drives[0]", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WriteEnd();
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual("Drives", jsonWriter.Path);
|
||||
|
||||
jsonWriter.WriteEndObject();
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
Assert.AreEqual("", jsonWriter.Path);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -620,6 +704,79 @@ _____'propertyName': NaN
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Path()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
string text = "Hello world.";
|
||||
byte[] data = Encoding.UTF8.GetBytes(text);
|
||||
|
||||
using (JsonTextWriter writer = new JsonTextWriter(sw))
|
||||
{
|
||||
writer.Formatting = Formatting.Indented;
|
||||
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("", writer.Path);
|
||||
writer.WriteStartObject();
|
||||
Assert.AreEqual("[0]", writer.Path);
|
||||
writer.WritePropertyName("Property1");
|
||||
Assert.AreEqual("[0].Property1", writer.Path);
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("[0].Property1", writer.Path);
|
||||
writer.WriteValue(1);
|
||||
Assert.AreEqual("[0].Property1[0]", writer.Path);
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("[0].Property1[1]", writer.Path);
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("[0].Property1[1][0]", writer.Path);
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("[0].Property1[1][0][0]", writer.Path);
|
||||
writer.WriteEndObject();
|
||||
Assert.AreEqual("[0]", writer.Path);
|
||||
writer.WriteStartObject();
|
||||
Assert.AreEqual("[1]", writer.Path);
|
||||
writer.WritePropertyName("Property2");
|
||||
Assert.AreEqual("[1].Property2", writer.Path);
|
||||
writer.WriteStartConstructor("Constructor1");
|
||||
Assert.AreEqual("[1].Property2", writer.Path);
|
||||
writer.WriteNull();
|
||||
Assert.AreEqual("[1].Property2[0]", writer.Path);
|
||||
writer.WriteStartArray();
|
||||
Assert.AreEqual("[1].Property2[1]", writer.Path);
|
||||
writer.WriteValue(1);
|
||||
Assert.AreEqual("[1].Property2[1][0]", writer.Path);
|
||||
writer.WriteEnd();
|
||||
Assert.AreEqual("[1].Property2[1]", writer.Path);
|
||||
writer.WriteEndObject();
|
||||
Assert.AreEqual("[1]", writer.Path);
|
||||
writer.WriteEndArray();
|
||||
Assert.AreEqual("", writer.Path);
|
||||
}
|
||||
|
||||
Assert.AreEqual(@"[
|
||||
{
|
||||
""Property1"": [
|
||||
1,
|
||||
[
|
||||
[
|
||||
[]
|
||||
]
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
""Property2"": new Constructor1(
|
||||
null,
|
||||
[
|
||||
1
|
||||
]
|
||||
)
|
||||
}
|
||||
]", sb.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BuildStateArray()
|
||||
{
|
||||
|
||||
@@ -72,5 +72,5 @@ using System.Security;
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("4.0.8.0")]
|
||||
#if !PocketPC
|
||||
[assembly: AssemblyFileVersion("4.0.8.14618")]
|
||||
[assembly: AssemblyFileVersion("4.0.8.14623")]
|
||||
#endif
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
VersionKeyedCollection c = JsonConvert.DeserializeObject<VersionKeyedCollection>(json);
|
||||
Assert.AreEqual(1, c.Count);
|
||||
Assert.AreEqual(1, c.Messages.Count);
|
||||
Assert.AreEqual("Error message for member 1 = An item with the same key has already been added.", c.Messages[0]);
|
||||
Assert.AreEqual("[1] - Error message for member 1 = An item with the same key has already been added.", c.Messages[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -161,7 +161,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
List<string> errors = new List<string>();
|
||||
|
||||
List<DateTime> c = JsonConvert.DeserializeObject<List<DateTime>>(@"[
|
||||
List<DateTime> c = JsonConvert.DeserializeObject<List<DateTime>>(
|
||||
@"[
|
||||
""2009-09-09T00:00:00Z"",
|
||||
""I am not a date and will error!"",
|
||||
[
|
||||
@@ -175,10 +176,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
Error = delegate(object sender, ErrorEventArgs args)
|
||||
{
|
||||
errors.Add(args.ErrorContext.Error.Message);
|
||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||
args.ErrorContext.Handled = true;
|
||||
},
|
||||
Converters = { new IsoDateTimeConverter() }
|
||||
Converters = {new IsoDateTimeConverter()}
|
||||
});
|
||||
|
||||
// 2009-09-09T00:00:00Z
|
||||
@@ -196,12 +197,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Assert.AreEqual(3, errors.Count);
|
||||
#if !(NET20 || NET35 || WINDOWS_PHONE)
|
||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is an unknown word starting at index 0.", errors[0]);
|
||||
Assert.AreEqual("[1] - 1 - The string was not recognized as a valid DateTime. There is an unknown word starting at index 0.", errors[0]);
|
||||
#else
|
||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is a unknown word starting at index 0.", errors[0]);
|
||||
Assert.AreEqual("[1] - 1 - The string was not recognized as a valid DateTime. There is a unknown word starting at index 0.", errors[0]);
|
||||
#endif
|
||||
Assert.AreEqual("Unexpected token parsing date. Expected String, got StartArray.", errors[1]);
|
||||
Assert.AreEqual("Cannot convert null value to System.DateTime.", errors[2]);
|
||||
Assert.AreEqual("[2] - 2 - Unexpected token parsing date. Expected String, got StartArray.", errors[1]);
|
||||
Assert.AreEqual("[4] - 4 - Cannot convert null value to System.DateTime.", errors[2]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -209,7 +210,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
bool eventErrorHandlerCalled = false;
|
||||
|
||||
DateTimeErrorObjectCollection c = JsonConvert.DeserializeObject<DateTimeErrorObjectCollection>(@"[
|
||||
DateTimeErrorObjectCollection c = JsonConvert.DeserializeObject<DateTimeErrorObjectCollection>(
|
||||
@"[
|
||||
""2009-09-09T00:00:00Z"",
|
||||
""kjhkjhkjhkjh"",
|
||||
[
|
||||
@@ -220,13 +222,13 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
""2000-12-01T00:00:00Z""
|
||||
]",
|
||||
new JsonSerializerSettings
|
||||
{
|
||||
Error = (s, a) => eventErrorHandlerCalled = true,
|
||||
Converters =
|
||||
{
|
||||
Error = (s, a) => eventErrorHandlerCalled = true,
|
||||
Converters =
|
||||
{
|
||||
new IsoDateTimeConverter()
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Assert.AreEqual(3, c.Count);
|
||||
Assert.AreEqual(new DateTime(2009, 9, 9, 0, 0, 0, DateTimeKind.Utc), c[0]);
|
||||
@@ -270,25 +272,76 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
string json = @"[[""kjhkjhkjhkjh""]]";
|
||||
|
||||
Exception e = null;
|
||||
try
|
||||
{
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||
{
|
||||
// only log an error once
|
||||
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
||||
errors.Add(args.ErrorContext.Error.Message);
|
||||
};
|
||||
{
|
||||
// only log an error once
|
||||
if (args.CurrentObject == args.ErrorContext.OriginalObject)
|
||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||
};
|
||||
|
||||
serializer.Deserialize(new StringReader(json), typeof(List<List<DateTime>>));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex.Message);
|
||||
e = ex;
|
||||
}
|
||||
|
||||
Assert.AreEqual(@"Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", e.Message);
|
||||
|
||||
Assert.AreEqual(1, errors.Count);
|
||||
Assert.AreEqual(@"Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", errors[0]);
|
||||
Assert.AreEqual(@"[0][0] - 0 - Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", errors[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void MultipleRequiredPropertyErrors()
|
||||
{
|
||||
string json = "{}";
|
||||
List<string> errors = new List<string>();
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||
{
|
||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||
args.ErrorContext.Handled = true;
|
||||
};
|
||||
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof (MyTypeWithRequiredMembers));
|
||||
|
||||
Assert.AreEqual(2, errors.Count);
|
||||
Assert.AreEqual(" - Required1 - Required property 'Required1' not found in JSON. Line 1, position 2.", errors[0]);
|
||||
Assert.AreEqual(" - Required2 - Required property 'Required2' not found in JSON. Line 1, position 2.", errors[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void HandlingArrayErrors()
|
||||
{
|
||||
string json = "[\"a\",\"b\",\"45\",34]";
|
||||
|
||||
List<string> errors = new List<string>();
|
||||
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Error += delegate(object sender, ErrorEventArgs args)
|
||||
{
|
||||
errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
|
||||
args.ErrorContext.Handled = true;
|
||||
};
|
||||
|
||||
serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(int[]));
|
||||
|
||||
Assert.AreEqual(2, errors.Count);
|
||||
Assert.AreEqual("[0] - 0 - Could not convert string to integer: a. Line 1, position 4.", errors[0]);
|
||||
Assert.AreEqual("[1] - 1 - Could not convert string to integer: b. Line 1, position 8.", errors[1]);
|
||||
}
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class MyTypeWithRequiredMembers
|
||||
{
|
||||
[JsonProperty(Required = Required.AllowNull)]
|
||||
public string Required1;
|
||||
[JsonProperty(Required = Required.AllowNull)]
|
||||
public string Required2;
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
||||
[OnError]
|
||||
internal void OnErrorMethod(StreamingContext context, ErrorContext errorContext)
|
||||
{
|
||||
Messages.Add("Error message for member " + errorContext.Member + " = " + errorContext.Error.Message);
|
||||
Messages.Add(errorContext.Path + " - Error message for member " + errorContext.Member + " = " + errorContext.Error.Message);
|
||||
errorContext.Handled = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user