-Additional JSONPath NotEquals fix
This commit is contained in:
@@ -904,7 +904,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void NotEqualsNullAndNonPrimativeValues()
|
public void NotEqualsAndNonPrimativeValues()
|
||||||
{
|
{
|
||||||
string json = @"[
|
string json = @"[
|
||||||
{
|
{
|
||||||
@@ -934,9 +934,18 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
|||||||
|
|
||||||
JArray a = JArray.Parse(json);
|
JArray a = JArray.Parse(json);
|
||||||
|
|
||||||
List<JToken> result = a.SelectTokens("$.[?(@.value!=null)]").ToList();
|
List<JToken> result = a.SelectTokens("$.[?(@.value!=1)]").ToList();
|
||||||
Assert.AreEqual(4, result.Count);
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!='2000-12-05T05:07:59-10:00')]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!=null)]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!=123)]").ToList();
|
||||||
|
Assert.AreEqual(3, result.Count);
|
||||||
|
|
||||||
result = a.SelectTokens("$.[?(@.value)]").ToList();
|
result = a.SelectTokens("$.[?(@.value)]").ToList();
|
||||||
Assert.AreEqual(4, result.Count);
|
Assert.AreEqual(4, result.Count);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,13 +124,10 @@ namespace Newtonsoft.Json.Linq.JsonPath
|
|||||||
{
|
{
|
||||||
switch (Operator)
|
switch (Operator)
|
||||||
{
|
{
|
||||||
case QueryOperator.NotEquals:
|
|
||||||
if (Value.Type == JTokenType.Null)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case QueryOperator.Exists:
|
case QueryOperator.Exists:
|
||||||
|
// you can only specify primative types in a comparison
|
||||||
|
// notequals will always be true
|
||||||
|
case QueryOperator.NotEquals:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user