-Fixed unhelpful error message when deserializing badly formatted regex string

This commit is contained in:
James Newton-King
2018-02-17 21:07:07 +13:00
parent 31b1d7a690
commit 41c3a71e62
4 changed files with 83 additions and 26 deletions
@@ -126,6 +126,67 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture, r.Regex.Options);
}
[Test]
public void DeserializeStringRegex()
{
string json = @"{
""Regex"": ""\/abc\/""
}";
RegexTestClass c = JsonConvert.DeserializeObject<RegexTestClass>(json, new JsonSerializerSettings
{
Converters = { new RegexConverter() }
});
Assert.AreEqual("abc", c.Regex.ToString());
Assert.AreEqual(RegexOptions.None, c.Regex.Options);
}
[Test]
public void DeserializeStringRegex_NoStartSlash_Error()
{
string json = @"{
""Regex"": ""abc\/""
}";
ExceptionAssert.Throws<JsonSerializationException>(
() => JsonConvert.DeserializeObject<RegexTestClass>(json, new JsonSerializerSettings
{
Converters = { new RegexConverter() }
}),
"Regex pattern must be enclosed by slashes. Path 'Regex', line 2, position 18.");
}
[Test]
public void DeserializeStringRegex_NoEndSlash_Error()
{
string json = @"{
""Regex"": ""\/abc""
}";
ExceptionAssert.Throws<JsonSerializationException>(
() => JsonConvert.DeserializeObject<RegexTestClass>(json, new JsonSerializerSettings
{
Converters = {new RegexConverter()}
}),
"Regex pattern must be enclosed by slashes. Path 'Regex', line 2, position 18.");
}
[Test]
public void DeserializeStringRegex_NoStartAndEndSlashes_Error()
{
string json = @"{
""Regex"": ""\/abc""
}";
ExceptionAssert.Throws<JsonSerializationException>(
() => JsonConvert.DeserializeObject<RegexTestClass>(json, new JsonSerializerSettings
{
Converters = { new RegexConverter() }
}),
"Regex pattern must be enclosed by slashes. Path 'Regex', line 2, position 18.");
}
#pragma warning disable 618
[Test]
public void SerializeToBson()