-Changed StringEnumConverter.AllowIntegerValues to also reject writin…

…g enum values with no name
JamesNK · Mar 19, 2017 · 7673a18 · 7673a18 · JamesNK · Mar 20, 2017
1 parent 937b25b
commit 7673a18
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 861 deletions.
diff --git a/Src/Newtonsoft.Json.Portable40.sln b/Src/Newtonsoft.Json.Portable40.sln
diff --git a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs
@@ -612,12 +612,21 @@ public void AllowIntegerValueAndStringNumber()
         {
             JsonSerializationException ex = ExceptionAssert.Throws<JsonSerializationException>(() =>
             {
-                JsonConvert.DeserializeObject<StoreColor>("\"1\"", new StringEnumConverter {AllowIntegerValues = false});
+                JsonConvert.DeserializeObject<StoreColor>("\"1\"", new StringEnumConverter { AllowIntegerValues = false });
             });
 
             Assert.AreEqual("Integer string '1' is not allowed.", ex.InnerException.Message);
         }
 
+        [Test]
+        public void AllowIntegerValueAndNonNamedValue()
+        {
+            ExceptionAssert.Throws<JsonSerializationException>(() =>
+            {
+                JsonConvert.SerializeObject((StoreColor)999, new StringEnumConverter { AllowIntegerValues = false });
+            }, "Integer value 999 is not allowed. Path ''.");
+        }
+
         public enum EnumWithDifferentCases
         {
             M,

diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
@@ -1052,7 +1052,7 @@ public void OtherElementDataTypes()
         [Test]
         public void NoRootObject()
         {
-            ExceptionAssert.Throws<JsonSerializationException>(() => { XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"[1]"); }, "XmlNodeConverter can only convert JSON that begins with an object.");
+            ExceptionAssert.Throws<JsonSerializationException>(() => { XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"[1]"); }, "XmlNodeConverter can only convert JSON that begins with an object. Path '', line 1, position 1.");
         }
 
         [Test]

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.project.json b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.project.json
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj
@@ -18,6 +18,7 @@
     <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0'">Full</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <None Remove="**\*.orig" />
     <Compile Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'net45'" Remove="Benchmarks\**" />
     <None Include="large.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs b/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs
@@ -95,6 +95,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
             if (char.IsNumber(enumName[0]) || enumName[0] == '-')
             {
+                if (!AllowIntegerValues)
+                {
+                    throw JsonSerializationException.Create(null, writer.ContainerPath, "Integer value {0} is not allowed.".FormatWith(CultureInfo.InvariantCulture, enumName), null);
+                }
+
                 // enum value has no name so write number
                 writer.WriteValue(value);
             }

diff --git a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs
@@ -1617,7 +1617,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 case JsonToken.StartObject:
                     break;
                 default:
-                    throw new JsonSerializationException("XmlNodeConverter can only convert JSON that begins with an object.");
+                    throw JsonSerializationException.Create(reader, "XmlNodeConverter can only convert JSON that begins with an object.");
             }
 
             XmlNamespaceManager manager = new XmlNamespaceManager(new NameTable());
@@ -1629,7 +1629,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             {
                 if (objectType != typeof(XDocument) && objectType != typeof(XElement))
                 {
-                    throw new JsonSerializationException("XmlNodeConverter only supports deserializing XDocument or XElement.");
+                    throw JsonSerializationException.Create(reader, "XmlNodeConverter only supports deserializing XDocument or XElement.");
                 }
 
                 XDocument d = new XDocument();
@@ -1642,7 +1642,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             {
                 if (objectType != typeof(XmlDocument))
                 {
-                    throw new JsonSerializationException("XmlNodeConverter only supports deserializing XmlDocuments");
+                    throw JsonSerializationException.Create(reader, "XmlNodeConverter only supports deserializing XmlDocuments");
                 }
 
                 XmlDocument d = new XmlDocument();
@@ -1656,9 +1656,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             }
 #endif
 
-                if (document == null || rootNode == null)
+            if (document == null || rootNode == null)
             {
-                throw new JsonSerializationException("Unexpected type when converting XML: " + objectType);
+                throw JsonSerializationException.Create(reader, "Unexpected type when converting XML: " + objectType);
             }
 
             if (!string.IsNullOrEmpty(DeserializeRootElementName))

diff --git a/Src/Newtonsoft.Json/Linq/JValue.Async.cs b/Src/Newtonsoft.Json/Linq/JValue.Async.cs
@@ -130,7 +130,7 @@ public override Task WriteToAsync(JsonWriter writer, CancellationToken cancellat
                     return writer.WriteValueAsync((Uri)_value, cancellationToken);
             }
 
-            throw MiscellaneousUtils.CreateArgumentOutOfRangeException("TokenType", _valueType, "Unexpected token type.");
+            throw MiscellaneousUtils.CreateArgumentOutOfRangeException(nameof(Type), _valueType, "Unexpected token type.");
         }
     }
 }