This commit is contained in:
James Newton-King
2017-10-22 17:48:28 +13:00
parent 4a74cf1b1a
commit 4494e523d5
2 changed files with 70 additions and 1 deletions
@@ -0,0 +1,69 @@
#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
#if !(PORTABLE) || NETSTANDARD2_0
using System;
using System.Data;
using System.Linq;
#if DNXCORE50
using Xunit;
using Test = Xunit.FactAttribute;
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
#else
using NUnit.Framework;
#endif
namespace Newtonsoft.Json.Tests.Issues
{
[TestFixture]
public class Issue1445 : TestFixtureBase
{
[Test]
public void Test()
{
DataTable dt = new DataTable();
dt.Columns.Add("First", typeof(string));
dt.Columns.Add("Second", typeof(string));
dt.Rows.Add("string1", "string2");
dt.Rows.Add("string1", (object)null);
object[][] data = dt.Select().Select(r => r.ItemArray).ToArray();
string json = JsonConvert.SerializeObject(data, Formatting.Indented);
StringAssert.AreEqual(@"[
[
""string1"",
""string2""
],
[
""string1"",
null
]
]", json);
}
}
}
#endif
@@ -2060,7 +2060,7 @@ namespace Newtonsoft.Json.Tests.Serialization
#endif
[Test]
public void DeserializeReadonlyArrayProperty()
public void DeserializeConstructorWithReadonlyArrayProperty()
{
string json = @"{""Endpoint"":""http://localhost"",""Name"":""account1"",""Dimensions"":[{""Key"":""Endpoint"",""Value"":""http://localhost""},{""Key"":""Name"",""Value"":""account1""}]}";