Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user