-Fixed JValue.CompareTo with number and string values
This commit is contained in:
@@ -51,6 +51,52 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[TestFixture]
|
||||
public class JPathExecuteTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void GreaterThanWithIntegerParameterAndStringValue()
|
||||
{
|
||||
string json = @"{
|
||||
""persons"": [
|
||||
{
|
||||
""name"" : ""John"",
|
||||
""age"": ""26""
|
||||
},
|
||||
{
|
||||
""name"" : ""Jane"",
|
||||
""age"": ""2""
|
||||
}
|
||||
]
|
||||
}";
|
||||
|
||||
JObject models = JObject.Parse(json);
|
||||
|
||||
var results = models.SelectTokens("$.persons[?(@.age > 3)]").ToList();
|
||||
|
||||
Assert.AreEqual(1, results.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GreaterThanWithStringParameterAndIntegerValue()
|
||||
{
|
||||
string json = @"{
|
||||
""persons"": [
|
||||
{
|
||||
""name"" : ""John"",
|
||||
""age"": 26
|
||||
},
|
||||
{
|
||||
""name"" : ""Jane"",
|
||||
""age"": 2
|
||||
}
|
||||
]
|
||||
}";
|
||||
|
||||
JObject models = JObject.Parse(json);
|
||||
|
||||
var results = models.SelectTokens("$.persons[?(@.age > '3')]").ToList();
|
||||
|
||||
Assert.AreEqual(1, results.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void RecursiveWildcard()
|
||||
{
|
||||
|
||||
@@ -175,6 +175,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 3, 4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray(3, 4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray(4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("11", 5)));
|
||||
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression
|
||||
{
|
||||
@@ -190,6 +191,47 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray(2, 3, 4, 5)));
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray(3, 4, 5)));
|
||||
Assert.IsFalse(e2.IsMatch(null, new JArray(4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("11", 5)));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BooleanExpressionTest_GreaterThanOperator()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.GreaterThan,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("2", "26")));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 26)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray(2, 3)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("2", "3")));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BooleanExpressionTest_GreaterThanOrEqualsOperator()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.GreaterThanOrEquals,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("2", "26")));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 26)));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 3)));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("2", "3")));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray(2, 1)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("2", "1")));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user