Merge branch 'special-properties'

2014-03-01 18:39:42 +13:00
parent b62bdd97db f568413717
commit f6c74bdf3c
37 changed files with 983 additions and 179 deletions
@@ -2140,15 +2140,13 @@ keyword such as type of business.""
            });
            Assert.AreEqual(@"{""DefaultConverter"":""\/Date(0)\/"",""MemberConverter"":""1970-01-01T00:00:00Z""}", json);

-            ExceptionAssert.Throws<JsonReaderException>(
-                "Could not convert string to DateTime: /Date(0)/. Path 'DefaultConverter', line 1, position 33.",
-                () =>
-                {
-                    JsonConvert.DeserializeObject<MemberConverterClass>(json, new JsonSerializerSettings
-                    {
-                        DateParseHandling = DateParseHandling.None
-                    });
-                });
+            var m2 = JsonConvert.DeserializeObject<MemberConverterClass>(json, new JsonSerializerSettings
+            {
+                DateParseHandling = DateParseHandling.None
+            });
+
+            Assert.AreEqual(new DateTime(1970, 1, 1), m2.DefaultConverter);
+            Assert.AreEqual(new DateTime(1970, 1, 1), m2.MemberConverter);
        }

        [Test]
@@ -2386,19 +2384,22 @@ keyword such as type of business.""
        [Test]
        public void DeserializeRequiredMembersClassNullRequiredValueProperty()
        {
-            ExceptionAssert.Throws<JsonSerializationException>(
-                "Required property 'FirstName' expects a value but got null. Path '', line 6, position 2.",
-                () =>
-                {
-                    string json = @"{
+            try
+            {
+                string json = @"{
  ""FirstName"": null,
  ""MiddleName"": null,
  ""LastName"": null,
  ""BirthDate"": ""\/Date(977309755000)\/""
 }";

-                    JsonConvert.DeserializeObject<RequiredMembersClass>(json);
-                });
+                JsonConvert.DeserializeObject<RequiredMembersClass>(json);
+                Assert.Fail();
+            }
+            catch (JsonSerializationException ex)
+            {
+                Assert.IsTrue(ex.Message.StartsWith("Required property 'FirstName' expects a value but got null. Path ''"));
+            }
        }

        [Test]
@@ -2424,16 +2425,19 @@ keyword such as type of business.""
        [Test]
        public void RequiredMembersClassMissingRequiredProperty()
        {
-            ExceptionAssert.Throws<JsonSerializationException>(
-                "Required property 'LastName' not found in JSON. Path '', line 3, position 2.",
-                () =>
-                {
-                    string json = @"{
+            try
+            {
+                string json = @"{
  ""FirstName"": ""Bob""
 }";

-                    JsonConvert.DeserializeObject<RequiredMembersClass>(json);
-                });
+                JsonConvert.DeserializeObject<RequiredMembersClass>(json);
+                Assert.Fail();
+            }
+            catch (JsonSerializationException ex)
+            {
+                Assert.IsTrue(ex.Message.StartsWith("Required property 'LastName' not found in JSON. Path ''"));
+            }
        }

        [Test]
@@ -2672,10 +2676,17 @@ keyword such as type of business.""
        [Test]
        public void RequiredWhenUsingConstructor()
        {
-            string json = "{ 'testProperty1': 'value' }";
+            try
+            {
+                string json = "{ 'testProperty1': 'value' }";
+                JsonConvert.DeserializeObject<ConstructorAndRequiredTestClass>(json);

-            ExceptionAssert.Throws<JsonSerializationException>("Required property 'TestProperty2' not found in JSON. Path '', line 1, position 28.",
-                () => JsonConvert.DeserializeObject<ConstructorAndRequiredTestClass>(json));
+                Assert.Fail();
+            }
+            catch (JsonSerializationException ex)
+            {
+                Assert.IsTrue(ex.Message.StartsWith("Required property 'TestProperty2' not found in JSON. Path ''"));
+            }
        }

        [Test]
@@ -2969,16 +2980,16 @@ keyword such as type of business.""
        [Test]
        public void TypedObjectDeserializationWithComments()
        {
-            string json = @"/*comment*/ { /*comment*/
-        ""Name"": /*comment*/ ""Apple"" /*comment*/, /*comment*/
+            string json = @"/*comment1*/ { /*comment2*/
+        ""Name"": /*comment3*/ ""Apple"" /*comment4*/, /*comment5*/
        ""ExpiryDate"": ""\/Date(1230422400000)\/"",
        ""Price"": 3.99,
-        ""Sizes"": /*comment*/ [ /*comment*/
-          ""Small"", /*comment*/
-          ""Medium"" /*comment*/,
-          /*comment*/ ""Large""
-        /*comment*/ ] /*comment*/
-      } /*comment*/";
+        ""Sizes"": /*comment6*/ [ /*comment7*/
+          ""Small"", /*comment8*/
+          ""Medium"" /*comment9*/,
+          /*comment10*/ ""Large""
+        /*comment11*/ ] /*comment12*/
+      } /*comment13*/";

            Product deserializedProduct = (Product)JsonConvert.DeserializeObject(json, typeof(Product));

