trim names before comparing.

Author: AnthonyCarl

src/ServiceStack.Text.EnumMemberSerializer.UnitTests/EnumMemberAttributeExtensionsTests.cs

@@ -21,6 +21,13 @@ public void MatchesDescription_NameCaseDiffers_True()
             Assert.True(attribute.MatchesDescription(MyEnumMemberValue.ToUpper()));
         }
 
+        [Fact]
+        public void MatchesDescription_WhiteSpacePaddedConstantNameUsed_True()
+        {
+            var attribute = new EnumMemberAttribute { Value = MyEnumMemberValue };
+            Assert.True(attribute.MatchesDescription("  " + MyEnumMemberValue + "\t\r\t  "));
+        }
+
         [Fact]
         public void MatchesDescription_NullFieldNameNonNullDescript_False()
         {

src/ServiceStack.Text.EnumMemberSerializer.UnitTests/EnumSerializerHelpersTests.cs

@@ -32,7 +32,14 @@ public void DeserializeEnum_FromEnumNameMixedCase_ResturnsCorrectEnum()
             var deserializedEnum = EnumSerializerHelpers<FakeTestingEnum>.DeserializeEnum("YoURvaLuE");
             Assert.Equal(FakeTestingEnum.YourValue, deserializedEnum);
         }
-        
+
+        [Fact]
+        public void DeserializeEnum_WhitespacePaddedEnum_ResturnsCorrectEnum()
+        {
+            var deserializedEnum = EnumSerializerHelpers<FakeTestingEnum>.DeserializeEnum("\tYourValue  ");
+            Assert.Equal(FakeTestingEnum.YourValue, deserializedEnum);
+        }
+
         [Fact]
         public void DeserializeEnum_FromEnumMemberAttributeName_ReturnsCorrectEnum()
         {
@@ -41,12 +48,13 @@ public void DeserializeEnum_FromEnumMemberAttributeName_ReturnsCorrectEnum()
         }
 
         [Fact]
-        public void DeserializeEnum_WhitespacePaddedEnum_ResturnsCorrectEnum()
+        public void DeserializeEnum_WhiteSpacePaddedEnumMemberAttrName_ReturnsCorrectEnum()
         {
-            var deserializedEnum = EnumSerializerHelpers<FakeTestingEnum>.DeserializeEnum("\tYourValue  ");
+            var deserializedEnum = EnumSerializerHelpers<FakeTestingEnum>.DeserializeEnum("\tYour Value is worse  ");
             Assert.Equal(FakeTestingEnum.YourValue, deserializedEnum);
         }
 
+
         [Fact]
         public void DeserializeEnum_NonEnumType_ThrowsException()
         {

src/ServiceStack.Text.EnumMemberSerializer.UnitTests/FieldInfoExtensionsTests.cs

@@ -6,24 +6,33 @@ namespace ServiceStack.Text.EnumMemberSerializer.UnitTests
 {
     public class FieldInfoExtensionsTests
     {
-        private const string MyAssemblyName = "MyAssemblyName";
+        private const string MyFieldName = "MyFieldsName";
 
         [Fact]
         public void MatchesDescription_ConstantNameUsed_True()
         {
             var fieldInfo = MockRepository.GenerateStub<FieldInfo>();
-            fieldInfo.Stub(x => x.Name).Return(MyAssemblyName);
+            fieldInfo.Stub(x => x.Name).Return(MyFieldName);
 
-            Assert.True(fieldInfo.MatchesDescription(MyAssemblyName));
+            Assert.True(fieldInfo.MatchesDescription(MyFieldName));
         }
 
         [Fact]
         public void MatchesDescription_NameCaseDiffers_True()
         {
             var fieldInfo = MockRepository.GenerateStub<FieldInfo>();
-            fieldInfo.Stub(x => x.Name).Return(MyAssemblyName);
+            fieldInfo.Stub(x => x.Name).Return(MyFieldName);
 
-            Assert.True(fieldInfo.MatchesDescription(MyAssemblyName.ToUpper()));
+            Assert.True(fieldInfo.MatchesDescription(MyFieldName.ToUpper()));
+        }
+
+        [Fact]
+        public void MatchesDescription_WhiteSpacePadded_True()
+        {
+            var fieldInfo = MockRepository.GenerateStub<FieldInfo>();
+            fieldInfo.Stub(x => x.Name).Return(MyFieldName);
+
+            Assert.True(fieldInfo.MatchesDescription("\t" + MyFieldName + "   \r"));
         }
 
         [Fact]
@@ -32,7 +41,7 @@ public void MatchesDescription_NullFieldNameNonNullDescript_False()
             var fieldInfo = MockRepository.GenerateStub<FieldInfo>();
             fieldInfo.Stub(x => x.Name).Return(null);
 
-            Assert.False(fieldInfo.MatchesDescription(MyAssemblyName));
+            Assert.False(fieldInfo.MatchesDescription(MyFieldName));
         }
 
         [Fact]
@@ -41,7 +50,7 @@ public void MatchesDescription_EmptyFieldNameNonNullDescript_False()
             var fieldInfo = MockRepository.GenerateStub<FieldInfo>();
             fieldInfo.Stub(x => x.Name).Return(string.Empty);
 
-            Assert.False(fieldInfo.MatchesDescription(MyAssemblyName));
+            Assert.False(fieldInfo.MatchesDescription(MyFieldName));
         }
 
         [Fact]

src/ServiceStack.Text.EnumMemberSerializer/EnumMemberAttributeExtensions.cs

@@ -8,7 +8,9 @@ internal static class EnumMemberAttributeExtensions
         public static bool MatchesDescription(this EnumMemberAttribute attribute, string description)
         {
             return
-                attribute != null && string.Equals(attribute.Value, description, StringComparison.OrdinalIgnoreCase);
+                attribute != null
+                && string.Equals(
+                    attribute.Value, (description ?? string.Empty).Trim(), StringComparison.OrdinalIgnoreCase);
         }
     }
 }

src/ServiceStack.Text.EnumMemberSerializer/FieldInfoExtensions.cs

@@ -7,7 +7,7 @@ internal static class FieldInfoExtensions
     {
         public static bool MatchesDescription(this FieldInfo field, string description)
         {
-            return string.Equals(field.Name, description, StringComparison.OrdinalIgnoreCase);
+            return string.Equals(field.Name, (description ?? string.Empty).Trim(), StringComparison.OrdinalIgnoreCase);
         }
     }
 }