-Added Serializable attribute to exceptions

-Fixed deserializing null values into DataTables
-Fixed error when deserializing readonly IEnumerable<T> array properties
-Fixed not including type name for byte[] values

4 files changed, 121 insertions, 3 deletions

diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs
index ffa3dcb..dcc9381 100644
--- a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs
@@ -107,7 +107,7 @@ namespace Newtonsoft.Json.Tests.Converters
     {

       public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)

       {

-        DataTable d = (DataTable) value;

+        DataTable d = (DataTable)value;

         writer.WriteValue(d.TableName);

       }

 

@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters
 

       public override bool CanConvert(Type objectType)

       {

-        return (objectType == typeof (DataTable));

+        return (objectType == typeof(DataTable));

       }

     }

 

@@ -136,6 +136,55 @@ namespace Newtonsoft.Json.Tests.Converters
       DataTable t2 = JsonConvert.DeserializeObject<DataTable>(json, new TestDataTableConverter());

       Assert.AreEqual(t1.TableName, t2.TableName);

     }

+

+    [Test]

+    public void SerializeDataTableWithNull()

+    {

+      var table = new DataTable();

+      table.Columns.Add("item");

+      table.Columns.Add("price", typeof(double));

+      table.Rows.Add("shirt", 49.99);

+      table.Rows.Add("pants", 54.99);

+      table.Rows.Add("shoes"); // no price

+

+      var json = JsonConvert.SerializeObject(table);

+      Assert.AreEqual(@"["

+      + @"{""item"":""shirt"",""price"":49.99},"

+      + @"{""item"":""pants"",""price"":54.99},"

+      + @"{""item"":""shoes"",""price"":null}]", json);

+    }

+

+    [Test]

+    public void DerializeDataTableWithImplicitNull()

+    {

+      const string json = @"["

+      + @"{""item"":""shirt"",""price"":49.99},"

+      + @"{""item"":""pants"",""price"":54.99},"

+      + @"{""item"":""shoes""}]";

+      var table = JsonConvert.DeserializeObject<DataTable>(json);

+      Assert.AreEqual("shirt", table.Rows[0]["item"]);

+      Assert.AreEqual("pants", table.Rows[1]["item"]);

+      Assert.AreEqual("shoes", table.Rows[2]["item"]);

+      Assert.AreEqual(49.99, (double)table.Rows[0]["price"], 0.01);

+      Assert.AreEqual(54.99, (double)table.Rows[1]["price"], 0.01);

+      Assert.IsInstanceOfType(typeof(System.DBNull), table.Rows[2]["price"]);

+    }

+

+    [Test]

+    public void DerializeDataTableWithExplicitNull()

+    {

+      const string json = @"["

+      + @"{""item"":""shirt"",""price"":49.99},"

+      + @"{""item"":""pants"",""price"":54.99},"

+      + @"{""item"":""shoes"",""price"":null}]";

+      var table = JsonConvert.DeserializeObject<DataTable>(json);

+      Assert.AreEqual("shirt", table.Rows[0]["item"]);

+      Assert.AreEqual("pants", table.Rows[1]["item"]);

+      Assert.AreEqual("shoes", table.Rows[2]["item"]);

+      Assert.AreEqual(49.99, (double)table.Rows[0]["price"], 0.01);

+      Assert.AreEqual(54.99, (double)table.Rows[1]["price"], 0.01);

+      Assert.IsInstanceOfType(typeof(System.DBNull), table.Rows[2]["price"]);

+    }

   }

 }

 #endif
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
index 89879d4..989d5e9 100644
--- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
@@ -41,5 +41,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:

 [assembly: AssemblyVersion("4.0.2.0")]

 #if !PocketPC

-[assembly: AssemblyFileVersion("4.0.2.13702")]

+[assembly: AssemblyFileVersion("4.0.2.13707")]

 #endif

diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index 634dd71..73c50a0 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -4310,5 +4310,24 @@ keyword such as type of business.""
       var withParameterisedConstructor = JsonConvert.DeserializeObject<DTOWithParameterisedConstructor>(json);

       Assert.AreEqual(withoutParameterisedConstructor.B, withParameterisedConstructor.B);

     }

+

+    public class EnumerableArrayPropertyClass

+    {

+      public IEnumerable<int> Numbers

+      {

+        get

+        {

+          return new[] { 1, 2, 3 }; //fails

+          //return new List<int>(new[] { 1, 2, 3 }); //works

+        }

+      }

+    }

+

+    [Test]

+    public void SkipPopulatingArrayPropertyClass()

+    {

+      string json = JsonConvert.SerializeObject(new EnumerableArrayPropertyClass());

+      JsonConvert.DeserializeObject<EnumerableArrayPropertyClass>(json);

+    }

   }

 }
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
index 715b939..198645c 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
@@ -703,6 +703,56 @@ namespace Newtonsoft.Json.Tests.Serialization
       }

     }

 

+    public class Car

+    {

+      // included in JSON

+      public string Model { get; set; }

+      public DateTime Year { get; set; }

+      public List<string> Features { get; set; }

+      public object[] Objects { get; set; }

+

+      // ignored

+      [JsonIgnore]

+      public DateTime LastModified { get; set; }

+    }

+

+    [Test]

+    public void ByteArrays()

+    {

+      Car testerObject = new Car();

+      byte[] data = new byte[] {75, 65, 82, 73, 82, 65};

+      testerObject.Objects = new object[] { data, "prueba" };

+

+      JsonSerializerSettings jsonSettings = new JsonSerializerSettings();

+      jsonSettings.NullValueHandling = NullValueHandling.Ignore;

+      jsonSettings.TypeNameHandling = TypeNameHandling.All;

+

+      string output = JsonConvert.SerializeObject(testerObject, Formatting.Indented, jsonSettings);

+

+      string carClassRef = ReflectionUtils.GetTypeName(typeof(Car), FormatterAssemblyStyle.Simple);

+

+      Assert.AreEqual(output, @"{

+  ""$type"": """ + carClassRef + @""",

+  ""Year"": ""\/Date(-62135596800000+1300)\/"",

+  ""Objects"": {

+    ""$type"": ""System.Object[], mscorlib"",

+    ""$values"": [

+      {

+        ""$type"": ""System.Byte[], mscorlib"",

+        ""$value"": ""S0FSSVJB""

+      },

+      ""prueba""

+    ]

+  }

+}");

+      Car obj = JsonConvert.DeserializeObject<Car>(output, jsonSettings);

+

+      Assert.IsNotNull(obj);

+

+      Assert.IsTrue(obj.Objects[0] is byte[]);

+

+      Assert.AreEqual(data, obj.Objects[0]);

+    }

   }

 

   public class Message