@@ -3392,11 +3403,17 @@ Path '', line 1, position 1.",
        {
            string json = @"{}";

-            ExceptionAssert.Throws<JsonSerializationException>(
-                @"Cannot deserialize the current JSON object (e.g. {""name"":""value""}) into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]' because the type requires a JSON array (e.g. [1,2,3]) to deserialize correctly.
+            try
+            {
+                JsonConvert.DeserializeObject<List<Person>>(json);
+                Assert.Fail();
+            }
+            catch (JsonSerializationException ex)
+            {
+                Assert.IsTrue(ex.Message.StartsWith(@"Cannot deserialize the current JSON object (e.g. {""name"":""value""}) into type 'System.Collections.Generic.List`1[Newtonsoft.Json.Tests.TestObjects.Person]' because the type requires a JSON array (e.g. [1,2,3]) to deserialize correctly.
 To fix this error either change the JSON to a JSON array (e.g. [1,2,3]) or change the deserialized type so that it is a normal .NET type (e.g. not a primitive type like integer, not a collection type like an array or List<T>) that can be deserialized from a JSON object. JsonObjectAttribute can also be added to the type to force it to deserialize from a JSON object.
-Path '', line 1, position 2.",
-                () => { JsonConvert.DeserializeObject<List<Person>>(json); });
+Path ''"));
+            }
        }

        [Test]
@@ -3615,17 +3632,21 @@ Path '', line 1, position 2.",
        [Test]
        public void DeserializePersonKeyedDictionary()
        {
-            ExceptionAssert.Throws<JsonSerializationException>("Could not convert string 'Newtonsoft.Json.Tests.TestObjects.Person' to dictionary key type 'Newtonsoft.Json.Tests.TestObjects.Person'. Create a TypeConverter to convert from the string to the key type object. Path 'Newtonsoft.Json.Tests.TestObjects.Person', line 2, position 46.",
-                () =>
-                {
-                    string json =
-                        @"{
+            try
+            {
+                string json =
+                    @"{
  ""Newtonsoft.Json.Tests.TestObjects.Person"": 1,
  ""Newtonsoft.Json.Tests.TestObjects.Person"": 2
 }";

-                    JsonConvert.DeserializeObject<Dictionary<Person, int>>(json);
-                });
+                JsonConvert.DeserializeObject<Dictionary<Person, int>>(json);
+                Assert.Fail();
+            }
+            catch (JsonSerializationException ex)
+            {
+                Assert.IsTrue(ex.Message.StartsWith("Could not convert string 'Newtonsoft.Json.Tests.TestObjects.Person' to dictionary key type 'Newtonsoft.Json.Tests.TestObjects.Person'. Create a TypeConverter to convert from the string to the key type object. Path 'Newtonsoft.Json.Tests.TestObjects.Person'"));
+            }
        }

        [Test]
@@ -3899,7 +3920,11 @@ Path '', line 1, position 2.",
            string json = "{'$id':'1',key1:'value1',key2:'value2',key3:'value3'}";

            ExceptionAssert.Throws<JsonSerializationException>("Cannot preserve reference to readonly dictionary, or dictionary created from a non-default constructor: Newtonsoft.Json.Tests.Serialization.JsonSerializerTest+DictionaryWithNoDefaultConstructor. Path 'key1', line 1, position 16.",
-                () => JsonConvert.DeserializeObject<DictionaryWithNoDefaultConstructor>(json, new JsonSerializerSettings { PreserveReferencesHandling = PreserveReferencesHandling.All }));
+                () => JsonConvert.DeserializeObject<DictionaryWithNoDefaultConstructor>(json, new JsonSerializerSettings
+                {
+                    PreserveReferencesHandling = PreserveReferencesHandling.All,
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                }));
        }

        public class DictionaryWithNoDefaultConstructor : Dictionary<string, string>
@@ -5045,7 +5070,10 @@ To fix this error either change the environment to be fully trusted, change the
            child.Add("Name", "Isabell");
            child.Add("Father", reference);

-            var json = JsonConvert.SerializeObject(child);
+            string json = JsonConvert.SerializeObject(child);
+
+            Console.WriteLine(json);
+
            Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);

            Assert.AreEqual(3, result.Count);
@@ -5488,7 +5516,14 @@ To fix this error either change the environment to be fully trusted, change the
            });

            Assert.AreEqual("{\"Offset\":\"2000-01-01T00:00:00+06:00\"}", serializeObject);
-            var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
+
+            JsonTextReader reader = new JsonTextReader(new StringReader(serializeObject));
+            reader.DateParseHandling = DateParseHandling.None;
+            
+            JsonSerializer serializer = new JsonSerializer();
+
+            var deserializeObject = serializer.Deserialize<TimeZoneOffsetObject>(reader);
+
            Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
            Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date);
        }
@@ -5509,7 +5544,14 @@ To fix this error either change the environment to be fully trusted, change the
            }, Formatting.None, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat });

            Assert.AreEqual("{\"Offset\":\"\\/Date(946663200000+0600)\\/\"}", serializeObject);
-            var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
+
+            JsonTextReader reader = new JsonTextReader(new StringReader(serializeObject));
+
+            JsonSerializer serializer = new JsonSerializer();
+            serializer.DateParseHandling = DateParseHandling.None;
+
+            var deserializeObject = serializer.Deserialize<TimeZoneOffsetObject>(reader);
+
            Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
            Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date);
        }
