Skip to content

Commit

Permalink
Fix JSONPath scanning with nested indexer (#2180)
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesNK authored Sep 30, 2019
1 parent c89d6ad commit 541eab2
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 0 deletions.
65 changes: 65 additions & 0 deletions Src/Newtonsoft.Json.Tests/Issues/Issue2156.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#region License
// Copyright (c) 2007 James Newton-King
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#endregion

using Newtonsoft.Json.Linq;
using System.Linq;
#if DNXCORE50
using Xunit;
using Test = Xunit.FactAttribute;
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
#else
using NUnit.Framework;
#endif

namespace Newtonsoft.Json.Tests.Issues
{
[TestFixture]
public class Issue2156
{
[Test]
public void Test()
{
string json = @"
{
""root"": {
""a"": {
""name"": ""John"",
""b"": {
""name"": ""Sarah""
}
}
}
}";

JToken t = JToken.Parse(json);

int count1 = t.SelectTokens("$..a.name").Count(); // result: 1, expected: 1
int count2 = t.SelectTokens("$..['a']['name']").Count(); // result: 2, expected: 1

Assert.AreEqual(1, count1);
Assert.AreEqual(1, count2);
}
}
}
2 changes: 2 additions & 0 deletions Src/Newtonsoft.Json/Linq/JsonPath/JPath.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ private bool ParsePath(List<PathFilter> filters, int currentPartStartIndex, bool
}

filters.Add(ParseIndexer(currentChar, scan));
scan = false;

_currentIndex++;
currentPartStartIndex = _currentIndex;
followingIndexer = true;
Expand Down

0 comments on commit 541eab2

Please # to comment.