-Fixed error on no result for JSON Path queries
-Fixed not disposing JsonReader/JsonWriter in some places
This commit is contained in:
@@ -119,6 +119,28 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
() => { o.SelectToken("[1]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateWildcardIndexOnObjectWithError()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
@"Index * not valid on JObject.",
|
||||
() => { o.SelectToken("[*]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateSliceOnObjectWithError()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
@"Array slice is not valid on JObject.",
|
||||
() => { o.SelectToken("[:]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluatePropertyOnArray()
|
||||
{
|
||||
@@ -128,6 +150,16 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
Assert.IsNull(t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateMultipleResultsError()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
@"Path returned multiple tokens.",
|
||||
() => { a.SelectToken("[0, 1]"); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluatePropertyOnArrayWithError()
|
||||
{
|
||||
@@ -138,6 +170,16 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
() => { a.SelectToken("BlahBlah", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateNoResultsWithMultipleArrayIndexes()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
@"Index 9 outside the bounds of JArray.",
|
||||
() => { a.SelectToken("[9,10]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateConstructorOutOfBoundsIndxerWithError()
|
||||
{
|
||||
@@ -148,6 +190,14 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
() => { c.SelectToken("[1]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateConstructorOutOfBoundsIndxer()
|
||||
{
|
||||
JConstructor c = new JConstructor("Blah");
|
||||
|
||||
Assert.IsNull(c.SelectToken("[1]"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateMissingPropertyWithError()
|
||||
{
|
||||
@@ -159,6 +209,51 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
() => { o.SelectToken("Missing", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateMissingPropertyIndexWithError()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Property 'Missing' does not exist on JObject.",
|
||||
() => { o.SelectToken("['Missing','Missing2']", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateMultiPropertyIndexOnArrayWithError()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Properties 'Missing', 'Missing2' not valid on JArray.",
|
||||
() => { a.SelectToken("['Missing','Missing2']", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateArraySliceWithError()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Array slice of 99 to * returned no results.",
|
||||
() => { a.SelectToken("[99:]", true); });
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Array slice of 1 to -19 returned no results.",
|
||||
() => { a.SelectToken("[1:-19]", true); });
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Array slice of * to -19 returned no results.",
|
||||
() => { a.SelectToken("[:-19]", true); });
|
||||
|
||||
a = new JArray();
|
||||
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
"Array slice of * to * returned no results.",
|
||||
() => { a.SelectToken("[:]", true); });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateOutOfBoundsIndxer()
|
||||
{
|
||||
|
||||
@@ -131,5 +131,39 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
|
||||
Assert.IsFalse(compositeExpression.IsMatch(o3));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BooleanExpressionTest()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.LessThan,
|
||||
Value = new JValue(3),
|
||||
Path = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(new JArray(1, 2, 3, 4, 5)));
|
||||
Assert.IsTrue(e1.IsMatch(new JArray(2, 3, 4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(new JArray(3, 4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(new JArray(4, 5)));
|
||||
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.LessThanOrEquals,
|
||||
Value = new JValue(3),
|
||||
Path = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
|
||||
Assert.IsTrue(e2.IsMatch(new JArray(1, 2, 3, 4, 5)));
|
||||
Assert.IsTrue(e2.IsMatch(new JArray(2, 3, 4, 5)));
|
||||
Assert.IsTrue(e2.IsMatch(new JArray(3, 4, 5)));
|
||||
Assert.IsFalse(e2.IsMatch(new JArray(4, 5)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1653,6 +1653,35 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Assert.AreEqual("string!", ((MyChild)p2.Child).MyProperty);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void ListOfStackWithFullAssemblyName()
|
||||
{
|
||||
var input = new List<Stack<string>>();
|
||||
|
||||
input.Add(new Stack<string>(new List<string> { "One", "Two", "Three" }));
|
||||
input.Add(new Stack<string>(new List<string> { "Four", "Five", "Six" }));
|
||||
input.Add(new Stack<string>(new List<string> { "Seven", "Eight", "Nine" }));
|
||||
|
||||
string serialized = JsonConvert.SerializeObject(input,
|
||||
Newtonsoft.Json.Formatting.Indented,
|
||||
new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All, TypeNameAssemblyFormat = FormatterAssemblyStyle.Full } // TypeNameHandling.Auto will work
|
||||
);
|
||||
|
||||
Console.WriteLine(serialized);
|
||||
|
||||
var output = JsonConvert.DeserializeObject<List<Stack<string>>>(serialized,
|
||||
new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }
|
||||
);
|
||||
|
||||
foreach (var stack in output)
|
||||
{
|
||||
foreach (var value in stack)
|
||||
{
|
||||
Console.WriteLine(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if !NETFX_CORE
|
||||
|
||||
Reference in New Issue
Block a user