@@ -5604,7 +5646,12 @@ To fix this error either change the environment to be fully trusted, change the
        public void DeserializeDecimalPropertyExact()
        {
            string json = "{Amount:123456789876543.21}";
-            Invoice i = JsonConvert.DeserializeObject<Invoice>(json);
+            JsonTextReader reader = new JsonTextReader(new StringReader(json));
+            reader.FloatParseHandling = FloatParseHandling.Decimal;
+
+            JsonSerializer serializer = new JsonSerializer();
+
+            Invoice i = serializer.Deserialize<Invoice>(reader);
            Assert.AreEqual(123456789876543.21m, i.Amount);
        }

@@ -5620,7 +5667,12 @@ To fix this error either change the environment to be fully trusted, change the
        public void DeserializeDecimalDictionaryExact()
        {
            string json = "{'Value':123456789876543.21}";
-            IDictionary<string, decimal> d = JsonConvert.DeserializeObject<IDictionary<string, decimal>>(json);
+            JsonTextReader reader = new JsonTextReader(new StringReader(json));
+            reader.FloatParseHandling = FloatParseHandling.Decimal;
+
+            JsonSerializer serializer = new JsonSerializer();
+
+            IDictionary<string, decimal> d = serializer.Deserialize<IDictionary<string, decimal>>(reader);
            Assert.AreEqual(123456789876543.21m, d["Value"]);
        }

@@ -5835,11 +5887,11 @@ To fix this error either change the environment to be fully trusted, change the
        }

        [Test]
-        public void OnError()
+        public void DeserializeMinValueDecimal()
        {
            var data = new DecimalTest(decimal.MinValue);
            var json = JsonConvert.SerializeObject(data);
-            var obj = JsonConvert.DeserializeObject<DecimalTest>(json);
+            var obj = JsonConvert.DeserializeObject<DecimalTest>(json, new JsonSerializerSettings { SpecialPropertyHandling = SpecialPropertyHandling.Default });

            Assert.AreEqual(decimal.MinValue, obj.Value);
        }
@@ -6998,8 +7050,8 @@ To fix this error either change the environment to be fully trusted, change the
        [Test]
        public void DeserializeUnexpectedEndInt()
        {
-            ExceptionAssert.Throws<JsonSerializationException>(
-                "Unexpected end when setting PreProperty's value. Path 'PreProperty', line 2, position 18.",
+            ExceptionAssert.Throws<JsonException>(
+                null,
                () =>
                {
                    string json = @"{
@@ -7436,10 +7488,10 @@ Parameter name: value",

            Assert.IsNotNull(o);
            Assert.AreEqual(4, errors.Count);
-            Assert.AreEqual("Required property 'NonAttributeProperty' not found in JSON. Path '', line 1, position 2.", errors[0]);
-            Assert.AreEqual("Required property 'UnsetProperty' not found in JSON. Path '', line 1, position 2.", errors[1]);
-            Assert.AreEqual("Required property 'AllowNullProperty' not found in JSON. Path '', line 1, position 2.", errors[2]);
-            Assert.AreEqual("Required property 'AlwaysProperty' not found in JSON. Path '', line 1, position 2.", errors[3]);
+            Assert.IsTrue(errors[0].StartsWith("Required property 'NonAttributeProperty' not found in JSON. Path ''"));
+            Assert.IsTrue(errors[1].StartsWith("Required property 'UnsetProperty' not found in JSON. Path ''"));
+            Assert.IsTrue(errors[2].StartsWith("Required property 'AllowNullProperty' not found in JSON. Path ''"));
+            Assert.IsTrue(errors[3].StartsWith("Required property 'AlwaysProperty' not found in JSON. Path ''"));
        }

        [Test]
@@ -7461,9 +7513,9 @@ Parameter name: value",

            Assert.IsNotNull(o);
            Assert.AreEqual(3, errors.Count);
-            Assert.AreEqual("Required property 'NonAttributeProperty' expects a value but got null. Path '', line 1, position 97.", errors[0]);
-            Assert.AreEqual("Required property 'UnsetProperty' expects a value but got null. Path '', line 1, position 97.", errors[1]);
-            Assert.AreEqual("Required property 'AlwaysProperty' expects a value but got null. Path '', line 1, position 97.", errors[2]);
+            Assert.IsTrue(errors[0].StartsWith("Required property 'NonAttributeProperty' expects a value but got null. Path ''"));
+            Assert.IsTrue(errors[1].StartsWith("Required property 'UnsetProperty' expects a value but got null. Path ''"));
+            Assert.IsTrue(errors[2].StartsWith("Required property 'AlwaysProperty' expects a value but got null. Path ''"));
        }

        [Test]
@@ -8593,8 +8645,8 @@ Parameter name: value",
        {
            string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/[1/*hi*/,/*hi*/1/*hi*/,1]/*hi*/,/*hi*/[1,1";

-            ExceptionAssert.Throws<JsonSerializationException>(
-                "Unexpected end when deserializing array. Path 'Coordinates[0][1][1]', line 1, position 90.",
+            ExceptionAssert.Throws<JsonException>(
+                null,
                () => JsonConvert.DeserializeObject<Array3D>(json));
        }

@@ -8603,8 +8655,8 @@ Parameter name: value",
        {
            string json = @"{""Before"":""Before!"",""Coordinates"":[/*hi*/[/*hi*/";

-            ExceptionAssert.Throws<JsonSerializationException>(
-                "Unexpected end when deserializing array. Path 'Coordinates[0]', line 1, position 48.",
+            ExceptionAssert.Throws<JsonException>(
+                null,
                () => JsonConvert.DeserializeObject<Array3D>(json));
        }

@@ -295,7 +295,11 @@ namespace Newtonsoft.Json.Tests.Serialization
                () =>
                {
                    JsonConvert.DeserializeObject<string[][]>(json,
-                        new JsonSerializerSettings { PreserveReferencesHandling = PreserveReferencesHandling.All });
+                        new JsonSerializerSettings
+                        {
+                            PreserveReferencesHandling = PreserveReferencesHandling.All,
+                            SpecialPropertyHandling = SpecialPropertyHandling.Default
+                        });
                });
        }

@@ -1063,7 +1067,10 @@ namespace Newtonsoft.Json.Tests.Serialization

            ExceptionAssert.Throws<JsonSerializationException>(
                "Error reading object reference '1'. Path 'Data.Prop2.MyProperty', line 9, position 20.",
-                () => JsonConvert.DeserializeObject<PropertyItemIsReferenceObject>(json));
+                () => JsonConvert.DeserializeObject<PropertyItemIsReferenceObject>(json, new JsonSerializerSettings
+                {
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                }));
        }
    }

