Update StrEnum to v2.0.0. Switch to parsing members by value only. (#2)

StrEnum · Jul 30, 2022 · 40fc723 · 40fc723
1 parent 4c392b0
commit 40fc723
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/StrEnum.EntityFrameworkCore/StrEnum.EntityFrameworkCore.csproj b/src/StrEnum.EntityFrameworkCore/StrEnum.EntityFrameworkCore.csproj
@@ -53,6 +53,6 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 
-		<PackageReference Include="StrEnum" Version="[1.5.0,2.0.0)" />
+		<PackageReference Include="StrEnum" Version="[2.0.0,3.0.0)" />
 	</ItemGroup>
 </Project>
diff --git a/src/StrEnum.EntityFrameworkCore/StringEnumValueConverter.cs b/src/StrEnum.EntityFrameworkCore/StringEnumValueConverter.cs
@@ -10,7 +10,7 @@ public class StringEnumValueConverter<TEnum> : ValueConverter<StringEnum<TEnum>,
         where TEnum : StringEnum<TEnum>, new()
     {
         public StringEnumValueConverter(ConverterMappingHints? mappingHints = null)
-            : base(@enum => (string)@enum, value => StringEnum<TEnum>.Parse(value, false), mappingHints)
+            : base(@enum => (string)@enum, value => StringEnum<TEnum>.Parse(value, false, MatchBy.ValueOnly), mappingHints)
         {
         }
     }

diff --git a/test/StrEnum.EntityFrameworkCore.UnitTests/StrEnum.EntityFrameworkCore.UnitTests.csproj b/test/StrEnum.EntityFrameworkCore.UnitTests/StrEnum.EntityFrameworkCore.UnitTests.csproj
@@ -10,7 +10,7 @@
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.6.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-		<PackageReference Include="StrEnum" Version="1.5.0" />
+		<PackageReference Include="StrEnum" Version="2.0.1" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/test/StrEnum.EntityFrameworkCore.UnitTests/StringEnumValueConverterTests.cs b/test/StrEnum.EntityFrameworkCore.UnitTests/StringEnumValueConverterTests.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using Xunit;
 
@@ -16,12 +17,12 @@ public class Country : StringEnum<Country>
             new[]
             {
                 new object?[] { "UKR", Country.Ukraine},
-                new object?[] { "SouthAfrica", Country.SouthAfrica}
+                new object?[] { "ZAF", Country.SouthAfrica}
             };
 
     [Theory]
     [MemberData(nameof(FromStringTestCases))]
-    public void ConvertFromString_ShouldConvertToStringEnumByNameOrValue(string value, Country expectedMember)
+    public void ConvertFromString_ShouldConvertToStringEnumByValue(string value, Country expectedMember)
     {
         var converter = new StringEnumValueConverter<Country>();
 
@@ -30,6 +31,16 @@ public void ConvertFromString_ShouldConvertToStringEnumByNameOrValue(string valu
         actualCountry.Should().Be(expectedMember);
     }
 
+    [Fact]
+    public void ConvertFromString_GivenMemberName_ShouldThrowAnException()
+    {
+        var converter = new StringEnumValueConverter<Country>();
+
+        var convert = () => converter.ConvertFromProvider("SouthAfrica");
+
+        convert.Should().Throw<ArgumentException>();
+    }
+
     [Fact]
     public void ConvertToString_ShouldConvertMemberValueToString()
     {