-Fixed JTokenWriter sometimes losing types when writing JToken
This commit is contained in:
@@ -249,6 +249,100 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
]", writer.Token.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteTokenWithParent()
|
||||
{
|
||||
JObject o = new JObject
|
||||
{
|
||||
["prop1"] = new JArray(1),
|
||||
["prop2"] = 1
|
||||
};
|
||||
|
||||
JTokenWriter writer = new JTokenWriter();
|
||||
|
||||
writer.WriteStartArray();
|
||||
|
||||
writer.WriteToken(o.CreateReader());
|
||||
|
||||
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||
|
||||
writer.WriteEndArray();
|
||||
|
||||
Console.WriteLine(writer.Token.ToString());
|
||||
|
||||
StringAssert.AreEqual(@"[
|
||||
{
|
||||
""prop1"": [
|
||||
1
|
||||
],
|
||||
""prop2"": 1
|
||||
}
|
||||
]", writer.Token.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteTokenWithPropertyParent()
|
||||
{
|
||||
JValue v = new JValue(1);
|
||||
|
||||
JTokenWriter writer = new JTokenWriter();
|
||||
|
||||
writer.WriteStartObject();
|
||||
writer.WritePropertyName("Prop1");
|
||||
|
||||
writer.WriteToken(v.CreateReader());
|
||||
|
||||
Assert.AreEqual(WriteState.Object, writer.WriteState);
|
||||
|
||||
writer.WriteEndObject();
|
||||
|
||||
StringAssert.AreEqual(@"{
|
||||
""Prop1"": 1
|
||||
}", writer.Token.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteValueTokenWithParent()
|
||||
{
|
||||
JValue v = new JValue(1);
|
||||
|
||||
JTokenWriter writer = new JTokenWriter();
|
||||
|
||||
writer.WriteStartArray();
|
||||
|
||||
writer.WriteToken(v.CreateReader());
|
||||
|
||||
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||
|
||||
writer.WriteEndArray();
|
||||
|
||||
StringAssert.AreEqual(@"[
|
||||
1
|
||||
]", writer.Token.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteEmptyToken()
|
||||
{
|
||||
JObject o = new JObject();
|
||||
JsonReader reader = o.CreateReader();
|
||||
while (reader.Read())
|
||||
{
|
||||
}
|
||||
|
||||
JTokenWriter writer = new JTokenWriter();
|
||||
|
||||
writer.WriteStartArray();
|
||||
|
||||
writer.WriteToken(reader);
|
||||
|
||||
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||
|
||||
writer.WriteEndArray();
|
||||
|
||||
StringAssert.AreEqual(@"[]", writer.Token.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteRawValue()
|
||||
{
|
||||
|
||||
@@ -55,6 +55,19 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
[TestFixture]
|
||||
public class LinqToJsonTest : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void ToObject_Guid()
|
||||
{
|
||||
JObject anon = new JObject
|
||||
{
|
||||
["id"] = Guid.NewGuid()
|
||||
};
|
||||
Assert.AreEqual(JTokenType.Guid, anon["id"].Type);
|
||||
|
||||
Dictionary<string, JToken> dict = anon.ToObject<Dictionary<string, JToken>>();
|
||||
Assert.AreEqual(JTokenType.Guid, dict["id"].Type);
|
||||
}
|
||||
|
||||
public class TestClass_ULong
|
||||
{
|
||||
public ulong Value { get; set; }
|
||||
|
||||
@@ -558,7 +558,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
ItemWithJTokens actual = (ItemWithJTokens)JsonConvert.DeserializeObject(@"{
|
||||
""Payload1"": 1,
|
||||
""Payload2"": {},
|
||||
""Payload2"": {'prop1':1,'prop2':[2]},
|
||||
""Payload3"": [1],
|
||||
""$type"": ""Newtonsoft.Json.Tests.Serialization.MetadataPropertyHandlingTests+ItemWithJTokens, Newtonsoft.Json.Tests""
|
||||
}",
|
||||
@@ -568,8 +568,16 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
TypeNameHandling = TypeNameHandling.All
|
||||
});
|
||||
|
||||
Assert.AreEqual(JTokenType.Integer, actual.Payload1.Type);
|
||||
Assert.AreEqual(1, (int)actual.Payload1);
|
||||
Assert.AreEqual(null, actual.Payload1.Parent);
|
||||
|
||||
Assert.AreEqual(JTokenType.Object, actual.Payload2.Type);
|
||||
Assert.AreEqual(1, (int)actual.Payload2["prop1"]);
|
||||
Assert.AreEqual(2, (int)actual.Payload2["prop2"][0]);
|
||||
Assert.AreEqual(null, actual.Payload2.Parent);
|
||||
|
||||
Assert.AreEqual(1, (int)actual.Payload3[0]);
|
||||
Assert.AreEqual(null, actual.Payload3.Parent);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user