@@ -407,6 +407,7 @@ namespace Newtonsoft.Json.Tests.Serialization
            string json = "{}";
            List<string> errors = new List<string>();
            JsonSerializer serializer = new JsonSerializer();
+            serializer.SpecialPropertyHandling = SpecialPropertyHandling.Default;
            serializer.Error += delegate(object sender, ErrorEventArgs args)
            {
                errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
@@ -415,8 +416,8 @@ namespace Newtonsoft.Json.Tests.Serialization
            serializer.Deserialize(new JsonTextReader(new StringReader(json)), typeof(MyTypeWithRequiredMembers));

            Assert.AreEqual(2, errors.Count);
-            Assert.AreEqual(" - Required1 - Required property 'Required1' not found in JSON. Path '', line 1, position 2.", errors[0]);
-            Assert.AreEqual(" - Required2 - Required property 'Required2' not found in JSON. Path '', line 1, position 2.", errors[1]);
+            Assert.IsTrue(errors[0].StartsWith(" - Required1 - Required property 'Required1' not found in JSON. Path '', line 1, position 2."));
+            Assert.IsTrue(errors[1].StartsWith(" - Required2 - Required property 'Required2' not found in JSON. Path '', line 1, position 2."));
        }

        [Test]
@@ -539,6 +540,7 @@ namespace Newtonsoft.Json.Tests.Serialization
                "{'badarray':[0,x,2],'goodarray':[0,1,2]}",
                new JsonSerializerSettings
                {
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default,
                    Error = (sender, arg) =>
                    {
                        errors.Add(arg.ErrorContext.Error.Message);
@@ -565,7 +567,11 @@ namespace Newtonsoft.Json.Tests.Serialization
            const int maxDepth = 256;
            using (var jsonTextReader = new JsonTextReader(new StringReader(input)) { MaxDepth = maxDepth })
            {
-                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings { MaxDepth = maxDepth });
+                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings
+                {
+                    MaxDepth = maxDepth,
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                });
                jsonSerializer.Error += (sender, e) =>
                {
                    errors.Add(e.ErrorContext.Error.Message);
@@ -595,7 +601,7 @@ namespace Newtonsoft.Json.Tests.Serialization
            const int maxDepth = 256;
            using (var jsonTextReader = new JsonTextReader(new StringReader(input)) { MaxDepth = maxDepth })
            {
-                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings { MaxDepth = maxDepth });
+                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings { MaxDepth = maxDepth, SpecialPropertyHandling = SpecialPropertyHandling.Default });
                jsonSerializer.Error += (sender, e) =>
                {
                    errors.Add(e.ErrorContext.Error.Message);
@@ -634,7 +640,8 @@ namespace Newtonsoft.Json.Tests.Serialization
                {
                    errors.Add(e.ErrorContext.Error.Message);
                    e.ErrorContext.Handled = true;
-                }
+                },
+                SpecialPropertyHandling = SpecialPropertyHandling.Default
            });
            Assert.AreEqual(true, newDynamicObject.Explicit);

