This commit is contained in:
unknown
2014-06-26 16:13:44 +12:00
80 changed files with 1483 additions and 25288 deletions
@@ -150,8 +150,8 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
CollectionAssert.AreEqual(g.ToByteArray(), (byte[])reader.Value);
Assert.AreEqual(typeof(byte[]), reader.ValueType);
Assert.AreEqual(g, reader.Value);
Assert.AreEqual(typeof(Guid), reader.ValueType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
@@ -1603,5 +1603,80 @@ namespace Newtonsoft.Json.Tests.Bson
#endif
Assert.IsTrue(binder.BindToTypeCalled);
}
[Test]
public void GuidsShouldBeProperlyDeserialised()
{
Guid g = new Guid("822C0CE6-CC42-4753-A3C3-26F0684A4B88");
MemoryStream ms = new MemoryStream();
BsonWriter writer = new BsonWriter(ms);
writer.WriteStartObject();
writer.WritePropertyName("TheGuid");
writer.WriteValue(g);
writer.WriteEndObject();
writer.Flush();
byte[] bytes = ms.ToArray();
BsonReader reader = new BsonReader(new MemoryStream(bytes));
Assert.IsTrue(reader.Read());
Assert.IsTrue(reader.Read());
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
Assert.AreEqual(typeof(Guid), reader.ValueType);
Assert.AreEqual(g, (Guid)reader.Value);
Assert.IsTrue(reader.Read());
Assert.IsFalse(reader.Read());
JsonSerializer serializer = new JsonSerializer();
ObjectTestClass b = serializer.Deserialize<ObjectTestClass>(new BsonReader(new MemoryStream(bytes)));
Assert.AreEqual(typeof(Guid), b.TheGuid.GetType());
Assert.AreEqual(g, (Guid)b.TheGuid);
}
[Test]
public void GuidsShouldBeProperlyDeserialised_AsBytes()
{
Guid g = new Guid("822C0CE6-CC42-4753-A3C3-26F0684A4B88");
MemoryStream ms = new MemoryStream();
BsonWriter writer = new BsonWriter(ms);
writer.WriteStartObject();
writer.WritePropertyName("TheGuid");
writer.WriteValue(g);
writer.WriteEndObject();
writer.Flush();
byte[] bytes = ms.ToArray();
BsonReader reader = new BsonReader(new MemoryStream(bytes));
Assert.IsTrue(reader.Read());
Assert.IsTrue(reader.Read());
CollectionAssert.AreEquivalent(g.ToByteArray(), reader.ReadAsBytes());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
Assert.AreEqual(typeof(byte[]), reader.ValueType);
CollectionAssert.AreEquivalent(g.ToByteArray(), (byte[])reader.Value);
Assert.IsTrue(reader.Read());
Assert.IsFalse(reader.Read());
JsonSerializer serializer = new JsonSerializer();
BytesTestClass b = serializer.Deserialize<BytesTestClass>(new BsonReader(new MemoryStream(bytes)));
CollectionAssert.AreEquivalent(g.ToByteArray(), b.TheGuid);
}
public class BytesTestClass
{
public byte[] TheGuid { get; set; }
}
public class ObjectTestClass
{
public object TheGuid { get; set; }
}
}
}
@@ -23,7 +23,10 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
using System.IO;
using System.Text;
using Newtonsoft.Json.Bson;
using Newtonsoft.Json.Linq;
#if !(NETFX_CORE || PORTABLE || PORTABLE40)
using System;
using System.Collections.Generic;
@@ -57,7 +60,8 @@ namespace Newtonsoft.Json.Tests.Converters
],
""ArrayCol"": [
0
]
],
""DateCol"": ""2000-12-29T00:00:00Z""
},
{
""id"": 1,
@@ -69,7 +73,8 @@ namespace Newtonsoft.Json.Tests.Converters
],
""ArrayCol"": [
1
]
],
""DateCol"": ""2000-12-29T00:00:00Z""
}
]";
@@ -77,7 +82,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.IsNotNull(deserializedDataTable);
Assert.AreEqual(string.Empty, deserializedDataTable.TableName);
Assert.AreEqual(4, deserializedDataTable.Columns.Count);
Assert.AreEqual(5, deserializedDataTable.Columns.Count);
Assert.AreEqual("id", deserializedDataTable.Columns[0].ColumnName);
Assert.AreEqual(typeof(long), deserializedDataTable.Columns[0].DataType);
Assert.AreEqual("item", deserializedDataTable.Columns[1].ColumnName);
@@ -86,6 +91,8 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(typeof(DataTable), deserializedDataTable.Columns[2].DataType);
Assert.AreEqual("ArrayCol", deserializedDataTable.Columns[3].ColumnName);
Assert.AreEqual(typeof(long[]), deserializedDataTable.Columns[3].DataType);
Assert.AreEqual("DateCol", deserializedDataTable.Columns[4].ColumnName);
Assert.AreEqual(typeof(DateTime), deserializedDataTable.Columns[4].DataType);
Assert.AreEqual(2, deserializedDataTable.Rows.Count);
@@ -94,14 +101,57 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual("item 0", dr1["item"]);
Assert.AreEqual("0!", ((DataTable)dr1["DataTableCol"]).Rows[0]["NestedStringCol"]);
Assert.AreEqual(0, ((long[])dr1["ArrayCol"])[0]);
Assert.AreEqual(new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc), dr1["DateCol"]);
DataRow dr2 = deserializedDataTable.Rows[1];
Assert.AreEqual(1, dr2["id"]);
Assert.AreEqual("item 1", dr2["item"]);
Assert.AreEqual("1!", ((DataTable)dr2["DataTableCol"]).Rows[0]["NestedStringCol"]);
Assert.AreEqual(1, ((long[])dr2["ArrayCol"])[0]);
Assert.AreEqual(new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc), dr2["DateCol"]);
}
#if !NET20
[Test]
public void DeserializeParseHandling()
{
string json = @"[
{
""DateCol"": ""2000-12-29T00:00:00Z"",
""FloatCol"": 99.9999999999999999999
},
{
""DateCol"": ""2000-12-29T00:00:00Z"",
""FloatCol"": 99.9999999999999999999
}
]";
DataTable deserializedDataTable = JsonConvert.DeserializeObject<DataTable>(json, new JsonSerializerSettings
{
DateParseHandling = DateParseHandling.DateTimeOffset,
FloatParseHandling = FloatParseHandling.Decimal
});
Assert.IsNotNull(deserializedDataTable);
Assert.AreEqual(string.Empty, deserializedDataTable.TableName);
Assert.AreEqual(2, deserializedDataTable.Columns.Count);
Assert.AreEqual("DateCol", deserializedDataTable.Columns[0].ColumnName);
Assert.AreEqual(typeof(DateTimeOffset), deserializedDataTable.Columns[0].DataType);
Assert.AreEqual("FloatCol", deserializedDataTable.Columns[1].ColumnName);
Assert.AreEqual(typeof(decimal), deserializedDataTable.Columns[1].DataType);
Assert.AreEqual(2, deserializedDataTable.Rows.Count);
DataRow dr1 = deserializedDataTable.Rows[0];
Assert.AreEqual(new DateTimeOffset(2000, 12, 29, 0, 0, 0, TimeSpan.Zero), dr1["DateCol"]);
Assert.AreEqual(99.9999999999999999999m, dr1["FloatCol"]);
DataRow dr2 = deserializedDataTable.Rows[1];
Assert.AreEqual(new DateTimeOffset(2000, 12, 29, 0, 0, 0, TimeSpan.Zero), dr2["DateCol"]);
Assert.AreEqual(99.9999999999999999999m, dr2["FloatCol"]);
}
#endif
[Test]
public void Serialize()
{
@@ -225,6 +275,47 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(t1.TableName, t2.TableName);
}
[Test]
public void RoundtripBsonBytes()
{
Guid g = new Guid("EDE9A599-A7D9-44A9-9243-7C287049DD20");
var table = new DataTable();
table.Columns.Add("data", typeof(byte[]));
table.Columns.Add("id", typeof(Guid));
table.Rows.Add(Encoding.UTF8.GetBytes("Hello world!"), g);
JsonSerializer serializer = new JsonSerializer();
MemoryStream ms = new MemoryStream();
BsonWriter bw = new BsonWriter(ms);
serializer.Serialize(bw, table);
JToken o = JToken.ReadFrom(new BsonReader(new MemoryStream(ms.ToArray())) { ReadRootValueAsArray = true });
Assert.AreEqual(@"[
{
""data"": ""SGVsbG8gd29ybGQh"",
""id"": ""ede9a599-a7d9-44a9-9243-7c287049dd20""
}
]", o.ToString());
DataTable deserializedDataTable = serializer.Deserialize<DataTable>(new BsonReader(new MemoryStream(ms.ToArray())) { ReadRootValueAsArray = true });
Assert.AreEqual(string.Empty, deserializedDataTable.TableName);
Assert.AreEqual(2, deserializedDataTable.Columns.Count);
Assert.AreEqual("data", deserializedDataTable.Columns[0].ColumnName);
Assert.AreEqual(typeof(byte[]), deserializedDataTable.Columns[0].DataType);
Assert.AreEqual("id", deserializedDataTable.Columns[1].ColumnName);
Assert.AreEqual(typeof(Guid), deserializedDataTable.Columns[1].DataType);
Assert.AreEqual(1, deserializedDataTable.Rows.Count);
DataRow dr1 = deserializedDataTable.Rows[0];
CollectionAssert.AreEquivalent(Encoding.UTF8.GetBytes("Hello world!"), (byte[])dr1["data"]);
Assert.AreEqual(g, (Guid)dr1["id"]);
}
[Test]
public void SerializeDataTableWithNull()
{
@@ -406,7 +406,7 @@ namespace Newtonsoft.Json.Tests.Converters
[Test]
public void XmlDocumentTypeSerialize()
{
string xml = @"<?xml version=""1.0"" encoding=""utf-8""?><!DOCTYPE STOCKQUOTE PUBLIC ""-//W3C//DTD StockQuote 1.5//EN"" ""http://www.irxml.org/dtd/stockquote_1.5.dtd""><STOCKQUOTE ROWCOUNT=""2""><RESULT><ROW><ASK>0</ASK><BID>0</BID><CHANGE>-16.310</CHANGE><COMPANYNAME>Dow Jones</COMPANYNAME><DATETIME>2014-04-17 15:50:37</DATETIME><DIVIDEND>0</DIVIDEND><EPS>0</EPS><EXCHANGE></EXCHANGE><HIGH>16460.490</HIGH><LASTDATETIME>2014-04-17 15:50:37</LASTDATETIME><LASTPRICE>16408.540</LASTPRICE><LOW>16368.140</LOW><OPEN>16424.140</OPEN><PCHANGE>-0.099</PCHANGE><PE>0</PE><PREVIOUSCLOSE>16424.850</PREVIOUSCLOSE><SHARES>0</SHARES><TICKER>DJII</TICKER><TRADES>0</TRADES><VOLUME>136188700</VOLUME><YEARHIGH>11309.000</YEARHIGH><YEARLOW>9302.280</YEARLOW><YIELD>0</YIELD></ROW><ROW><ASK>0</ASK><BID>0</BID><CHANGE>9.290</CHANGE><COMPANYNAME>NASDAQ</COMPANYNAME><DATETIME>2014-04-17 15:40:01</DATETIME><DIVIDEND>0</DIVIDEND><EPS>0</EPS><EXCHANGE></EXCHANGE><HIGH>4110.460</HIGH><LASTDATETIME>2014-04-17 15:40:01</LASTDATETIME><LASTPRICE>4095.520</LASTPRICE><LOW>4064.700</LOW><OPEN>4080.300</OPEN><PCHANGE>0.227</PCHANGE><PE>0</PE><PREVIOUSCLOSE>4086.230</PREVIOUSCLOSE><SHARES>0</SHARES><TICKER>COMP</TICKER><TRADES>0</TRADES><VOLUME>1784210100</VOLUME><YEARHIGH>4371.710</YEARHIGH><YEARLOW>3154.960</YEARLOW><YIELD>0</YIELD></ROW></RESULT><STATUS>Couldn't find ticker: SPIC?</STATUS><STATUSCODE>2</STATUSCODE></STOCKQUOTE>";
string xml = @"<?xml version=""1.0"" encoding=""utf-8""?><!DOCTYPE STOCKQUOTE PUBLIC ""-//W3C//DTD StockQuote 1.5//EN"" ""http://www.idontexistnopenopewhatnope123.org/dtd/stockquote_1.5.dtd""><STOCKQUOTE ROWCOUNT=""2""><RESULT><ROW><ASK>0</ASK><BID>0</BID><CHANGE>-16.310</CHANGE><COMPANYNAME>Dow Jones</COMPANYNAME><DATETIME>2014-04-17 15:50:37</DATETIME><DIVIDEND>0</DIVIDEND><EPS>0</EPS><EXCHANGE></EXCHANGE><HIGH>16460.490</HIGH><LASTDATETIME>2014-04-17 15:50:37</LASTDATETIME><LASTPRICE>16408.540</LASTPRICE><LOW>16368.140</LOW><OPEN>16424.140</OPEN><PCHANGE>-0.099</PCHANGE><PE>0</PE><PREVIOUSCLOSE>16424.850</PREVIOUSCLOSE><SHARES>0</SHARES><TICKER>DJII</TICKER><TRADES>0</TRADES><VOLUME>136188700</VOLUME><YEARHIGH>11309.000</YEARHIGH><YEARLOW>9302.280</YEARLOW><YIELD>0</YIELD></ROW><ROW><ASK>0</ASK><BID>0</BID><CHANGE>9.290</CHANGE><COMPANYNAME>NASDAQ</COMPANYNAME><DATETIME>2014-04-17 15:40:01</DATETIME><DIVIDEND>0</DIVIDEND><EPS>0</EPS><EXCHANGE></EXCHANGE><HIGH>4110.460</HIGH><LASTDATETIME>2014-04-17 15:40:01</LASTDATETIME><LASTPRICE>4095.520</LASTPRICE><LOW>4064.700</LOW><OPEN>4080.300</OPEN><PCHANGE>0.227</PCHANGE><PE>0</PE><PREVIOUSCLOSE>4086.230</PREVIOUSCLOSE><SHARES>0</SHARES><TICKER>COMP</TICKER><TRADES>0</TRADES><VOLUME>1784210100</VOLUME><YEARHIGH>4371.710</YEARHIGH><YEARLOW>3154.960</YEARLOW><YIELD>0</YIELD></ROW></RESULT><STATUS>Couldn't find ticker: SPIC?</STATUS><STATUSCODE>2</STATUSCODE></STOCKQUOTE>";
string expected = @"{
""?xml"": {
@@ -416,7 +416,7 @@ namespace Newtonsoft.Json.Tests.Converters
""!DOCTYPE"": {
""@name"": ""STOCKQUOTE"",
""@public"": ""-//W3C//DTD StockQuote 1.5//EN"",
""@system"": ""http://www.irxml.org/dtd/stockquote_1.5.dtd""
""@system"": ""http://www.idontexistnopenopewhatnope123.org/dtd/stockquote_1.5.dtd""
},
""STOCKQUOTE"": {
""@ROWCOUNT"": ""2"",
@@ -480,6 +480,7 @@ namespace Newtonsoft.Json.Tests.Converters
}";
XmlDocument doc1 = new XmlDocument();
doc1.XmlResolver = null;
doc1.LoadXml(xml);
string json1 = JsonConvert.SerializeXmlNode(doc1, Formatting.Indented);
+171
View File
@@ -0,0 +1,171 @@
#region License
// Copyright (c) 2007 James Newton-King
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
// restriction, including without limitation the rights to use,
// copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Schema;
#if !NETFX_CORE
using NUnit.Framework;
#else
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif
namespace Newtonsoft.Json.Tests
{
[TestFixture]
public class DemoTests : TestFixtureBase
{
public class HtmlColor
{
public int Red { get; set; }
public int Green { get; set; }
public int Blue { get; set; }
}
[Test]
public void JsonConverter()
{
HtmlColor red = new HtmlColor
{
Red = 255,
Green = 0,
Blue = 0
};
string json = JsonConvert.SerializeObject(red, new JsonSerializerSettings
{
Formatting = Formatting.Indented
});
// {
// "Red": 255,
// "Green": 0,
// "Blue": 0
// }
json = JsonConvert.SerializeObject(red, new JsonSerializerSettings
{
Formatting = Formatting.Indented,
Converters = { new HtmlColorConverter() }
});
// "#FF0000"
HtmlColor r2 = JsonConvert.DeserializeObject<HtmlColor>(json, new JsonSerializerSettings
{
Formatting = Formatting.Indented,
Converters = { new HtmlColorConverter() }
});
Assert.AreEqual(255, r2.Red);
Assert.AreEqual(0, r2.Green);
Assert.AreEqual(0, r2.Blue);
Console.WriteLine(json);
}
public class PersonDemo
{
public string Name { get; set; }
public int Age { get; set; }
public string Job { get; set; }
}
public class Session
{
public string Name { get; set; }
public DateTime Date { get; set; }
}
[Test]
public void GenerateSchema()
{
JsonSchemaGenerator generator = new JsonSchemaGenerator();
JsonSchema schema = generator.Generate(typeof(Session));
// {
// "type": "object",
// "properties": {
// "Name": {
// "required": true,
// "type": [
// "string",
// "null"
// ]
// },
// "Date": {
// "required": true,
// "type": "string"
// }
// }
// }
}
public class HtmlColorConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
// create hex string from value
HtmlColor color = (HtmlColor)value;
string hexString = color.Red.ToString("X2")
+ color.Green.ToString("X2")
+ color.Blue.ToString("X2");
// write value to json
writer.WriteValue("#" + hexString);
}
//public override object ReadJson(JsonReader reader, Type objectType,
// object existingValue, JsonSerializer serializer)
//{
// throw new NotImplementedException();
//}
public override object ReadJson(JsonReader reader, Type objectType,
object existingValue, JsonSerializer serializer)
{
// get hex string
string hexString = (string)reader.Value;
hexString = hexString.TrimStart('#');
// build html color from hex
return new HtmlColor
{
Red = Convert.ToInt32(hexString.Substring(0, 2), 16),
Green = Convert.ToInt32(hexString.Substring(2, 2), 16),
Blue = Convert.ToInt32(hexString.Substring(4, 2), 16)
};
}
public override bool CanConvert(Type objectType)
{
return objectType == typeof(HtmlColor);
}
}
}
}
@@ -57,24 +57,24 @@ namespace Newtonsoft.Json.Tests.Documentation
{
#region IsValidBasic
string schemaJson = @"{
'description': 'A person',
'type': 'object',
'properties':
{
'name': {'type':'string'},
'hobbies': {
'type': 'array',
'items': {'type':'string'}
}
}
}";
'description': 'A person',
'type': 'object',
'properties':
{
'name': {'type':'string'},
'hobbies': {
'type': 'array',
'items': {'type':'string'}
}
}
}";
JsonSchema schema = JsonSchema.Parse(schemaJson);
JObject person = JObject.Parse(@"{
'name': 'James',
'hobbies': ['.NET', 'Blogging', 'Reading', 'Xbox', 'LOLCATS']
}");
'name': 'James',
'hobbies': ['.NET', 'Blogging', 'Reading', 'Xbox', 'LOLCATS']
}");
bool valid = person.IsValid(schema);
// true
@@ -45,9 +45,9 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Schema
// }
JObject person = JObject.Parse(@"{
'name': 'James',
'hobbies': ['.NET', 'Blogging', 'Reading', 'Xbox', 'LOLCATS']
}");
'name': 'James',
'hobbies': ['.NET', 'Blogging', 'Reading', 'Xbox', 'LOLCATS']
}");
bool valid = person.IsValid(schema);
@@ -26,6 +26,9 @@
using System;
using System.Collections.Generic;
using System.IO;
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
using System.Numerics;
#endif
using System.Runtime.Serialization;
using System.Text;
#if !(NET20 || NET35)
@@ -995,6 +998,45 @@ now brown cow?", '"', true);
Assert.AreEqual("Bad Boys", m.Name);
}
#if !NET20
[Test]
public void TestJsonDateTimeOffsetRoundtrip()
{
var now = DateTimeOffset.Now;
var dict = new Dictionary<string, object> { { "foo", now } };
var settings = new JsonSerializerSettings();
settings.DateFormatHandling = DateFormatHandling.IsoDateFormat;
settings.DateParseHandling = DateParseHandling.DateTimeOffset;
settings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
var json = JsonConvert.SerializeObject(dict, settings);
var newDict = new Dictionary<string, object>();
JsonConvert.PopulateObject(json, newDict, settings);
var date = newDict["foo"];
Assert.AreEqual(date, now);
}
#endif
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
[Test]
public void IntegerLengthOverflows()
{
// Maximum javascript number length (in characters) is 380
JObject o = JObject.Parse(@"{""biginteger"":" + new String('9', 380) + "}");
JValue v = (JValue)o["biginteger"];
Assert.AreEqual(JTokenType.Integer, v.Type);
Assert.AreEqual(typeof(BigInteger), v.Value.GetType());
Assert.AreEqual(BigInteger.Parse(new String('9', 380)), (BigInteger)v.Value);
ExceptionAssert.Throws<JsonReaderException>(
"JSON integer " + new String('9', 381) + " is too large to parse. Path 'biginteger', line 1, position 395.",
() => JObject.Parse(@"{""biginteger"":" + new String('9', 381) + "}"));
}
#endif
//[Test]
public void StackOverflowTest()
{
@@ -47,6 +47,27 @@ namespace Newtonsoft.Json.Tests
[TestFixture]
public class JsonTextReaderTest : TestFixtureBase
{
[Test]
public void ReadInvalidNonBase10Number()
{
string json = "0aq2dun13.hod";
JsonTextReader reader = new JsonTextReader(new StringReader(json));
ExceptionAssert.Throws<JsonReaderException>("Input string '0a' is not a valid number. Path '', line 1, position 2.",
() => { reader.Read(); });
reader = new JsonTextReader(new StringReader(json));
ExceptionAssert.Throws<JsonReaderException>("Input string '0a' is not a valid decimal. Path '', line 1, position 2.",
() => { reader.ReadAsDecimal(); });
reader = new JsonTextReader(new StringReader(json));
ExceptionAssert.Throws<JsonReaderException>("Input string '0a' is not a valid integer. Path '', line 1, position 2.",
() => { reader.ReadAsInt32(); });
}
[Test]
public void ThrowErrorWhenParsingUnquoteStringThatStartsWithNE()
{
@@ -75,6 +75,7 @@
<Compile Include="Converters\StringEnumConverterTests.cs" />
<Compile Include="Converters\VersionConverterTests.cs" />
<Compile Include="Converters\XmlNodeConverterTest.cs" />
<Compile Include="DemoTests.cs" />
<Compile Include="Documentation\ConditionalPropertiesTests.cs" />
<Compile Include="Documentation\ConvertingJsonAndXmlTests.cs" />
<Compile Include="Documentation\JsonNetVsWindowsDataJsonTests.cs" />
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.3.17312")]
[assembly: AssemblyFileVersion("6.0.3.17421")]
@@ -108,6 +108,35 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class ContractResolverTests : TestFixtureBase
{
[Test]
public void JsonPropertyDefaultValue()
{
JsonProperty p = new JsonProperty();
Assert.AreEqual(null, p.GetResolvedDefaultValue());
Assert.AreEqual(null, p.DefaultValue);
p.PropertyType = typeof(int);
Assert.AreEqual(0 , p.GetResolvedDefaultValue());
Assert.AreEqual(null, p.DefaultValue);
p.PropertyType = typeof(DateTime);
Assert.AreEqual(new DateTime(), p.GetResolvedDefaultValue());
Assert.AreEqual(null, p.DefaultValue);
p.PropertyType = null;
Assert.AreEqual(null, p.GetResolvedDefaultValue());
Assert.AreEqual(null, p.DefaultValue);
p.PropertyType = typeof(CompareOptions);
Assert.AreEqual(CompareOptions.None, (CompareOptions)p.GetResolvedDefaultValue());
Assert.AreEqual(null, p.DefaultValue);
}
[Test]
public void ListInterface()
{
@@ -46,6 +46,42 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class DefaultValueHandlingTests : TestFixtureBase
{
public class MyClass
{
[JsonIgnore]
public MyEnum Status { get; set; }
private string _data;
public string Data
{
get { return _data; }
set
{
_data = value;
if (_data != null && _data.StartsWith("Other"))
{
this.Status = MyEnum.Other;
}
}
}
}
public enum MyEnum
{
Default = 0,
Other
}
[Test]
public void PopulateWithJsonIgnoreAttribute()
{
string json = "{\"Data\":\"Other with some more text\"}";
MyClass result = JsonConvert.DeserializeObject<MyClass>(json, new JsonSerializerSettings() { DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate });
Assert.AreEqual(MyEnum.Other, result.Status);
}
[Test]
public void Include()
{
@@ -91,6 +91,26 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class JsonSerializerTest : TestFixtureBase
{
#if !NET20
[Test]
public void PopulateResetSettings()
{
JsonTextReader reader = new JsonTextReader(new StringReader(@"[""2000-01-01T01:01:01+00:00""]"));
Assert.AreEqual(DateParseHandling.DateTime, reader.DateParseHandling);
JsonSerializer serializer = new JsonSerializer();
serializer.DateParseHandling = DateParseHandling.DateTimeOffset;
IList<object> l = new List<object>();
serializer.Populate(reader, l);
Assert.AreEqual(typeof(DateTimeOffset), l[0].GetType());
Assert.AreEqual(new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero), l[0]);
Assert.AreEqual(DateParseHandling.DateTime, reader.DateParseHandling);
}
#endif
public class BaseClass
{
internal bool IsTransient { get; set; }
@@ -233,6 +253,56 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(input.Result, deserialized.Result);
}
[Test]
public void DeserializeJObjectWithComments()
{
string json = @"/* Test */
{
/*Test*/""A"":/* Test */true/* Test */,
/* Test */""B"":/* Test */false/* Test */,
/* Test */""C"":/* Test */[
/* Test */
1/* Test */
]/* Test */
}
/* Test */";
JObject o = (JObject)JsonConvert.DeserializeObject(json);
Assert.AreEqual(3, o.Count);
Assert.AreEqual(true, (bool)o["A"]);
Assert.AreEqual(false, (bool)o["B"]);
Assert.AreEqual(3, o["C"].Count());
Assert.AreEqual(JTokenType.Comment, o["C"][0].Type);
Assert.AreEqual(1, (int)o["C"][1]);
Assert.AreEqual(JTokenType.Comment, o["C"][2].Type);
Assert.IsTrue(JToken.DeepEquals(o, JObject.Parse(json)));
json = @"{/* Test */}";
o = (JObject)JsonConvert.DeserializeObject(json);
Assert.AreEqual(0, o.Count);
Assert.IsTrue(JToken.DeepEquals(o, JObject.Parse(json)));
json = @"{""A"": true/* Test */}";
o = (JObject)JsonConvert.DeserializeObject(json);
Assert.AreEqual(1, o.Count);
Assert.AreEqual(true, (bool)o["A"]);
Assert.IsTrue(JToken.DeepEquals(o, JObject.Parse(json)));
}
public class CommentTestObject
{
public bool? A { get; set; }
}
[Test]
public void DeserializeCommentTestObjectWithComments()
{
CommentTestObject o = JsonConvert.DeserializeObject<CommentTestObject>(@"{/* Test */}");
Assert.AreEqual(null, o.A);
o = JsonConvert.DeserializeObject<CommentTestObject>(@"{""A"": true/* Test */}");
Assert.AreEqual(true, o.A);
}
[Test]
public void JsonSerializerProperties()
{
@@ -2418,7 +2488,7 @@ keyword such as type of business.""
Assert.AreEqual("titleId", n.FidOrder[n.FidOrder.Count - 1]);
}
#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40)
#if !(NET20 || NETFX_CORE)
[MetadataType(typeof(OptInClassMetadata))]
public class OptInClass
{
@@ -5736,6 +5806,88 @@ To fix this error either change the environment to be fully trusted, change the
}
}
public class ReflectionContractResolver : DefaultContractResolver
{
protected override IValueProvider CreateMemberValueProvider(MemberInfo member)
{
return new ReflectionValueProvider(member);
}
}
[Test]
public void SerializeStaticDefault()
{
DefaultContractResolver contractResolver = new DefaultContractResolver();
StaticTestClass c = new StaticTestClass
{
x = int.MaxValue
};
StaticTestClass.y = 2;
StaticTestClass.z = 3;
string json = JsonConvert.SerializeObject(c, Formatting.Indented, new JsonSerializerSettings
{
ContractResolver = contractResolver
});
Assert.AreEqual(@"{
""x"": 2147483647,
""y"": 2,
""z"": 3
}", json);
StaticTestClass c2 = JsonConvert.DeserializeObject<StaticTestClass>(@"{
""x"": -1,
""y"": -2,
""z"": -3
}",
new JsonSerializerSettings
{
ContractResolver = contractResolver
});
Assert.AreEqual(-1, c2.x);
Assert.AreEqual(-2, StaticTestClass.y);
Assert.AreEqual(-3, StaticTestClass.z);
}
[Test]
public void SerializeStaticReflection()
{
ReflectionContractResolver contractResolver = new ReflectionContractResolver();
StaticTestClass c = new StaticTestClass
{
x = int.MaxValue
};
StaticTestClass.y = 2;
StaticTestClass.z = 3;
string json = JsonConvert.SerializeObject(c, Formatting.Indented, new JsonSerializerSettings
{
ContractResolver = contractResolver
});
Assert.AreEqual(@"{
""x"": 2147483647,
""y"": 2,
""z"": 3
}", json);
StaticTestClass c2 = JsonConvert.DeserializeObject<StaticTestClass>(@"{
""x"": -1,
""y"": -2,
""z"": -3
}",
new JsonSerializerSettings
{
ContractResolver = contractResolver
});
Assert.AreEqual(-1, c2.x);
Assert.AreEqual(-2, StaticTestClass.y);
Assert.AreEqual(-3, StaticTestClass.z);
}
#if !(NET20 || NETFX_CORE)
[Test]
public void DeserializeDecimalsWithCulture()
@@ -7857,6 +8009,76 @@ Parameter name: value",
Assert.AreEqual(dt, (DateTimeOffset)v.Value);
}
#endif
public class ErroringJsonConverter : JsonConverter
{
public ErroringJsonConverter(string s)
{
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
throw new NotImplementedException();
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}
public override bool CanConvert(Type objectType)
{
throw new NotImplementedException();
}
}
[JsonConverter(typeof(ErroringJsonConverter))]
public class ErroringTestClass
{
}
[Test]
public void ErrorCreatingJsonConverter()
{
ExceptionAssert.Throws<JsonException>(
"Error creating 'Newtonsoft.Json.Tests.Serialization.JsonSerializerTest+ErroringJsonConverter'.",
() => JsonConvert.SerializeObject(new ErroringTestClass()));
}
[Test]
public void DeserializeInvalidOctalRootError()
{
ExceptionAssert.Throws<JsonReaderException>(
"Input string '020474068' is not a valid number. Path '', line 1, position 9.",
() => JsonConvert.DeserializeObject<string>("020474068"));
}
[Test]
public void DeserializedDerivedWithPrivate()
{
string json = @"{
""DerivedProperty"": ""derived"",
""BaseProperty"": ""base""
}";
var d = JsonConvert.DeserializeObject<DerivedWithPrivate>(json);
Assert.AreEqual("base", d.BaseProperty);
Assert.AreEqual("derived", d.DerivedProperty);
}
}
public class DerivedWithPrivate : BaseWithPrivate
{
[JsonProperty]
public string DerivedProperty { get; private set; }
}
public class BaseWithPrivate
{
[JsonProperty]
public string BaseProperty { get; private set; }
}
public abstract class Test<T>
@@ -7986,4 +8208,22 @@ Parameter name: value",
public double Height { get; set; }
public decimal Price { get; set; }
}
[JsonObject(MemberSerialization.OptIn)]
public class StaticTestClass
{
[JsonProperty]
public int x = 1;
[JsonProperty]
public static int y = 2;
[JsonProperty]
public static int z { get; set; }
static StaticTestClass()
{
z = 3;
}
}
}
@@ -289,6 +289,66 @@ Newtonsoft.Json Error: 0 : Error!
Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
}
[Test]
public void Populate()
{
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter
{
LevelFilter = TraceLevel.Info
};
TraceTestObject o2 = new TraceTestObject();
JsonConvert.PopulateObject(@"{
""IntList"": [
1,
2
],
""StringArray"": [
""1"",
""2""
],
""Version"": {
""Major"": 1,
""Minor"": 2,
""Build"": 3,
""Revision"": 4,
""MajorRevision"": 0,
""MinorRevision"": 4
},
""StringDictionary"": {
""1"": ""!"",
""Two"": ""!!"",
""III"": ""!!!""
}
}",
o2,
new JsonSerializerSettings
{
TraceWriter = traceWriter
});
Assert.AreEqual(2, o2.IntList.Count);
Assert.AreEqual(2, o2.StringArray.Length);
Assert.AreEqual(1, o2.Version.Major);
Assert.AreEqual(2, o2.Version.Minor);
Assert.AreEqual(3, o2.StringDictionary.Count);
Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path 'IntList', line 2, position 13.", traceWriter.TraceRecords[0].Message);
Assert.AreEqual("Started deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 2, position 15.", traceWriter.TraceRecords[1].Message);
Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList'"));
Assert.AreEqual("Started deserializing System.String[]. Path 'StringArray', line 6, position 19.", traceWriter.TraceRecords[3].Message);
Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.String[]. Path 'StringArray'"));
Assert.AreEqual("Deserializing System.Version using creator with parameters: Major, Minor, Build, Revision. Path 'Version.Major', line 11, position 13.", traceWriter.TraceRecords[5].Message);
Assert.IsTrue(traceWriter.TraceRecords[6].Message.StartsWith("Started deserializing System.Version. Path 'Version'"));
Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Finished deserializing System.Version. Path 'Version'"));
Assert.AreEqual("Started deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary.1', line 19, position 9.", traceWriter.TraceRecords[8].Message);
Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary'"));
Assert.IsTrue(traceWriter.TraceRecords[10].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path ''"));
Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
}
[Test]
public void ErrorDeserializing()
{