Skip to content

Flags enums #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 11, 2018
Merged

Flags enums #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51ce626
Start of flags enum support
SteveWilkes Jan 10, 2018
d3b6338
Mapping numeric values to enums with IsDefined and a cast, instead of…
SteveWilkes Jan 10, 2018
298771b
Reusing Enum.IsDefined call creation method
SteveWilkes Jan 10, 2018
d191331
Support for mapping numeric values to multi-value flags enums
SteveWilkes Jan 10, 2018
6e11889
Extending numeric to flags enum test coverage
SteveWilkes Jan 11, 2018
fd65700
Support for mapping a numeric string value to a flags enum
SteveWilkes Jan 11, 2018
51afee8
Expanding string -> flags enum test coverage
SteveWilkes Jan 11, 2018
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
2 changes: 2 additions & 0 deletions AgileMapper.UnitTests/AgileMapper.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
<Compile Include="Should.cs" />
<Compile Include="ShouldExtensions.cs" />
<Compile Include="SimpleTypeConversion\WhenConvertingToCharacters.cs" />
<Compile Include="SimpleTypeConversion\WhenConvertingToFlagsEnums.cs" />
<Compile Include="Structs\Configuration\WhenConfiguringStructCreationCallbacks.cs" />
<Compile Include="Structs\Configuration\WhenConfiguringStructDataSources.cs" />
<Compile Include="Structs\Configuration\WhenConfiguringStructMappingCallbacks.cs" />
Expand Down Expand Up @@ -207,6 +208,7 @@
<Compile Include="TestClasses\PublicTwoParamCtor.cs" />
<Compile Include="TestClasses\SaveOrderItemRequest.cs" />
<Compile Include="TestClasses\SaveOrderRequest.cs" />
<Compile Include="TestClasses\Status.cs" />
<Compile Include="TestClasses\StringKeyedDictionary.cs" />
<Compile Include="TestClasses\Wedding.cs" />
<Compile Include="TestClasses\WeddingDto.cs" />
Expand Down
49 changes: 25 additions & 24 deletions AgileMapper.UnitTests/SimpleTypeConversion/WhenConvertingToEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,41 @@
{
using TestClasses;
using Xunit;
using static TestClasses.Title;

public class WhenConvertingToEnums
{
[Fact]
public void ShouldMapAByteToAnEnum()
{
var source = new PublicField<byte> { Value = (byte)Title.Dr };
var source = new PublicField<byte> { Value = (byte)Dr };
var result = Mapper.Map(source).ToANew<PublicField<Title>>();

result.Value.ShouldBe(Title.Dr);
result.Value.ShouldBe(Dr);
}

[Fact]
public void ShouldMapAShortToAnEnum()
{
var source = new PublicField<short> { Value = (short)Title.Miss };
var source = new PublicField<short> { Value = (short)Miss };
var result = Mapper.Map(source).ToANew<PublicField<Title>>();

result.Value.ShouldBe(Title.Miss);
result.Value.ShouldBe(Miss);
}

[Fact]
public void ShouldMapANullableIntToAnEnum()
{
var source = new PublicProperty<int?> { Value = (int)Title.Lady };
var source = new PublicProperty<int?> { Value = (int)Lady };
var result = Mapper.Map(source).ToANew<PublicField<Title>>();

result.Value.ShouldBe(Title.Lady);
result.Value.ShouldBe(Lady);
}

[Fact]
public void ShouldMapAnIntToAnEnum()
{
var source = new PublicProperty<int> { Value = (int)Title.Dr };
var source = new PublicProperty<int> { Value = (int)Dr };
var result = Mapper.Map(source).ToANew<PublicField<Title>>();

result.Value.ShouldBe((Title)source.Value);
Expand All @@ -53,7 +54,7 @@ public void ShouldMapANullNullableIntToAnEnum()
[Fact]
public void ShouldMapALongToAnEnum()
{
var source = new PublicProperty<long> { Value = (long)Title.Miss };
var source = new PublicProperty<long> { Value = (long)Miss };
var result = Mapper.Map(source).ToANew<PublicField<Title>>();

result.Value.ShouldBe((Title)source.Value);
Expand All @@ -62,7 +63,7 @@ public void ShouldMapALongToAnEnum()
[Fact]
public void ShouldMapANonMatchingNullableLongToANullableEnum()
{
var source = new PublicProperty<long?> { Value = (long)Title.Earl };
var source = new PublicProperty<long?> { Value = (long)Earl };
var result = Mapper.Map(source).ToANew<PublicField<TitleShortlist?>>();

result.Value.ShouldBeNull();
Expand Down Expand Up @@ -98,28 +99,28 @@ public void ShouldMapAMatchingNullableCharacterOnToANullableEnum()
[Fact]
public void ShouldMapAMatchingStringOnToAnEnum()
{
var source = new PublicField<string> { Value = Title.Mrs.ToString() };
var source = new PublicField<string> { Value = Mrs.ToString() };
var result = Mapper.Map(source).OnTo(new PublicProperty<Title>());

result.Value.ShouldBe(Title.Mrs);
result.Value.ShouldBe(Mrs);
}

[Fact]
public void ShouldMapAMatchingStringOnToAnEnumCaseInsensitively()
{
var source = new PublicField<string> { Value = Title.Miss.ToString().ToLowerInvariant() };
var source = new PublicField<string> { Value = Miss.ToString().ToLowerInvariant() };
var result = Mapper.Map(source).OnTo(new PublicProperty<Title>());

result.Value.ShouldBe(Title.Miss);
result.Value.ShouldBe(Miss);
}

[Fact]
public void ShouldMapAMatchingNumericStringOverAnEnum()
{
var source = new PublicField<string> { Value = ((int)Title.Dr).ToString() };
var source = new PublicField<string> { Value = ((int)Dr).ToString() };
var result = Mapper.Map(source).Over(new PublicProperty<Title>());

result.Value.ShouldBe(Title.Dr);
result.Value.ShouldBe(Dr);
}

[Fact]
Expand All @@ -146,13 +147,13 @@ public void ShouldMapAnEnumToAnEnum()
var source = new PublicProperty<TitleShortlist> { Value = TitleShortlist.Mrs };
var result = Mapper.Map(source).ToANew<PublicProperty<Title>>();

result.Value.ShouldBe(Title.Mrs);
result.Value.ShouldBe(Mrs);
}

[Fact]
public void ShouldMapANonMatchingEnumToANullableEnum()
{
var source = new PublicProperty<Title> { Value = Title.Lord };
var source = new PublicProperty<Title> { Value = Lord };
var result = Mapper.Map(source).ToANew<PublicProperty<TitleShortlist?>>();

result.Value.ShouldBeNull();
Expand All @@ -161,10 +162,10 @@ public void ShouldMapANonMatchingEnumToANullableEnum()
[Fact]
public void ShouldMapANullableEnumToAnEnum()
{
var source = new PublicProperty<Title?> { Value = Title.Dr };
var source = new PublicProperty<Title?> { Value = Dr };
var result = Mapper.Map(source).ToANew<PublicProperty<Title>>();

result.Value.ShouldBe(Title.Dr);
result.Value.ShouldBe(Dr);
}

[Fact]
Expand Down Expand Up @@ -206,7 +207,7 @@ public void ShouldMapAnObjectEnumMemberValueToAnNullableEnum()
[Fact]
public void ShouldMapAnObjectNullableEnumMemberValueToAnNullableEnum()
{
var source = new PublicProperty<object> { Value = (Title?)Title.Mr };
var source = new PublicProperty<object> { Value = (Title?)Mr };
var result = Mapper.Map(source).ToANew<PublicProperty<TitleShortlist>>();

result.Value.ShouldBe(TitleShortlist.Mr);
Expand All @@ -225,20 +226,20 @@ public void ShouldMapEnumsConditionally()
.If((ptf, pf) => ptf.Value1 == null)
.Map((ptf, pf) => ptf.Value2).To(pf => pf.Value)
.And
.If((ptf, pf) => Title.Duke == ptf.Value1)
.If((ptf, pf) => Duke == ptf.Value1)
.Map(TitleShortlist.Other).To(pf => pf.Value);

var nonNullSource = new PublicTwoFields<Title?, Title> { Value1 = Title.Dr, Value2 = Title.Count };
var nonNullSource = new PublicTwoFields<Title?, Title> { Value1 = Dr, Value2 = Count };
var nonNullResult = mapper.Map(nonNullSource).ToANew<PublicField<TitleShortlist>>();

nonNullResult.Value.ShouldBe(TitleShortlist.Dr);

var nullSource = new PublicTwoFields<Title?, Title> { Value1 = null, Value2 = Title.Mrs };
var nullSource = new PublicTwoFields<Title?, Title> { Value1 = null, Value2 = Mrs };
var nullResult = mapper.Map(nullSource).ToANew<PublicField<TitleShortlist>>();

nullResult.Value.ShouldBe(TitleShortlist.Mrs);

var dukeSource = new PublicTwoFields<Title?, Title> { Value1 = Title.Duke };
var dukeSource = new PublicTwoFields<Title?, Title> { Value1 = Duke };
var dukeResult = mapper.Map(dukeSource).ToANew<PublicField<TitleShortlist>>();

dukeResult.Value.ShouldBe(TitleShortlist.Other);
Expand Down
84 changes: 84 additions & 0 deletions AgileMapper.UnitTests/SimpleTypeConversion/WhenConvertingToFlagsEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
namespace AgileObjects.AgileMapper.UnitTests.SimpleTypeConversion
{
using TestClasses;
using Xunit;
using static TestClasses.Status;

public class WhenConvertingToFlagsEnums
{
[Fact]
public void ShouldMapASingleValueByteToAFlagsEnum()
{
var source = new PublicField<byte> { Value = (byte)InProgress };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.ShouldBe(InProgress);
}

[Fact]
public void ShouldMapAMultiValueShortToAFlagsEnum()
{
var source = new PublicField<short> { Value = (short)(InProgress | Assigned) };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.HasFlag(InProgress).ShouldBeTrue();
result.Value.HasFlag(Assigned).ShouldBeTrue();
result.Value.HasFlag(Cancelled).ShouldBeFalse();
result.Value.ShouldBe(InProgress | Assigned);
}

[Fact]
public void ShouldMapAMultiValueNullableIntToAFlagsEnum()
{
var source = new PublicProperty<int?> { Value = (int)(New | Completed | Cancelled) };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.ShouldBe(New | Completed | Cancelled);
}

[Fact]
public void ShouldMapANullNullableIntToANullableFlagsEnum()
{
var source = new PublicProperty<int?> { Value = default(int?) };
var result = Mapper.Map(source).ToANew<PublicField<Status?>>();

result.Value.ShouldBeNull();
}

[Fact]
public void ShouldMapASingleValueLongToANullableFlagsEnum()
{
var source = new PublicProperty<long> { Value = (long)Removed };
var result = Mapper.Map(source).ToANew<PublicField<Status?>>();

result.Value.ShouldBe(Removed);
}

[Fact]
public void ShouldMapAMultiValueNumericCharacterToAFlagsEnum()
{
var source = new PublicProperty<char> { Value = '9' };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.ShouldBe(New | Completed);
}

[Fact]
public void ShouldMapASingleValueNumericStringToAFlagsEnum()
{
var source = new PublicProperty<string> { Value = "4" };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.ShouldBe((Status)4);
}

[Fact]
public void ShouldMapAMultiValueMixedStringToAFlagsEnum()
{
var source = new PublicProperty<string> { Value = "9, InProgress, 4" };
var result = Mapper.Map(source).ToANew<PublicField<Status>>();

result.Value.ShouldBe(New | InProgress | Completed);
}
}
}
15 changes: 15 additions & 0 deletions AgileMapper.UnitTests/TestClasses/Status.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
namespace AgileObjects.AgileMapper.UnitTests.TestClasses
{
using System;

[Flags]
public enum Status
{
New = 1,
Assigned = 2,
InProgress = 4,
Completed = 8,
Cancelled = 16,
Removed = 32
}
}
9 changes: 4 additions & 5 deletions AgileMapper/ObjectPopulation/Enumerables/EnumerableSourcePopulationLoopData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables

internal class EnumerableSourcePopulationLoopData : IPopulationLoopData
{
private static readonly MethodInfo _enumeratorMoveNextMethod = typeof(IEnumerator).GetPublicInstanceMethod("MoveNext");
private static readonly MethodInfo _disposeMethod = typeof(IDisposable).GetPublicInstanceMethod("Dispose");

private readonly Expression _enumerableSubject;
private readonly MethodInfo _getEnumeratorMethod;
private readonly ParameterExpression _enumerator;
Expand All @@ -34,7 +31,7 @@ public EnumerableSourcePopulationLoopData(
_enumerator = Expression.Variable(_getEnumeratorMethod.ReturnType, "enumerator");

ContinueLoopTarget = Expression.Label(typeof(void), "Continue");
LoopExitCheck = Expression.Not(Expression.Call(_enumerator, _enumeratorMoveNextMethod));
LoopExitCheck = Expression.Not(Expression.Call(_enumerator, typeof(IEnumerator).GetPublicInstanceMethod("MoveNext")));
SourceElement = Expression.Property(_enumerator, "Current");
}

Expand Down Expand Up @@ -69,7 +66,9 @@ public BlockExpression GetLoopBlock(

var enumeratorAssignment = _enumerator.AssignTo(enumeratorValue);

Expression finallyClause = Expression.Call(_enumerator, _disposeMethod);
Expression finallyClause = Expression.Call(
_enumerator,
typeof(IDisposable).GetPublicInstanceMethod("Dispose"));

if (finallyClauseFactory != null)
{
Expand Down
Loading