-Fixed inconsistent JsonTextReader.LinePosition
-Fixed JsonReader.Path with escaped property names
This commit is contained in:
@@ -526,7 +526,7 @@ Parameter name: index");
|
||||
""Large""
|
||||
], 987987";
|
||||
|
||||
ExceptionAssert.Throws<JsonReaderException>(() => { JArray.Parse(json); }, "Additional text encountered after finished reading JSON content: ,. Path '', line 5, position 2.");
|
||||
ExceptionAssert.Throws<JsonReaderException>(() => { JArray.Parse(json); }, "Additional text encountered after finished reading JSON content: ,. Path '', line 5, position 1.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -499,7 +499,7 @@ Parameter name: arrayIndex");
|
||||
ExceptionAssert.Throws<JsonReaderException>(() => { JObject.Parse(@"{
|
||||
""name"": ""James"",
|
||||
]!#$THIS IS: BAD JSON![{}}}}]
|
||||
}"); }, "Invalid property identifier character: ]. Path 'name', line 3, position 5.");
|
||||
}"); }, "Invalid property identifier character: ]. Path 'name', line 3, position 4.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -1693,7 +1693,7 @@ Parameter name: arrayIndex");
|
||||
reader.Read();
|
||||
|
||||
JToken.ReadFrom(reader);
|
||||
}, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 15.");
|
||||
}, "Unexpected end of content while loading JObject. Path 'short.error.code', line 6, position 14.");
|
||||
}
|
||||
|
||||
#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40)
|
||||
@@ -1788,7 +1788,7 @@ Parameter name: arrayIndex");
|
||||
}, 987987";
|
||||
|
||||
JObject o = JObject.Parse(json);
|
||||
}, "Additional text encountered after finished reading JSON content: ,. Path '', line 10, position 2.");
|
||||
}, "Additional text encountered after finished reading JSON content: ,. Path '', line 10, position 1.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -231,7 +231,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(jsonReader.Value, "CPU");
|
||||
Assert.AreEqual(2, lineInfo.LineNumber);
|
||||
Assert.AreEqual(7, lineInfo.LinePosition);
|
||||
Assert.AreEqual(6, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o.Property("CPU"), jsonReader.CurrentToken);
|
||||
|
||||
@@ -239,7 +239,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.String);
|
||||
Assert.AreEqual(jsonReader.Value, "Intel");
|
||||
Assert.AreEqual(2, lineInfo.LineNumber);
|
||||
Assert.AreEqual(15, lineInfo.LinePosition);
|
||||
Assert.AreEqual(14, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o.Property("CPU").Value, jsonReader.CurrentToken);
|
||||
|
||||
@@ -247,14 +247,14 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.PropertyName);
|
||||
Assert.AreEqual(jsonReader.Value, "Drives");
|
||||
Assert.AreEqual(3, lineInfo.LineNumber);
|
||||
Assert.AreEqual(10, lineInfo.LinePosition);
|
||||
Assert.AreEqual(9, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o.Property("Drives"), jsonReader.CurrentToken);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.StartArray);
|
||||
Assert.AreEqual(3, lineInfo.LineNumber);
|
||||
Assert.AreEqual(12, lineInfo.LinePosition);
|
||||
Assert.AreEqual(11, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o.Property("Drives").Value, jsonReader.CurrentToken);
|
||||
|
||||
@@ -262,7 +262,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.String);
|
||||
Assert.AreEqual(jsonReader.Value, "DVD read/writer");
|
||||
Assert.AreEqual(4, lineInfo.LineNumber);
|
||||
Assert.AreEqual(22, lineInfo.LinePosition);
|
||||
Assert.AreEqual(21, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o["Drives"][0], jsonReader.CurrentToken);
|
||||
|
||||
@@ -270,14 +270,14 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.String);
|
||||
Assert.AreEqual(jsonReader.Value, "500 gigabyte hard drive");
|
||||
Assert.AreEqual(5, lineInfo.LineNumber);
|
||||
Assert.AreEqual(30, lineInfo.LinePosition);
|
||||
Assert.AreEqual(29, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o["Drives"][1], jsonReader.CurrentToken);
|
||||
|
||||
jsonReader.Read();
|
||||
Assert.AreEqual(jsonReader.TokenType, JsonToken.EndArray);
|
||||
Assert.AreEqual(3, lineInfo.LineNumber);
|
||||
Assert.AreEqual(12, lineInfo.LinePosition);
|
||||
Assert.AreEqual(11, lineInfo.LinePosition);
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(o["Drives"], jsonReader.CurrentToken);
|
||||
|
||||
|
||||
@@ -1200,7 +1200,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
],";
|
||||
|
||||
JToken.Parse(json);
|
||||
}, "Additional text encountered after finished reading JSON content: ,. Path '', line 5, position 2.");
|
||||
}, "Additional text encountered after finished reading JSON content: ,. Path '', line 5, position 1.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -197,7 +197,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
IJsonLineInfo lineInfo = v;
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(3, lineInfo.LineNumber);
|
||||
Assert.AreEqual(1, lineInfo.LinePosition);
|
||||
Assert.AreEqual(0, lineInfo.LinePosition);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -219,7 +219,7 @@ undefined
|
||||
IJsonLineInfo lineInfo = v;
|
||||
Assert.AreEqual(true, lineInfo.HasLineInfo());
|
||||
Assert.AreEqual(2, lineInfo.LineNumber);
|
||||
Assert.AreEqual(10, lineInfo.LinePosition);
|
||||
Assert.AreEqual(9, lineInfo.LinePosition);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -271,7 +271,7 @@ undefined
|
||||
|
||||
JToken v1 = o["frameworks"]["dnxcore50"]["dependencies"]["System.Xml.ReaderWriter"]["source"];
|
||||
|
||||
Assert.AreEqual("frameworks.dnxcore50.dependencies.['System.Xml.ReaderWriter'].source", v1.Path);
|
||||
Assert.AreEqual("frameworks.dnxcore50.dependencies['System.Xml.ReaderWriter'].source", v1.Path);
|
||||
|
||||
JToken v2 = o.SelectToken(v1.Path);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user