@@ -0,0 +1,373 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization.Formatters;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Tests.TestObjects;
+using Newtonsoft.Json.Utilities;
+using NUnit.Framework;
+
+namespace Newtonsoft.Json.Tests.Serialization
+{
+    [TestFixture]
+    public class SpecialPropertyHandlingTests : TestFixtureBase
+    {
+        [Test]
+        public void DeserializeArraysWithPreserveObjectReferences()
+        {
+            string json = @"{
+  ""$id"": ""1"",
+  ""$values"": [
+    null,
+    {
+      ""$id"": ""2"",
+      ""$values"": [
+        null
+      ]
+    },
+    {
+      ""$id"": ""3"",
+      ""$values"": [
+        {
+          ""$id"": ""4"",
+          ""$values"": [
+            {
+              ""$ref"": ""1""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}";
+
+            ExceptionAssert.Throws<JsonSerializationException>(
+                @"Cannot preserve reference to array or readonly list, or list created from a non-default constructor: System.String[][]. Path '$values', line 3, position 15.",
+                () =>
+                {
+                    JsonConvert.DeserializeObject<string[][]>(json,
+                        new JsonSerializerSettings
+                        {
+                            PreserveReferencesHandling = PreserveReferencesHandling.All,
+                            SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                        });
+                });
+        }
+
+#if !NETFX_CORE
+        [Test]
+        public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid()
+        {
+            const string contextKey = "k1";
+            var someValue = Guid.NewGuid();
+
+            Dictionary<string, Guid> inputContext = new Dictionary<string, Guid>();
+            inputContext.Add(contextKey, someValue);
+
+            JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings()
+            {
+                Formatting = Formatting.Indented,
+                TypeNameHandling = TypeNameHandling.All,
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            };
+            string serializedString = JsonConvert.SerializeObject(inputContext, jsonSerializerSettings);
+
+            Console.WriteLine(serializedString);
+
+            var deserializedObject = (Dictionary<string, Guid>)JsonConvert.DeserializeObject(serializedString, jsonSerializerSettings);
+
+            Assert.AreEqual(someValue, deserializedObject[contextKey]);
+        }
+#endif
+
+        [Test]
+        public void DeserializeGuid()
+        {
+            Item expected = new Item()
+            {
+                SourceTypeID = new Guid("d8220a4b-75b1-4b7a-8112-b7bdae956a45"),
+                BrokerID = new Guid("951663c4-924e-4c86-a57a-7ed737501dbd"),
+                Latitude = 33.657145,
+                Longitude = -117.766684,
+                TimeStamp = new DateTime(2000, 3, 1, 23, 59, 59, DateTimeKind.Utc),
+                Payload = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }
+            };
+
+            string jsonString = JsonConvert.SerializeObject(expected, Formatting.Indented);
+
+            Assert.AreEqual(@"{
+  ""SourceTypeID"": ""d8220a4b-75b1-4b7a-8112-b7bdae956a45"",
+  ""BrokerID"": ""951663c4-924e-4c86-a57a-7ed737501dbd"",
+  ""Latitude"": 33.657145,
+  ""Longitude"": -117.766684,
+  ""TimeStamp"": ""2000-03-01T23:59:59Z"",
+  ""Payload"": {
+    ""$type"": ""System.Byte[], mscorlib"",
+    ""$value"": ""AAECAwQFBgcICQ==""
+  }
+}", jsonString);
+
+            Item actual = JsonConvert.DeserializeObject<Item>(jsonString, new JsonSerializerSettings
+            {
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            });
+
+            Assert.AreEqual(new Guid("d8220a4b-75b1-4b7a-8112-b7bdae956a45"), actual.SourceTypeID);
+            Assert.AreEqual(new Guid("951663c4-924e-4c86-a57a-7ed737501dbd"), actual.BrokerID);
+            byte[] bytes = (byte[])actual.Payload;
+            CollectionAssert.AreEquivalent(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, bytes);
+        }
+
+        [Test]
+        public void DeserializeListsWithPreserveObjectReferences()
+        {
+            string json = @"{
+  ""$id"": ""1"",
+  ""$values"": [
+    null,
+    {
+      ""$id"": ""2"",
+      ""$values"": [
+        null
+      ]
+    },
+    {
+      ""$id"": ""3"",
+      ""$values"": [
+        {
+          ""$id"": ""4"",
+          ""$values"": [
+            {
+              ""$ref"": ""1""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}";
+
+            PreserveReferencesHandlingTests.CircularList circularList = JsonConvert.DeserializeObject<PreserveReferencesHandlingTests.CircularList>(json,
+                new JsonSerializerSettings
+                {
+                    PreserveReferencesHandling = PreserveReferencesHandling.All,
+                    SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                });
+
+            Assert.AreEqual(3, circularList.Count);
+            Assert.AreEqual(null, circularList[0]);
+            Assert.AreEqual(1, circularList[1].Count);
+            Assert.AreEqual(1, circularList[2].Count);
+            Assert.AreEqual(1, circularList[2][0].Count);
+            Assert.IsTrue(ReferenceEquals(circularList, circularList[2][0][0]));
+        }
+
+        [Test]
+        public void DeserializeTypeNameOnly()
+        {
+            string json = @"{
+  ""$id"": ""1"",
+  ""$type"": ""Newtonsoft.Json.Tests.TestObjects.Employee"",
+  ""Name"": ""Name!"",
+  ""Manager"": null
+}";
+
+            ExceptionAssert.Throws<JsonSerializationException>(
+                "Type specified in JSON 'Newtonsoft.Json.Tests.TestObjects.Employee' was not resolved. Path '$type', line 3, position 56.",
+                () =>
+                {
+                    JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
+                    {
+                        TypeNameHandling = TypeNameHandling.Objects,
+                        SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                    });
+                });
+        }
+
+        [Test]
+        public void SerializeRefNull()
+        {
+            var reference = new Dictionary<string, object>();
+            reference.Add("blah", "blah!");
+            reference.Add("$ref", null);
+            reference.Add("$id", null);
+
+            var child = new Dictionary<string, object>();
+            child.Add("_id", 2);
+            child.Add("Name", "Isabell");
+            child.Add("Father", reference);
+
+            string json = JsonConvert.SerializeObject(child, Formatting.Indented);
+
+            Console.WriteLine(json);
+
+            Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json, new JsonSerializerSettings
+            {
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            });
+
+            Assert.AreEqual(3, result.Count);
+            Assert.AreEqual(1, ((JObject)result["Father"]).Count);
+            Assert.AreEqual("blah!", (string)((JObject)result["Father"])["blah"]);
+        }
+
+        [Test]
+        public void DeserializeEmployeeReference()
+        {
+            string json = @"[
+  {
+    ""Name"": ""Mike Manager"",
+    ""$id"": ""1"",
+    ""Manager"": null
+  },
+  {
+    ""Name"": ""Joe User"",
+    ""$id"": ""2"",
+    ""Manager"": {
+      ""$ref"": ""1""
+    }
+  }
+]";
+
+            List<EmployeeReference> employees = JsonConvert.DeserializeObject<List<EmployeeReference>>(json, new JsonSerializerSettings
+            {
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            });
+
+            Assert.AreEqual(2, employees.Count);
+            Assert.AreEqual("Mike Manager", employees[0].Name);
+            Assert.AreEqual("Joe User", employees[1].Name);
+            Assert.AreEqual(employees[0], employees[1].Manager);
+        }
+
+        [Test]
+        public void DeserializeFromJToken()
+        {
+            string json = @"[
+  {
+    ""Name"": ""Mike Manager"",
+    ""$id"": ""1"",
+    ""Manager"": null
+  },
+  {
+    ""Name"": ""Joe User"",
+    ""$id"": ""2"",
+    ""Manager"": {
+      ""$ref"": ""1""
+    }
+  }
+]";
+
+            JToken t1 = JToken.Parse(json);
+            JToken t2 = t1.CloneToken();
+
+            List<EmployeeReference> employees = t1.ToObject<List<EmployeeReference>>(JsonSerializer.Create(new JsonSerializerSettings
+            {
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            }));
+
+            Assert.AreEqual(2, employees.Count);
+            Assert.AreEqual("Mike Manager", employees[0].Name);
+            Assert.AreEqual("Joe User", employees[1].Name);
+            Assert.AreEqual(employees[0], employees[1].Manager);
+
+            Assert.IsTrue(JToken.DeepEquals(t1, t2));
+        }
+
+#if !(PORTABLE || PORTABLE40)
+        [Test]
+        public void DeserializeGenericObjectListWithTypeName()
+        {
+            string employeeRef = typeof(EmployeeReference).AssemblyQualifiedName;
+            string personRef = typeof(Person).AssemblyQualifiedName;
+
+            string json = @"[
+  {
+    ""Name"": ""Bob"",
+    ""$id"": ""1"",
+    ""$type"": """ + employeeRef + @""",
+    ""Manager"": {
+      ""$id"": ""2"",
+      ""$type"": """ + employeeRef + @""",
+      ""Name"": ""Frank"",
+      ""Manager"": null
+    }
+  },
+  {
+    ""Name"": null,
+    ""$type"": """ + personRef + @""",
+    ""BirthDate"": ""\/Date(978134400000)\/"",
+    ""LastModified"": ""\/Date(978134400000)\/""
+  },
+  ""String!"",
+  -2147483648
+]";
+
+            List<object> values = (List<object>)JsonConvert.DeserializeObject(json, typeof(List<object>), new JsonSerializerSettings
+            {
+                TypeNameHandling = TypeNameHandling.Objects,
+                TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            });
+
+            Assert.AreEqual(4, values.Count);
+
+            EmployeeReference e = (EmployeeReference)values[0];
+            Person p = (Person)values[1];
+
+            Assert.AreEqual("Bob", e.Name);
+            Assert.AreEqual("Frank", e.Manager.Name);
+
+            Assert.AreEqual(null, p.Name);
+            Assert.AreEqual(new DateTime(2000, 12, 30, 0, 0, 0, DateTimeKind.Utc), p.BirthDate);
+            Assert.AreEqual(new DateTime(2000, 12, 30, 0, 0, 0, DateTimeKind.Utc), p.LastModified);
+
+            Assert.AreEqual("String!", values[2]);
+            Assert.AreEqual((long)int.MinValue, values[3]);
+        }
+
+        [Test]
+        public void WriteListTypeNameForProperty()
+        {
+            string listRef = ReflectionUtils.GetTypeName(typeof(List<int>), FormatterAssemblyStyle.Simple, null);
+
+            TypeNameHandlingTests.TypeNameProperty typeNameProperty = new TypeNameHandlingTests.TypeNameProperty
+            {
+                Name = "Name!",
+                Value = new List<int> { 1, 2, 3, 4, 5 }
+            };
+
+            string json = JsonConvert.SerializeObject(typeNameProperty, Formatting.Indented);
+
+            Assert.AreEqual(@"{
+  ""Name"": ""Name!"",
+  ""Value"": {
+    ""$type"": """ + listRef + @""",
+    ""$values"": [
+      1,
+      2,
+      3,
+      4,
+      5
+    ]
+  }
+}", json);
+
+            TypeNameHandlingTests.TypeNameProperty deserialized = JsonConvert.DeserializeObject<TypeNameHandlingTests.TypeNameProperty>(json, new JsonSerializerSettings
+            {
+                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+            });
+            Assert.AreEqual("Name!", deserialized.Name);
+            CustomAssert.IsInstanceOfType(typeof(List<int>), deserialized.Value);
+
+            List<int> nested = (List<int>)deserialized.Value;
+            Assert.AreEqual(5, nested.Count);
+            Assert.AreEqual(1, nested[0]);
+            Assert.AreEqual(2, nested[1]);
+            Assert.AreEqual(3, nested[2]);
+            Assert.AreEqual(4, nested[3]);
+            Assert.AreEqual(5, nested[4]);
+        }
+#endif
+    }
+}
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using Newtonsoft.Json.Linq;
 #if !(NET20 || NET35 || PORTABLE || PORTABLE40)
 using System.Numerics;
 #endif
@@ -135,7 +136,12 @@ Newtonsoft.Json Error: 0 : Error!

            JsonConvert.DeserializeObject<Staff>(
                json,
-                new JsonSerializerSettings { TraceWriter = traceWriter, Converters = { new JavaScriptDateTimeConverter() } });
+                new JsonSerializerSettings
+                {
+                    TraceWriter = traceWriter,
+                    Converters = { new JavaScriptDateTimeConverter() },
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                });

            Console.WriteLine(traceWriter);
            // 2012-11-11T12:08:42.761 Info Started serializing Newtonsoft.Json.Tests.Serialization.Staff. Path ''.
@@ -270,15 +276,15 @@ Newtonsoft.Json Error: 0 : Error!

            Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path 'IntList', line 2, position 13.", traceWriter.TraceRecords[0].Message);
            Assert.AreEqual("Started deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 2, position 15.", traceWriter.TraceRecords[1].Message);
-            Assert.AreEqual("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 5, position 4.", traceWriter.TraceRecords[2].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList'"));
            Assert.AreEqual("Started deserializing System.String[]. Path 'StringArray', line 6, position 19.", traceWriter.TraceRecords[3].Message);
-            Assert.AreEqual("Finished deserializing System.String[]. Path 'StringArray', line 9, position 4.", traceWriter.TraceRecords[4].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.String[]. Path 'StringArray'"));
            Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Version.Major', line 11, position 13.", traceWriter.TraceRecords[5].Message);
-            Assert.AreEqual("Started deserializing System.Version. Path 'Version', line 17, position 4.", traceWriter.TraceRecords[6].Message);
-            Assert.AreEqual("Finished deserializing System.Version. Path 'Version', line 17, position 4.", traceWriter.TraceRecords[7].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[6].Message.StartsWith("Started deserializing System.Version. Path 'Version'"));
+            Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Finished deserializing System.Version. Path 'Version'"));
            Assert.AreEqual("Started deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary.1', line 19, position 9.", traceWriter.TraceRecords[8].Message);
-            Assert.AreEqual("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary', line 22, position 4.", traceWriter.TraceRecords[9].Message);
-            Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path '', line 23, position 2.", traceWriter.TraceRecords[10].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary'"));
+            Assert.IsTrue(traceWriter.TraceRecords[10].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path ''"));

            Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
        }
@@ -397,12 +403,13 @@ Newtonsoft.Json Error: 0 : Error!
                new JsonSerializerSettings
                {
                    PreserveReferencesHandling = PreserveReferencesHandling.All,
+                    SpecialPropertyHandling = SpecialPropertyHandling.Default,
                    TraceWriter = traceWriter
                });

            Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '1' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other', line 3, position 11."));
            Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Read object reference Id '2' for Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'other.blah', line 5, position 12."));
-            Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message == "Resolved object reference '1' to Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'self', line 9, position 4."));
+            Assert.IsTrue(traceWriter.TraceRecords.Any(r => r.Message.StartsWith("Resolved object reference '1' to Newtonsoft.Json.Tests.Serialization.PreserveReferencesHandlingTests+CircularDictionary. Path 'self'")));
        }

        [Test]
