Fix using StringEnumConverter with naming strategy and specifie… (#2186)

Src/Newtonsoft.Json.Tests/Issues/Issue2082.cs

@@ -0,0 +1,76 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+#if !NET20
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue2082
+    {
+        [Test]
+        public void Test()
+        {
+            CamelCaseNamingStrategy namingStrategy = new CamelCaseNamingStrategy(processDictionaryKeys: true, overrideSpecifiedNames: false);
+
+            TestClass c = new TestClass { Value = TestEnum.UpperCaseName };
+            string json = JsonConvert.SerializeObject(c, new JsonSerializerSettings
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = namingStrategy
+                },
+                Converters = new[] { new StringEnumConverter { NamingStrategy = namingStrategy } }
+            });
+
+            Assert.AreEqual(@"{""value"":""UPPER_CASE_NAME""}", json);
+        }
+
+        public class TestClass
+        {
+            public TestEnum Value { get; set; }
+        }
+
+        public enum TestEnum
+        {
+            [EnumMember(Value = "UPPER_CASE_NAME")]
+            UpperCaseName
+        }
+    }
+}
+#endif

Src/Newtonsoft.Json/Utilities/EnumUtils.cs

@@ -54,6 +54,7 @@ private static EnumInfo InitializeValuesAndNames(StructMultiKey<Type, NamingStra
             string[] names = Enum.GetNames(enumType);
             string[] resolvedNames = new string[names.Length];
             ulong[] values = new ulong[names.Length];
+            bool hasSpecifiedName;
 
             for (int i = 0; i < names.Length; i++)
             {
@@ -63,21 +64,24 @@ private static EnumInfo InitializeValuesAndNames(StructMultiKey<Type, NamingStra
 
                 string resolvedName;
 #if HAVE_DATA_CONTRACTS
-                resolvedName = f.GetCustomAttributes(typeof(EnumMemberAttribute), true)
+                string specifiedName = f.GetCustomAttributes(typeof(EnumMemberAttribute), true)
                          .Cast<EnumMemberAttribute>()
                          .Select(a => a.Value)
-                         .SingleOrDefault() ?? f.Name;
+                         .SingleOrDefault();
+                hasSpecifiedName = specifiedName != null;
+                resolvedName = specifiedName ?? name;
 
                 if (Array.IndexOf(resolvedNames, resolvedName, 0, i) != -1)
                 {
                     throw new InvalidOperationException("Enum name '{0}' already exists on enum '{1}'.".FormatWith(CultureInfo.InvariantCulture, resolvedName, enumType.Name));
                 }
 #else
                 resolvedName = name;
+                hasSpecifiedName = false;
 #endif
 
                 resolvedNames[i] = key.Value2 != null
-                    ? key.Value2.GetPropertyName(resolvedName, false)
+                    ? key.Value2.GetPropertyName(resolvedName, hasSpecifiedName)
                     : resolvedName;
             }