Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/SmartEnum.UnitTests/SmartEnumFromName.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Ardalis.SmartEnum;
using SmartEnum.Exceptions;
using SmartEnum.Exceptions;
using System;
using Xunit;

Expand Down
3 changes: 1 addition & 2 deletions src/SmartEnum.UnitTests/SmartEnumFromValue.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Ardalis.SmartEnum;
using SmartEnum.Exceptions;
using SmartEnum.Exceptions;
using Xunit;

namespace SmartEnum.UnitTests
Expand Down
15 changes: 15 additions & 0 deletions src/SmartEnum.UnitTests/SmartEnumImplicitValueConversion.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using Xunit;

namespace SmartEnum.UnitTests
{
public class SmartEnumImplicitValueConversion
{
[Fact]
public void ReturnsValueOfGivenEnum()
{
int result = TestEnum.One;

Assert.Equal(TestEnum.One.Value, result);
}
}
}
3 changes: 1 addition & 2 deletions src/SmartEnum.UnitTests/SmartEnumList.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Xunit;
using Xunit;

namespace SmartEnum.UnitTests
{

public class SmartEnumList
{
[Fact]
Expand Down
2 changes: 1 addition & 1 deletion src/SmartEnum.UnitTests/SmartEnumToString.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Xunit;
using Xunit;

namespace SmartEnum.UnitTests
{
Expand Down
18 changes: 7 additions & 11 deletions src/SmartEnum/SmartEnum.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using Ardalis.GuardClauses;
using SmartEnum.Exceptions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Ardalis.GuardClauses;
using SmartEnum.Exceptions;

namespace Ardalis.SmartEnum
{
Expand All @@ -28,13 +28,7 @@ private static List<TEnum> ListAllOptions()
.ToList();
}

public static List<TEnum> List
{
get
{
return _list.Value;
}
}
public static List<TEnum> List => _list.Value;

public string Name { get; }
public TValue Value { get; }
Expand All @@ -58,7 +52,7 @@ public static TEnum FromName(string name)

public static TEnum FromValue(TValue value)
{
// Can't use == to compare generics unless we constrain TValue to "class",
// Can't use == to compare generics unless we constrain TValue to "class",
// which we don't want because then we couldn't use int.
var result = List.FirstOrDefault(item => EqualityComparer<TValue>.Default.Equals(item.Value, value));
if (result == null)
Expand All @@ -69,5 +63,7 @@ public static TEnum FromValue(TValue value)
}

public override string ToString() => $"{Name} ({Value})";

public static implicit operator TValue(SmartEnum<TEnum, TValue> smartEnum) => smartEnum.Value;
}
}
1 change: 1 addition & 0 deletions src/SmartEnum/SmartEnum.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Version>1.0.2</Version>
<AssemblyName>Ardalis.SmartEnum</AssemblyName>
<PackageIconUrl>https://user-images.githubusercontent.com/782127/33497760-facf6550-d69c-11e7-94e4-b3856da259a9.png</PackageIconUrl>
<RootNamespace>Ardalis.SmartEnum</RootNamespace>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.1|AnyCPU'">
Expand Down