-Added support for reading multiple pieces of JSON with a JsonReader

This commit is contained in:
James Newton-King
2013-12-07 22:06:37 +13:00
parent d5f606c435
commit b06f137513
3 changed files with 103 additions and 3 deletions
@@ -2194,6 +2194,54 @@ bye", reader.Value);
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
}
[Test]
public void SupportMultipleContent()
{
JsonTextReader reader = new JsonTextReader(new StringReader(@"1 2 ""name"" [][]null {}{} 1.1"));
reader.SupportMultipleContent = true;
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.String, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Null, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Float, reader.TokenType);
Assert.IsFalse(reader.Read());
}
[Test]
public void ParseBooleanWithNoExtraContent()
{
@@ -7280,6 +7280,35 @@ Parameter name: value",
}
#endif
public class MultipleItemsClass
{
public string Name { get; set; }
}
[Test]
public void MultipleItems()
{
IList<MultipleItemsClass> values = new List<MultipleItemsClass>();
JsonTextReader reader = new JsonTextReader(new StringReader(@"{ ""name"": ""bar"" }{ ""name"": ""baz"" }"));
reader.SupportMultipleContent = true;
while (true)
{
if (!reader.Read())
break;
JsonSerializer serializer = new JsonSerializer();
MultipleItemsClass foo = serializer.Deserialize<MultipleItemsClass>(reader);
values.Add(foo);
}
Assert.AreEqual(2, values.Count);
Assert.AreEqual("bar", values[0].Name);
Assert.AreEqual("baz", values[1].Name);
}
private class FooBar
{
public DateTimeOffset Foo { get; set; }