@@ -516,6 +523,7 @@ Newtonsoft.Json Error: 0 : Error!
            JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
            {
                TypeNameHandling = TypeNameHandling.All,
+                SpecialPropertyHandling = SpecialPropertyHandling.Default,
                TraceWriter = traceWriter
            });

@@ -523,12 +531,12 @@ Newtonsoft.Json Error: 0 : Error!
            Assert.AreEqual("Started deserializing System.Collections.Generic.List`1[System.Object]. Path '$values', line 3, position 15.", traceWriter.TraceRecords[1].Message);
            Assert.AreEqual("Resolved type 'System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String, mscorlib]], mscorlib' to System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].$type', line 5, position 120.", traceWriter.TraceRecords[2].Message);
            Assert.AreEqual("Started deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0].key!', line 6, position 14.", traceWriter.TraceRecords[3].Message);
-            Assert.AreEqual("Finished deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0]', line 7, position 6.", traceWriter.TraceRecords[4].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.Collections.Generic.Dictionary`2[System.String,System.String]. Path '$values[0]'"));
            Assert.AreEqual("Resolved type 'System.Version, mscorlib' to System.Version. Path '$values[1].$type', line 9, position 42.", traceWriter.TraceRecords[5].Message);
            Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path '$values[1].Major', line 10, position 15.", traceWriter.TraceRecords[6].Message);
-            Assert.AreEqual("Started deserializing System.Version. Path '$values[1]', line 16, position 6.", traceWriter.TraceRecords[7].Message);
-            Assert.AreEqual("Finished deserializing System.Version. Path '$values[1]', line 16, position 6.", traceWriter.TraceRecords[8].Message);
-            Assert.AreEqual("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values', line 17, position 4.", traceWriter.TraceRecords[9].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Started deserializing System.Version. Path '$values[1]'"));
+            Assert.IsTrue(traceWriter.TraceRecords[8].Message.StartsWith("Finished deserializing System.Version. Path '$values[1]'"));
+            Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.List`1[System.Object]. Path '$values'"));
        }

 #if !(NETFX_CORE || PORTABLE || PORTABLE40)
