-Added Path to JsonReaderException/JsonSerializationException messages

-Added JsonException
-Fixed all Exceptions thrown to be more specific
This commit is contained in:
James Newton-King
2012-04-21 17:25:44 +12:00
parent c120bf530d
commit a7bddf989f
69 changed files with 1400 additions and 1161 deletions
@@ -491,17 +491,25 @@ namespace Newtonsoft.Json.Tests.Converters
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "XmlNodeConverter can only convert JSON that begins with an object.")]
public void NoRootObject()
{
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"[1]");
ExceptionAssert.Throws<JsonSerializationException>(
"XmlNodeConverter can only convert JSON that begins with an object.",
() =>
{
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"[1]");
});
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.")]
public void RootObjectMultipleProperties()
{
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"{Prop1:1,Prop2:2}");
ExceptionAssert.Throws<JsonSerializationException>(
"JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.",
() =>
{
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"{Prop1:1,Prop2:2}");
});
}
[Test]
@@ -613,22 +621,30 @@ namespace Newtonsoft.Json.Tests.Converters
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.")]
public void MultipleRootPropertiesXmlDocument()
{
string json = @"{""count"": 773840,""photos"": null}";
JsonConvert.DeserializeXmlNode(json);
ExceptionAssert.Throws<JsonSerializationException>(
"JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.",
() =>
{
JsonConvert.DeserializeXmlNode(json);
});
}
#if !NET20
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.")]
public void MultipleRootPropertiesXDocument()
{
string json = @"{""count"": 773840,""photos"": null}";
JsonConvert.DeserializeXNode(json);
ExceptionAssert.Throws<JsonSerializationException>(
"JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document. Consider specifing a DeserializeRootElementName.",
() =>
{
JsonConvert.DeserializeXNode(json);
});
}
#endif
@@ -1008,7 +1024,6 @@ namespace Newtonsoft.Json.Tests.Converters
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "XmlNodeConverter cannot convert JSON with an empty property name to XML.")]
public void EmptyPropertyName()
{
string json = @"{
@@ -1090,7 +1105,12 @@ namespace Newtonsoft.Json.Tests.Converters
}
}";
DeserializeXmlNode(json);
ExceptionAssert.Throws<JsonSerializationException>(
"XmlNodeConverter cannot convert JSON with an empty property name to XML.",
() =>
{
DeserializeXmlNode(json);
});
}
[Test]