-Fixed error when deserializing null DataSet or DataTable properties

This commit is contained in:
James Newton-King
2015-06-30 15:04:43 +12:00
parent 20cc266712
commit 3613a89a56
4 changed files with 114 additions and 2 deletions
@@ -106,6 +106,53 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(2, dt.Rows.Count);
}
public class DataSetTestClass
{
public DataSet Set { get; set; }
}
[Test]
public void SerializeNull()
{
DataSetTestClass c1 = new DataSetTestClass
{
Set = null
};
string json = JsonConvert.SerializeObject(c1, Formatting.Indented);
StringAssert.AreEqual(@"{
""Set"": null
}", json);
DataSetTestClass c2 = JsonConvert.DeserializeObject<DataSetTestClass>(json);
Assert.AreEqual(null, c2.Set);
}
[Test]
public void SerializeNullRoot()
{
string json = JsonConvert.SerializeObject(null, typeof(DataSet), new JsonSerializerSettings
{
Formatting = Formatting.Indented
});
StringAssert.AreEqual(@"null", json);
}
[Test]
public void DeserializeNullTable()
{
string json = @"{
""TableName"": null
}";
DataSet ds = JsonConvert.DeserializeObject<DataSet>(json);
Assert.AreEqual(true, ds.Tables.Contains("TableName"));
}
[Test]
public void SerializeMultiTableDataSet()
{
@@ -454,6 +454,41 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual("432", dt[0].CustomerID);
}
public class DataTableTestClass
{
public DataTable Table { get; set; }
}
[Test]
public void SerializeNull()
{
DataTableTestClass c1 = new DataTableTestClass
{
Table = null
};
string json = JsonConvert.SerializeObject(c1, Formatting.Indented);
StringAssert.AreEqual(@"{
""Table"": null
}", json);
DataTableTestClass c2 = JsonConvert.DeserializeObject<DataTableTestClass>(json);
Assert.AreEqual(null, c2.Table);
}
[Test]
public void SerializeNullRoot()
{
string json = JsonConvert.SerializeObject(null, typeof(DataTable), new JsonSerializerSettings
{
Formatting = Formatting.Indented
});
StringAssert.AreEqual(@"null", json);
}
#if !(NET20 || PORTABLE || PORTABLE40)
[Test]
public void DeserializedTypedDataTableWithConverter()