Merge pull request #334 from MikelThief/master

Align EnumValueObject implementations

Author: vkhorikov

CSharpFunctionalExtensions.Tests/ValueObjectTests/EnumValueObjectTests.cs

@@ -82,10 +82,10 @@ public void GivenNullOrEmptyKey_WhenCreating_ThenException(string key)
         [InlineData("Four", false)]
         [InlineData(nameof(TestEnumValueObject.Two), true)]
         [InlineData(nameof(TestEnumValueObject.One), true)]
-        public void GivenPossibleKey_WhenCheckingIfKeyIsEnumValueObject_ThenShouldReturnTrueIfKeyRecognized(string possibleKey, bool isIn)
+        public void GivenPossibleKey_WhenCheckingIfKeyIsEnumValueObject_ThenShouldReturnTrueIfKeyRecognized(string possibleId, bool isIn)
         {
             // Act
-            var isEnumValueObject = TestEnumValueObject.Is(possibleKey);
+            var isEnumValueObject = TestEnumValueObject.Is(possibleId);
 
             // Assert
             isEnumValueObject.Should().Be(isIn);

CSharpFunctionalExtensions/ValueObject/EnumValueObject.cs

@@ -65,7 +65,20 @@ public static Maybe<TEnumeration> FromName(string name)
                 ? EnumerationsByName[name]
                 : null;
         }
-        
+
+
+#if NET40
+        public static ICollection<TEnumeration> All = EnumerationsById.Values.OfType<TEnumeration>().ToList();
+#else
+        public static IReadOnlyCollection<TEnumeration> All = EnumerationsById.Values.OfType<TEnumeration>().ToList();
+#endif
+
+        public static bool Is(string possibleName) => All.Select(e => e.Name).Contains(possibleName);
+
+        public static bool Is(TId possibleId) => All.Select(e => e.Id).Contains(possibleId);
+
+        public override string ToString() => Name;
+
         protected override IEnumerable<object> GetEqualityComponents()
         {
             yield return Id;
@@ -98,7 +111,11 @@ protected EnumValueObject(string id)
             Id = id;
         }
 
-        public static IEnumerable<TEnumeration> All = Enumerations.Values;
+#if NET40
+        public static ICollection<TEnumeration> All = Enumerations.Values.OfType<TEnumeration>().ToList();
+#else
+        public static IReadOnlyCollection<TEnumeration> All = Enumerations.Values.OfType<TEnumeration>().ToList();
+#endif
 
         public virtual string Id { get; protected set; }
 
@@ -139,7 +156,7 @@ public static Maybe<TEnumeration> FromId(string id)
                 : null;
         }
 
-        public static bool Is(string possibleKey) => All.Select(e => e.Id).Contains(possibleKey);
+        public static bool Is(string possibleId) => All.Select(e => e.Id).Contains(possibleId);
 
         public override string ToString() => Id;