@@ -552,7 +560,7 @@ Newtonsoft.Json Error: 0 : Error!
                        });
                });

-            Assert.AreEqual("Deserializing System.Exception using ISerializable constructor. Path '', line 1, position 2.", traceWriter.TraceRecords[0].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[0].Message.StartsWith("Deserializing System.Exception using ISerializable constructor. Path ''"));
            Assert.AreEqual(TraceLevel.Info, traceWriter.TraceRecords[0].Level);
            Assert.AreEqual("Error deserializing System.Exception. Member 'ClassName' was not found. Path '', line 1, position 2.", traceWriter.TraceRecords[1].Message);
            Assert.AreEqual(TraceLevel.Error, traceWriter.TraceRecords[1].Level);
@@ -576,7 +584,7 @@ Newtonsoft.Json Error: 0 : Error!

            Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[0].Message);
            Assert.AreEqual("Could not find member 'MissingMemberProperty' on Newtonsoft.Json.Tests.TestObjects.Person. Path 'MissingMemberProperty', line 1, position 25.", traceWriter.TraceRecords[1].Message);
-            Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path '', line 1, position 30.", traceWriter.TraceRecords[2].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.TestObjects.Person. Path ''"));
        }

        [Test]
@@ -604,8 +612,8 @@ Newtonsoft.Json Error: 0 : Error!

            Assert.AreEqual("Deserializing System.Version using a non-default constructor 'Void .ctor(Int32, Int32, Int32, Int32)'. Path 'Major', line 2, position 11.", traceWriter.TraceRecords[0].Message);
            Assert.AreEqual("Could not find member 'MissingMemberProperty' on System.Version. Path 'MissingMemberProperty', line 8, position 32.", traceWriter.TraceRecords[1].Message);
