-Tests
This commit is contained in:
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("6.0.0.0")]
|
// [assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyVersion("6.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("6.0.6.17819")]
|
[assembly: AssemblyFileVersion("6.0.6.17820")]
|
||||||
|
|||||||
@@ -4,88 +4,217 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
#if NETFX_CORE
|
||||||
|
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
|
||||||
|
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
|
||||||
|
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
|
||||||
|
#elif ASPNETCORE50
|
||||||
|
using Xunit;
|
||||||
|
using Test = Xunit.FactAttribute;
|
||||||
|
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||||
|
#else
|
||||||
|
using NUnit.Framework;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
|
namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
|
||||||
{
|
{
|
||||||
public class XmlJsonReader : JsonReader
|
public class XmlJsonReader : JsonReader
|
||||||
{
|
{
|
||||||
|
private readonly Stack<JTokenType> _stateStack;
|
||||||
private readonly XmlReader _reader;
|
private readonly XmlReader _reader;
|
||||||
|
|
||||||
|
private JTokenType? _valueType;
|
||||||
|
|
||||||
public XmlJsonReader(XmlReader reader)
|
public XmlJsonReader(XmlReader reader)
|
||||||
{
|
{
|
||||||
_reader = reader;
|
_reader = reader;
|
||||||
|
_stateStack = new Stack<JTokenType>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private JTokenType PeekState()
|
||||||
|
{
|
||||||
|
JTokenType current = (_stateStack.Count > 0) ? _stateStack.Peek() : JTokenType.None;
|
||||||
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
if (!_reader.Read())
|
if (HandleValueType())
|
||||||
return false;
|
return true;
|
||||||
|
|
||||||
switch (_reader.NodeType)
|
while (_reader.Read())
|
||||||
{
|
{
|
||||||
case XmlNodeType.Element:
|
switch (_reader.NodeType)
|
||||||
if (CurrentState == State.ObjectStart || CurrentState == State.Object)
|
{
|
||||||
{
|
case XmlNodeType.Element:
|
||||||
SetToken(JsonToken.PropertyName, _reader.LocalName);
|
string typeName = _reader.GetAttribute("type");
|
||||||
}
|
if (typeName == null)
|
||||||
else
|
throw new Exception("No type specified.");
|
||||||
{
|
|
||||||
SetToken(JsonToken.StartObject);
|
_valueType = (JTokenType)Enum.Parse(typeof(JTokenType), typeName, true);
|
||||||
}
|
|
||||||
break;
|
switch (PeekState())
|
||||||
case XmlNodeType.Text:
|
{
|
||||||
case XmlNodeType.CDATA:
|
case JTokenType.None:
|
||||||
SetToken(JsonToken.String, _reader.Value);
|
HandleValueType();
|
||||||
break;
|
return true;
|
||||||
case XmlNodeType.Comment:
|
case JTokenType.Object:
|
||||||
SetToken(JsonToken.Comment, _reader.Value);
|
SetToken(JsonToken.PropertyName, _reader.LocalName);
|
||||||
break;
|
_stateStack.Push(JTokenType.Property);
|
||||||
case XmlNodeType.Document:
|
return true;
|
||||||
break;
|
case JTokenType.Array:
|
||||||
case XmlNodeType.Whitespace:
|
case JTokenType.Constructor:
|
||||||
case XmlNodeType.SignificantWhitespace:
|
continue;
|
||||||
break;
|
default:
|
||||||
case XmlNodeType.EndElement:
|
throw new ArgumentOutOfRangeException();
|
||||||
break;
|
}
|
||||||
case XmlNodeType.EndEntity:
|
case XmlNodeType.EndElement:
|
||||||
break;
|
switch (_stateStack.Peek())
|
||||||
case XmlNodeType.XmlDeclaration:
|
{
|
||||||
break;
|
case JTokenType.Object:
|
||||||
default:
|
SetToken(JsonToken.EndObject);
|
||||||
throw new ArgumentOutOfRangeException();
|
_stateStack.Pop();
|
||||||
|
if (PeekState() == JTokenType.Property)
|
||||||
|
_stateStack.Pop();
|
||||||
|
return true;
|
||||||
|
case JTokenType.Array:
|
||||||
|
SetToken(JsonToken.EndArray);
|
||||||
|
_stateStack.Pop();
|
||||||
|
if (PeekState() == JTokenType.Property)
|
||||||
|
_stateStack.Pop();
|
||||||
|
return true;
|
||||||
|
case JTokenType.Constructor:
|
||||||
|
SetToken(JsonToken.EndConstructor);
|
||||||
|
_stateStack.Pop();
|
||||||
|
if (PeekState() == JTokenType.Property)
|
||||||
|
_stateStack.Pop();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
_stateStack.Pop();
|
||||||
|
if (PeekState() == JTokenType.Property)
|
||||||
|
_stateStack.Pop();
|
||||||
|
|
||||||
|
break;
|
||||||
|
case XmlNodeType.Text:
|
||||||
|
case XmlNodeType.CDATA:
|
||||||
|
switch (_valueType)
|
||||||
|
{
|
||||||
|
case JTokenType.Integer:
|
||||||
|
SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value));
|
||||||
|
break;
|
||||||
|
case JTokenType.Float:
|
||||||
|
SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value));
|
||||||
|
break;
|
||||||
|
case JTokenType.String:
|
||||||
|
case JTokenType.Uri:
|
||||||
|
case JTokenType.TimeSpan:
|
||||||
|
case JTokenType.Guid:
|
||||||
|
SetToken(JsonToken.String, _reader.Value);
|
||||||
|
break;
|
||||||
|
case JTokenType.Boolean:
|
||||||
|
SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value));
|
||||||
|
break;
|
||||||
|
case JTokenType.Date:
|
||||||
|
SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value));
|
||||||
|
break;
|
||||||
|
case JTokenType.Bytes:
|
||||||
|
SetToken(JsonToken.Bytes, Convert.FromBase64String(_reader.Value));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
_stateStack.Push(_valueType.Value);
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool HandleValueType()
|
||||||
|
{
|
||||||
|
switch (_valueType)
|
||||||
|
{
|
||||||
|
case JTokenType.Null:
|
||||||
|
SetToken(JsonToken.Null);
|
||||||
|
_valueType = null;
|
||||||
|
|
||||||
|
if (PeekState() == JTokenType.Property)
|
||||||
|
_stateStack.Pop();
|
||||||
|
return true;
|
||||||
|
case JTokenType.Object:
|
||||||
|
SetToken(JsonToken.StartObject);
|
||||||
|
_stateStack.Push(JTokenType.Object);
|
||||||
|
_valueType = null;
|
||||||
|
return true;
|
||||||
|
case JTokenType.Array:
|
||||||
|
SetToken(JsonToken.StartArray);
|
||||||
|
_stateStack.Push(JTokenType.Array);
|
||||||
|
_valueType = null;
|
||||||
|
return true;
|
||||||
|
case JTokenType.Constructor:
|
||||||
|
string constructorName = _reader.GetAttribute("name");
|
||||||
|
if (constructorName == null)
|
||||||
|
throw new Exception("No constructor name specified.");
|
||||||
|
|
||||||
|
SetToken(JsonToken.StartConstructor, constructorName);
|
||||||
|
_stateStack.Push(JTokenType.Constructor);
|
||||||
|
_valueType = null;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int? ReadAsInt32()
|
public override int? ReadAsInt32()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (Value != null) ? (int?)Convert.ToInt32(Value) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ReadAsString()
|
public override string ReadAsString()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (string)Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override byte[] ReadAsBytes()
|
public override byte[] ReadAsBytes()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (byte[])Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override decimal? ReadAsDecimal()
|
public override decimal? ReadAsDecimal()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (Value != null) ? (decimal?)Convert.ToDecimal(Value) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override DateTime? ReadAsDateTime()
|
public override DateTime? ReadAsDateTime()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (Value != null) ? (DateTime?)Convert.ToDateTime(Value) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override DateTimeOffset? ReadAsDateTimeOffset()
|
public override DateTimeOffset? ReadAsDateTimeOffset()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (!Read())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return (Value != null) ? (DateTimeOffset?)Convert.ToDateTime(Value) : null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,41 +222,233 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
|
|||||||
{
|
{
|
||||||
public void Example()
|
public void Example()
|
||||||
{
|
{
|
||||||
#region Usage
|
string xml = @"<Root type=""Object"">
|
||||||
StringBuilder sb = new StringBuilder();
|
<Null type=""Null"" />
|
||||||
StringWriter sw = new StringWriter(sb);
|
<String type=""String"">This is a string!</String>
|
||||||
|
<Char type=""String"">!</Char>
|
||||||
|
<Integer type=""Integer"">123</Integer>
|
||||||
|
<DateTime type=""Date"">2001-02-22T20:59:59Z</DateTime>
|
||||||
|
<DateTimeOffset type=""Date"">2001-02-22T20:59:59+12:00</DateTimeOffset>
|
||||||
|
<Float type=""Float"">1.1</Float>
|
||||||
|
<Double type=""Float"">3.14</Double>
|
||||||
|
<Decimal type=""Float"">19.95</Decimal>
|
||||||
|
<Guid type=""Guid"">d66eab59-3715-4b35-9e06-fa61c1216eaa</Guid>
|
||||||
|
<Uri type=""Uri"">http://james.newtonking.com</Uri>
|
||||||
|
<Array type=""Array"">
|
||||||
|
<Item type=""Integer"">1</Item>
|
||||||
|
<Item type=""Bytes"">SGVsbG8gd29ybGQh</Item>
|
||||||
|
<Item type=""Boolean"">True</Item>
|
||||||
|
</Array>
|
||||||
|
<Object type=""Object"">
|
||||||
|
<String type=""String"">This is a string!</String>
|
||||||
|
<Null type=""Null"" />
|
||||||
|
</Object>
|
||||||
|
<Constructor type=""Constructor"" name=""Date"">
|
||||||
|
<Item type=""Integer"">2000</Item>
|
||||||
|
<Item type=""Integer"">12</Item>
|
||||||
|
<Item type=""Integer"">30</Item>
|
||||||
|
</Constructor>
|
||||||
|
</Root>";
|
||||||
|
|
||||||
using (JsonWriter writer = new JsonTextWriter(sw))
|
StringReader sr = new StringReader(xml);
|
||||||
|
|
||||||
|
using (XmlReader xmlReader = XmlReader.Create(sr, new XmlReaderSettings { IgnoreWhitespace = true }))
|
||||||
|
using (XmlJsonReader reader = new XmlJsonReader(xmlReader))
|
||||||
{
|
{
|
||||||
writer.Formatting = Formatting.Indented;
|
JObject o = JObject.Load(reader);
|
||||||
|
//{
|
||||||
writer.WriteStartObject();
|
// "Null": null,
|
||||||
writer.WritePropertyName("CPU");
|
// "String": "This is a string!",
|
||||||
writer.WriteValue("Intel");
|
// "Char": "!",
|
||||||
writer.WritePropertyName("PSU");
|
// "Integer": 123,
|
||||||
writer.WriteValue("500W");
|
// "DateTime": "2001-02-23T09:59:59+13:00",
|
||||||
writer.WritePropertyName("Drives");
|
// "DateTimeOffset": "2001-02-22T21:59:59+13:00",
|
||||||
writer.WriteStartArray();
|
// "Float": 1.1,
|
||||||
writer.WriteValue("DVD read/writer");
|
// "Double": 3.14,
|
||||||
writer.WriteComment("(broken)");
|
// "Decimal": 19.95,
|
||||||
writer.WriteValue("500 gigabyte hard drive");
|
// "Guid": "d66eab59-3715-4b35-9e06-fa61c1216eaa",
|
||||||
writer.WriteValue("200 gigabype hard drive");
|
// "Uri": "http://james.newtonking.com",
|
||||||
writer.WriteEnd();
|
// "Array": [
|
||||||
writer.WriteEndObject();
|
// 1,
|
||||||
|
// "SGVsbG8gd29ybGQh",
|
||||||
|
// true
|
||||||
|
// ],
|
||||||
|
// "Object": {
|
||||||
|
// "String": "This is a string!",
|
||||||
|
// "Null": null
|
||||||
|
// },
|
||||||
|
// "Constructor": new Date(2000, 12, 30)
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
Console.WriteLine(sb.ToString());
|
using (XmlReader xmlReader = XmlReader.Create(new StringReader(xml), new XmlReaderSettings { IgnoreWhitespace = true }))
|
||||||
// {
|
using (XmlJsonReader reader = new XmlJsonReader(xmlReader))
|
||||||
// "CPU": "Intel",
|
{
|
||||||
// "PSU": "500W",
|
Assert.IsTrue(reader.Read());
|
||||||
// "Drives": [
|
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||||
// "DVD read/writer"
|
|
||||||
// /*(broken)*/,
|
Assert.IsTrue(reader.Read());
|
||||||
// "500 gigabyte hard drive",
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
// "200 gigabype hard drive"
|
Assert.AreEqual("Null", reader.Value);
|
||||||
// ]
|
|
||||||
// }
|
Assert.IsTrue(reader.Read());
|
||||||
#endregion
|
Assert.AreEqual(JsonToken.Null, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("String", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("This is a string!", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Char", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("!", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Integer", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
|
||||||
|
Assert.AreEqual(123, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("DateTime", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Date, reader.TokenType);
|
||||||
|
Assert.AreEqual(DateTime.Parse("2001-02-22T20:59:59Z"), reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("DateTimeOffset", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Date, reader.TokenType);
|
||||||
|
Assert.AreEqual(DateTime.Parse("2001-02-22T20:59:59+12:00"), reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Float", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(1.1d, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Double", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(3.14d, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Decimal", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(19.95d, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Guid", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("d66eab59-3715-4b35-9e06-fa61c1216eaa", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Uri", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("http://james.newtonking.com", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Array", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.AreEqual(1, reader.ReadAsInt32());
|
||||||
|
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
|
||||||
|
Assert.AreEqual(1, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
|
||||||
|
Assert.AreEqual(Encoding.UTF8.GetBytes("Hello world!"), reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Boolean, reader.TokenType);
|
||||||
|
Assert.AreEqual(true, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Object", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("String", reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual("This is a string!", reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("This is a string!", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Null", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Null, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||||
|
Assert.AreEqual("Constructor", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.StartConstructor, reader.TokenType);
|
||||||
|
Assert.AreEqual("Date", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
|
||||||
|
Assert.AreEqual(2000, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
|
||||||
|
Assert.AreEqual(12, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
|
||||||
|
Assert.AreEqual(30, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.EndConstructor, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.IsFalse(reader.Read());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -521,7 +521,7 @@ third line", jsonTextReader.Value);
|
|||||||
]content";
|
]content";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[2]);
|
reader.SetCharBuffer(new char[2]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -590,7 +590,7 @@ third line", jsonTextReader.Value);
|
|||||||
|
|
||||||
using (JsonTextReader jsonReader = new JsonTextReader(sr))
|
using (JsonTextReader jsonReader = new JsonTextReader(sr))
|
||||||
{
|
{
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
jsonReader.SetCharBuffer(new char[5]);
|
jsonReader.SetCharBuffer(new char[5]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -908,7 +908,7 @@ third line", jsonTextReader.Value);
|
|||||||
]";
|
]";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[129]);
|
reader.SetCharBuffer(new char[129]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1023,7 +1023,7 @@ third line", jsonTextReader.Value);
|
|||||||
";
|
";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[129]);
|
reader.SetCharBuffer(new char[129]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1566,7 +1566,7 @@ third line", jsonTextReader.Value);
|
|||||||
string json = @"[""\u003c"",""\u5f20""]";
|
string json = @"[""\u003c"",""\u5f20""]";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[2]);
|
reader.SetCharBuffer(new char[2]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1898,7 +1898,7 @@ third line", jsonTextReader.Value);
|
|||||||
string json = @"{""Message"":""Hi,I\u0092ve send you smth""}";
|
string json = @"{""Message"":""Hi,I\u0092ve send you smth""}";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[5]);
|
reader.SetCharBuffer(new char[5]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -2255,7 +2255,7 @@ third line", jsonTextReader.Value);
|
|||||||
]";
|
]";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[5]);
|
reader.SetCharBuffer(new char[5]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -2283,7 +2283,7 @@ third line", jsonTextReader.Value);
|
|||||||
} /*comment*/";
|
} /*comment*/";
|
||||||
|
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[5]);
|
reader.SetCharBuffer(new char[5]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -2303,7 +2303,7 @@ third line", jsonTextReader.Value);
|
|||||||
{
|
{
|
||||||
string json = "new Date\0()";
|
string json = "new Date\0()";
|
||||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
reader.SetCharBuffer(new char[7]);
|
reader.SetCharBuffer(new char[7]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -884,13 +884,24 @@ namespace Newtonsoft.Json.Tests
|
|||||||
Assert.AreEqual('\'', jsonWriter.QuoteChar);
|
Assert.AreEqual('\'', jsonWriter.QuoteChar);
|
||||||
|
|
||||||
jsonWriter.WriteStartObject();
|
jsonWriter.WriteStartObject();
|
||||||
|
|
||||||
jsonWriter.WritePropertyName("propertyName");
|
jsonWriter.WritePropertyName("propertyName");
|
||||||
jsonWriter.WriteValue(double.NaN);
|
jsonWriter.WriteValue(double.NaN);
|
||||||
|
|
||||||
|
jsonWriter.IndentChar = '?';
|
||||||
|
Assert.AreEqual('?', jsonWriter.IndentChar);
|
||||||
|
jsonWriter.Indentation = 6;
|
||||||
|
Assert.AreEqual(6, jsonWriter.Indentation);
|
||||||
|
|
||||||
|
jsonWriter.WritePropertyName("prop2");
|
||||||
|
jsonWriter.WriteValue(123);
|
||||||
|
|
||||||
jsonWriter.WriteEndObject();
|
jsonWriter.WriteEndObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
string expected = @"{
|
string expected = @"{
|
||||||
_____'propertyName': NaN
|
_____'propertyName': NaN,
|
||||||
|
??????'prop2': 123
|
||||||
}";
|
}";
|
||||||
string result = sb.ToString();
|
string result = sb.ToString();
|
||||||
|
|
||||||
|
|||||||
@@ -74,4 +74,4 @@ using System.Security;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
[assembly: AssemblyVersion("6.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("6.0.6.17819")]
|
[assembly: AssemblyFileVersion("6.0.6.17820")]
|
||||||
|
|||||||
@@ -7128,7 +7128,7 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if DEBUG && !NOINTERNALS
|
#if DEBUG
|
||||||
[Test]
|
[Test]
|
||||||
public void SerializeCustomTupleWithSerializableAttributeInPartialTrust()
|
public void SerializeCustomTupleWithSerializableAttributeInPartialTrust()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -91,5 +91,5 @@ using System.Security;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
[assembly: AssemblyVersion("6.0.0.0")]
|
[assembly: AssemblyVersion("6.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("6.0.6.17819")]
|
[assembly: AssemblyFileVersion("6.0.6.17820")]
|
||||||
[assembly: CLSCompliant(true)]
|
[assembly: CLSCompliant(true)]
|
||||||
|
|||||||
Reference in New Issue
Block a user