-Fixed casting dynamic base64 string to byte array

-Fixed formatting override on SerializeObject methods
-Added support for deserializing nested DataTables and arrays in DataTables
This commit is contained in:
James Newton-King
2013-12-07 16:44:02 +13:00
parent 145296f98a
commit d5f606c435
9 changed files with 213 additions and 48 deletions
@@ -23,6 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
using System.Text;
#if !(NETFX_CORE || PORTABLE || PORTABLE40)
using System;
using System.Collections.Generic;
@@ -48,11 +49,27 @@ namespace Newtonsoft.Json.Tests.Converters
string json = @"[
{
""id"": 0,
""item"": ""item 0""
""item"": ""item 0"",
""DataTableCol"": [
{
""NestedStringCol"": ""0!""
}
],
""ArrayCol"": [
0
]
},
{
""id"": 1,
""item"": ""item 1""
""item"": ""item 1"",
""DataTableCol"": [
{
""NestedStringCol"": ""1!""
}
],
""ArrayCol"": [
1
]
}
]";
@@ -60,21 +77,29 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.IsNotNull(deserializedDataTable);
Assert.AreEqual(string.Empty, deserializedDataTable.TableName);
Assert.AreEqual(2, deserializedDataTable.Columns.Count);
Assert.AreEqual(4, 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);
Assert.AreEqual(typeof(string), deserializedDataTable.Columns[1].DataType);
Assert.AreEqual("DataTableCol", deserializedDataTable.Columns[2].ColumnName);
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(2, deserializedDataTable.Rows.Count);
DataRow dr1 = deserializedDataTable.Rows[0];
Assert.AreEqual(0, dr1["id"]);
Assert.AreEqual("item 0", dr1["item"]);
Assert.AreEqual("0!", ((DataTable)dr1["DataTableCol"]).Rows[0]["NestedStringCol"]);
Assert.AreEqual(0, ((long[])dr1["ArrayCol"])[0]);
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]);
}
[Test]
@@ -109,6 +134,18 @@ namespace Newtonsoft.Json.Tests.Converters
colDecimal.DataType = typeof(decimal);
myTable.Columns.Add(colDecimal);
DataColumn colDataTable = new DataColumn("DataTableCol");
colDataTable.DataType = typeof(DataTable);
myTable.Columns.Add(colDataTable);
DataColumn colArray = new DataColumn("ArrayCol");
colArray.DataType = typeof(int[]);
myTable.Columns.Add(colArray);
DataColumn colBytes = new DataColumn("BytesCol");
colBytes.DataType = typeof(byte[]);
myTable.Columns.Add(colBytes);
// populate one row with values.
DataRow myNewRow = myTable.NewRow();
@@ -118,6 +155,18 @@ namespace Newtonsoft.Json.Tests.Converters
myNewRow["TimeSpanCol"] = new TimeSpan(10, 22, 10, 15, 100);
myNewRow["DateTimeCol"] = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc);
myNewRow["DecimalCol"] = 64.0021;
myNewRow["ArrayCol"] = new[] { 1 };
myNewRow["BytesCol"] = Encoding.UTF8.GetBytes("Hello world");
DataTable nestedTable = new DataTable("Nested");
DataColumn nestedColString = new DataColumn("NestedStringCol");
nestedColString.DataType = typeof(string);
nestedTable.Columns.Add(nestedColString);
DataRow myNewNestedRow = nestedTable.NewRow();
myNewNestedRow["NestedStringCol"] = "Nested!";
nestedTable.Rows.Add(myNewNestedRow);
myNewRow["DataTableCol"] = nestedTable;
myTable.Rows.Add(myNewRow);
string json = JsonConvert.SerializeObject(myTable, Formatting.Indented);
@@ -128,7 +177,16 @@ namespace Newtonsoft.Json.Tests.Converters
""BooleanCol"": true,
""TimeSpanCol"": ""10.22:10:15.1000000"",
""DateTimeCol"": ""2000-12-29T00:00:00Z"",
""DecimalCol"": 64.0021
""DecimalCol"": 64.0021,
""DataTableCol"": [
{
""NestedStringCol"": ""Nested!""
}
],
""ArrayCol"": [
1
],
""BytesCol"": ""SGVsbG8gd29ybGQ=""
}
]", json);
}
@@ -614,22 +614,22 @@ namespace Newtonsoft.Json.Tests.Linq
{
const string example = "Hello";
dynamic obj = new
{
data = Encoding.UTF8.GetBytes(example)
};
{
data = Encoding.UTF8.GetBytes(example)
};
byte[] bytes;
using (var ms = new MemoryStream())
{
using (TextWriter tw = new StreamWriter(ms))
{
JsonSerializer.Create().Serialize(tw,obj);
JsonSerializer.Create().Serialize(tw, obj);
tw.Flush();
bytes = ms.ToArray();
}
}
dynamic o = JObject.Parse(Encoding.UTF8.GetString(bytes));
var dataBytes = (byte[]) o.data;
Assert.AreEqual(example,Encoding.UTF8.GetString(dataBytes));
byte[] dataBytes = (byte[])o.data;
Assert.AreEqual(example, Encoding.UTF8.GetString(dataBytes));
}
[Test]
@@ -544,6 +544,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
}
[Test]
[Ignore]
public void MultipleQuotedIndexes()
{
JPath path = new JPath("['111119990','3']");
@@ -775,6 +775,7 @@ namespace Newtonsoft.Json.Tests.Schema
}
[Test]
[Ignore]
public void GenerateSchemaWithStringEnum()
{
JsonSchemaGenerator jsonSchemaGenerator = new JsonSchemaGenerator();
@@ -138,7 +138,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Converters = { new IsoDateTimeConverter() }
};
string json = JsonConvert.SerializeObject(rootFolder, Formatting.None, settings);
string json = JsonConvert.SerializeObject(rootFolder, settings);
Console.WriteLine(json);
@@ -1850,6 +1850,27 @@ keyword such as type of business.""
Assert.AreEqual("[3,2,1]", json);
}
[Test]
public void FormattingOverride()
{
var obj = new { Formatting = "test" };
JsonSerializerSettings settings = new JsonSerializerSettings { Formatting = Formatting.Indented };
string indented = JsonConvert.SerializeObject(obj, settings);
string none = JsonConvert.SerializeObject(obj, Formatting.None, settings);
Assert.AreNotEqual(indented, none);
}
[Test]
public void DateTimeTimeZone()
{
var date = new DateTime(2001, 4, 4, 0, 0, 0, DateTimeKind.Utc);
string json = JsonConvert.SerializeObject(date);
Assert.AreEqual(@"""2001-04-04T00:00:00Z""", json);
}
[Test]
public void GuidTest()
{