-            Assert.AreEqual("Started deserializing System.Version. Path '', line 9, position 2.", traceWriter.TraceRecords[2].Message);
-            Assert.AreEqual("Finished deserializing System.Version. Path '', line 9, position 2.", traceWriter.TraceRecords[3].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Started deserializing System.Version. Path ''"));
+            Assert.IsTrue(traceWriter.TraceRecords[3].Message.StartsWith("Finished deserializing System.Version. Path ''"));
        }

        [Test]
@@ -673,7 +681,7 @@ Newtonsoft.Json Error: 0 : Error!
            SpecifiedTestClass deserialized = JsonConvert.DeserializeObject<SpecifiedTestClass>(json, new JsonSerializerSettings { TraceWriter = traceWriter });

            Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path 'Age', line 2, position 9.", traceWriter.TraceRecords[0].Message);
-            Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path '', line 3, position 2.", traceWriter.TraceRecords[1].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[1].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path ''"));

            Assert.IsNull(deserialized.Name);
            Assert.IsFalse(deserialized.NameSpecified);
@@ -707,7 +715,7 @@ Newtonsoft.Json Error: 0 : Error!
            Assert.AreEqual("IsSpecified for property 'Name' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Name', line 2, position 18.", traceWriter.TraceRecords[1].Message);
            Assert.AreEqual("IsSpecified for property 'Weight' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Weight', line 4, position 14.", traceWriter.TraceRecords[2].Message);
            Assert.AreEqual("IsSpecified for property 'Height' on Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass set to true. Path 'Height', line 5, position 14.", traceWriter.TraceRecords[3].Message);
-            Assert.AreEqual("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path '', line 7, position 2.", traceWriter.TraceRecords[4].Message);
+            Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.SpecifiedTestClass. Path ''"));

            Assert.AreEqual("James", deserialized.Name);
            Assert.IsTrue(deserialized.NameSpecified);
@@ -122,6 +122,7 @@ namespace Newtonsoft.Json.Tests.Serialization
            {
                var reader = new JsonTextReader(new StringReader(sb.ToString()));
                var ser = new JsonSerializer();
+                ser.SpecialPropertyHandling = SpecialPropertyHandling.Default;
                ser.Deserialize<bool>(reader);
            });
        }
@@ -1591,6 +1592,8 @@ namespace Newtonsoft.Json.Tests.Serialization
            };
            string serializedString = JsonConvert.SerializeObject(inputContext, jsonSerializerSettings);

+            Console.WriteLine(serializedString);
+
            var deserializedObject = (Dictionary<string, Guid>)JsonConvert.DeserializeObject(serializedString, jsonSerializerSettings);

            Assert.AreEqual(someValue, deserializedObject[contextKey]);