-Fixed deserializing with a TraceWriter when the reader is not at the start

This commit is contained in:
James Newton-King
2017-10-06 19:11:34 +13:00
parent 92d170a078
commit 6057d9b831
3 changed files with 105 additions and 12 deletions
@@ -33,7 +33,7 @@ using System.Threading.Tasks;
#endif
namespace Newtonsoft.Json.Tests.Serialization
{
{
public class Staff
{
public string Name { get; set; }
@@ -41,9 +41,86 @@ namespace Newtonsoft.Json.Tests.Serialization
public IList<string> Roles { get; set; }
}
public class RoleTrace
{
public string Name { get; set; }
}
[TestFixture]
public class TraceWriterTests : TestFixtureBase
{
[Test]
public void DeserializedJsonWithAlreadyReadReader()
{
string json = @"{ 'name': 'Admin' }{ 'name': 'Publisher' }";
IList<RoleTrace> roles = new List<RoleTrace>();
JsonTextReader reader = new JsonTextReader(new StringReader(json));
reader.SupportMultipleContent = true;
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter();
while (true)
{
if (!reader.Read())
{
break;
}
JsonSerializer serializer = new JsonSerializer();
//the next line raise an exception
serializer.TraceWriter = traceWriter;
RoleTrace role = serializer.Deserialize<RoleTrace>(reader);
roles.Add(role);
}
Assert.AreEqual("Admin", roles[0].Name);
Assert.AreEqual("Publisher", roles[1].Name);
StringAssert.AreEqual(@"Deserialized JSON:
{
""name"": ""Admin""
}", traceWriter.TraceRecords[2].Message);
StringAssert.AreEqual(@"Deserialized JSON:
{
""name"": ""Publisher""
}", traceWriter.TraceRecords[5].Message);
}
#if !(NET20 || NET35 || NET40 || PORTABLE40 || PORTABLE) || DNXCORE50
[Test]
public async Task DeserializedJsonWithAlreadyReadReader_Async()
{
string json = @"{ 'name': 'Admin' }{ 'name': 'Publisher' }";
IList<RoleTrace> roles = new List<RoleTrace>();
JsonTextReader reader = new JsonTextReader(new StringReader(json));
reader.SupportMultipleContent = true;
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter();
while (true)
{
if (!await reader.ReadAsync())
{
break;
}
JsonSerializer serializer = new JsonSerializer();
//the next line raise an exception
serializer.TraceWriter = traceWriter;
RoleTrace role = serializer.Deserialize<RoleTrace>(reader);
roles.Add(role);
}
Assert.AreEqual("Admin", roles[0].Name);
Assert.AreEqual("Publisher", roles[1].Name);
StringAssert.AreEqual(@"Deserialized JSON:
{
""name"": ""Admin""
}", traceWriter.TraceRecords[2].Message);
StringAssert.AreEqual(@"Deserialized JSON:
{
""name"": ""Publisher""
}", traceWriter.TraceRecords[5].Message);
}
#endif
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
[Test]
public void DiagnosticsTraceWriterTest()