Extracted JsonNameTable for JsonTextReader (#1703)

This commit is contained in:
Ilya Grebnov
2018-06-21 10:22:33 +12:00
committed by James Newton-King
parent ebadeaf8e5
commit 2d5eba5599
8 changed files with 85 additions and 23 deletions
+28 -4
View File
@@ -174,11 +174,11 @@ namespace Newtonsoft.Json.Tests
reader.Read();
JsonTextReader jsonTextReader = (JsonTextReader)reader;
Assert.IsNotNull(jsonTextReader.NameTable);
Assert.IsNotNull(jsonTextReader.PropertyNameTable);
string s = serializer.Deserialize<string>(reader);
Assert.AreEqual("hi", s);
Assert.IsNotNull(jsonTextReader.NameTable);
Assert.IsNotNull(jsonTextReader.PropertyNameTable);
NameTableTestClass o = new NameTableTestClass
{
@@ -200,16 +200,40 @@ namespace Newtonsoft.Json.Tests
StringReader sr = new StringReader("{'property':'hi'}");
JsonTextReader jsonTextReader = new JsonTextReader(sr);
Assert.IsNull(jsonTextReader.NameTable);
Assert.IsNull(jsonTextReader.PropertyNameTable);
JsonSerializer serializer = new JsonSerializer();
serializer.Converters.Add(new NameTableTestClassConverter());
NameTableTestClass o = serializer.Deserialize<NameTableTestClass>(jsonTextReader);
Assert.IsNull(jsonTextReader.NameTable);
Assert.IsNull(jsonTextReader.PropertyNameTable);
Assert.AreEqual("hi", o.Value);
}
public class CustonNameTable : JsonNameTable
{
public override string Get(char[] key, int start, int length)
{
return "_" + new string(key, start, length);
}
}
[Test]
public void CustonNameTableTest()
{
StringReader sr = new StringReader("{'property':'hi'}");
JsonTextReader jsonTextReader = new JsonTextReader(sr);
Assert.IsNull(jsonTextReader.PropertyNameTable);
var nameTable = jsonTextReader.PropertyNameTable = new CustonNameTable();
JsonSerializer serializer = new JsonSerializer();
Dictionary<string, string> o = serializer.Deserialize<Dictionary<string, string>>(jsonTextReader);
Assert.AreEqual("hi", o["_property"]);
Assert.AreEqual(nameTable, jsonTextReader.PropertyNameTable);
}
[Test]
public void DefaultSettings_Example()
{