-Added CurrentToken to JTokenWriter
-Added WriteToken(JsonToken, object) to JsonWriter
This commit is contained in:
@@ -825,6 +825,49 @@ namespace Newtonsoft.Json.Tests
|
||||
]", sb.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteTokenDirect()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.WriteToken(JsonToken.StartArray);
|
||||
jsonWriter.WriteToken(JsonToken.Integer, 1);
|
||||
jsonWriter.WriteToken(JsonToken.StartObject);
|
||||
jsonWriter.WriteToken(JsonToken.PropertyName, "string");
|
||||
jsonWriter.WriteToken(JsonToken.Integer, int.MaxValue);
|
||||
jsonWriter.WriteToken(JsonToken.EndObject);
|
||||
jsonWriter.WriteToken(JsonToken.EndArray);
|
||||
}
|
||||
|
||||
Assert.AreEqual(@"[1,{""string"":2147483647}]", sb.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteTokenDirect_BadValue()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.WriteToken(JsonToken.StartArray);
|
||||
|
||||
ExceptionAssert.Throws<FormatException>(() =>
|
||||
{
|
||||
jsonWriter.WriteToken(JsonToken.Integer, "three");
|
||||
}, "Input string was not in a correct format.");
|
||||
|
||||
ExceptionAssert.Throws<ArgumentNullException>(() =>
|
||||
{
|
||||
jsonWriter.WriteToken(JsonToken.Integer);
|
||||
}, @"Value cannot be null.
|
||||
Parameter name: value");
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BadWriteEndArray()
|
||||
{
|
||||
|
||||
@@ -140,6 +140,62 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CurrentToken()
|
||||
{
|
||||
using (JTokenWriter jsonWriter = new JTokenWriter())
|
||||
{
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
Assert.AreEqual(null, jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WriteStartObject();
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual(jsonWriter.Token, jsonWriter.CurrentToken);
|
||||
|
||||
JObject o = (JObject)jsonWriter.Token;
|
||||
|
||||
jsonWriter.WritePropertyName("CPU");
|
||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||
Assert.AreEqual(o.Property("CPU"), jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WriteValue("Intel");
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual(o["CPU"], jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WritePropertyName("Drives");
|
||||
Assert.AreEqual(WriteState.Property, jsonWriter.WriteState);
|
||||
Assert.AreEqual(o.Property("Drives"), jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WriteStartArray();
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
Assert.AreEqual(o["Drives"], jsonWriter.CurrentToken);
|
||||
|
||||
JArray a = (JArray)jsonWriter.CurrentToken;
|
||||
|
||||
jsonWriter.WriteValue("DVD read/writer");
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
|
||||
|
||||
#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40)
|
||||
jsonWriter.WriteValue(new BigInteger(123));
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
|
||||
#endif
|
||||
|
||||
jsonWriter.WriteValue(new byte[0]);
|
||||
Assert.AreEqual(WriteState.Array, jsonWriter.WriteState);
|
||||
Assert.AreEqual(a[a.Count - 1], jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WriteEnd();
|
||||
Assert.AreEqual(WriteState.Object, jsonWriter.WriteState);
|
||||
Assert.AreEqual(a, jsonWriter.CurrentToken);
|
||||
|
||||
jsonWriter.WriteEndObject();
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
Assert.AreEqual(o, jsonWriter.CurrentToken);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteComment()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user