Merge with Newtonsoft.Json 8.0.3

Author: veblush

src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs

@@ -252,7 +252,7 @@ public void DeserializeBasicUnion_NoMatch()
         [Test]
         public void DeserializeBasicUnion_MismatchedFieldCount()
         {
-            ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<Currency>(@"{""Case"":""AUD"",""Fields"":[1]}"), "The number of field values does not match the number of properties definied by union 'AUD'. Path '', line 1, position 27.");
+            ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<Currency>(@"{""Case"":""AUD"",""Fields"":[1]}"), "The number of field values does not match the number of properties defined by union 'AUD'. Path '', line 1, position 27.");
         }
 
         [Test]

src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs

@@ -104,6 +104,28 @@ public class NegativeEnumClass
             public NegativeEnum Value2 { get; set; }
         }
 
+        [JsonConverter(typeof(StringEnumConverter), true)]
+        public enum CamelCaseEnum
+        {
+            This,
+            Is,
+            CamelCase
+        }
+
+        [Test]
+        public void Serialize_CamelCaseFromAttribute()
+        {
+            string json = JsonConvert.SerializeObject(CamelCaseEnum.CamelCase);
+            Assert.AreEqual(@"""camelCase""", json);
+        }
+
+        [Test]
+        public void Deserialize_CamelCaseFromAttribute()
+        {
+            CamelCaseEnum e = JsonConvert.DeserializeObject<CamelCaseEnum>(@"""camelCase""");
+            Assert.AreEqual(CamelCaseEnum.CamelCase, e);
+        }
+
 #if !NET20
         [Test]
         public void NamedEnumDuplicateTest()

src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs

@@ -49,6 +49,7 @@
 using Newtonsoft.Json;
 using System.IO;
 using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Utilities;
 
 namespace Newtonsoft.Json.Tests
@@ -136,6 +137,33 @@ public void BufferTest_WithError()
             Assert.AreEqual(1, arrayPool.FreeArrays.Count);
         }
 
+#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
+        [Test]
+        public void BufferErroringWithInvalidSize()
+        {
+            JObject o = new JObject
+            {
+                {"BodyHtml", "<h3>Title!</h3>" + Environment.NewLine + new string(' ', 100) + "<p>Content!</p>"}
+            };
+
+            JsonArrayPool arrayPool = new JsonArrayPool();
+
+            StringWriter sw = new StringWriter();
+            using (JsonTextWriter writer = new JsonTextWriter(sw))
+            {
+                writer.ArrayPool = arrayPool;
+
+                o.WriteTo(writer);
+            }
+
+            string result = o.ToString();
+
+            Assert.AreEqual(@"{
+  ""BodyHtml"": ""<h3>Title!</h3>\r\n                                                                                                    <p>Content!</p>""
+}", result);
+        }
+#endif
+
         [Test]
         public void NewLine()
         {
@@ -932,6 +960,7 @@ public void WriteTokenDirect_BadValue()
 #endif
                     "Input string was not in a correct format.");
 
+
                 ExceptionAssert.Throws<ArgumentNullException>(() => { jsonWriter.WriteToken(JsonToken.Integer); },
 #if UNITY3D
                     @"Argument cannot be null.