Skip to content

Commit b489b79

Browse files
markolbertmarkolbert
committed
Changed MappingResults from a flagged enum to an ordinary enum (and changed name to MappingResult).
1 parent a7f919d commit b489b79

File tree

15 files changed

+126
-127
lines changed

15 files changed

+126
-127
lines changed

‎J4JCommandLine.Tests/ArrayPropertyTest.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ namespace J4JCommandLine.Tests
88
public class ArrayPropertyTest
99
{
1010
[Theory]
11-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] {33 })]
12-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
13-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] {33 })]
14-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
11+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] {33 })]
12+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
13+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] {33 })]
14+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
1515
public void root_properties(
1616
string cmdLine,
1717
bool required,
18-
MappingResults result,
18+
MappingResult result,
1919
int[] optValue,
2020
int[] unkeyedValues)
2121
{
@@ -28,14 +28,14 @@ public void root_properties(
2828
}
2929

3030
[Theory]
31-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] { 33})]
32-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
33-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] {33 })]
34-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
31+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] { 33})]
32+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
33+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] {33 })]
34+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
3535
public void parameterless_properties(
3636
string cmdLine,
3737
bool required,
38-
MappingResults result,
38+
MappingResult result,
3939
int[] optValue,
4040
int[] unkeyedValues)
4141
{
@@ -48,14 +48,14 @@ public void parameterless_properties(
4848
}
4949

5050
[Theory]
51-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] { 33})]
52-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
53-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] {33 })]
54-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
51+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] { 33})]
52+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
53+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] {33 })]
54+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
5555
public void parametered_properties(
5656
string cmdLine,
5757
bool required,
58-
MappingResults result,
58+
MappingResult result,
5959
int[] optValue,
6060
int[] unkeyedValues)
6161
{
@@ -77,7 +77,7 @@ private void ProcessTest<T>(
7777
BindingTarget<T> target,
7878
Option option,
7979
Option unkeyed,
80-
MappingResults desiredParseResults,
80+
MappingResult desiredParseResult,
8181
Func<TestProperties> results,
8282
int[] optValue,
8383
int[] unkeyedValues)
@@ -92,7 +92,7 @@ private void ProcessTest<T>(
9292
option.Required();
9393

9494
var parseResults = target.Parse(new string[] { cmdLine });
95-
parseResults.Should().Be(desiredParseResults);
95+
parseResults.Should().Be(desiredParseResult);
9696

9797
results().IntArray.Should().BeEquivalentTo(optValue);
9898
results().Unkeyed.Should().BeEquivalentTo(unkeyedValues);

‎J4JCommandLine.Tests/EnumTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ namespace J4JCommandLine.Tests
88
public class EnumTests
99
{
1010
[ Theory ]
11-
[ InlineData( "z", "B", true, MappingResults.MissingRequired, PlainEnum.A ) ]
12-
[ InlineData( "x", "B", true, MappingResults.Success, PlainEnum.B ) ]
13-
[ InlineData( "z", "B", false, MappingResults.Success, PlainEnum.A ) ]
11+
[ InlineData( "z", "B", true, MappingResult.MissingRequired, PlainEnum.A ) ]
12+
[ InlineData( "x", "B", true, MappingResult.Success, PlainEnum.B ) ]
13+
[ InlineData( "z", "B", false, MappingResult.Success, PlainEnum.A ) ]
1414
public void Plain_enum(
1515
string key,
1616
string arg,
1717
bool required,
18-
MappingResults result,
18+
MappingResult result,
1919
PlainEnum desiredValue )
2020
{
2121
var target = ServiceProvider.GetBindingTarget<EnumProperties>( true );
@@ -38,14 +38,14 @@ public void Plain_enum(
3838
}
3939

4040
[Theory]
41-
[InlineData("z", "A,B", true, MappingResults.MissingRequired, FlagsEnum.A)]
42-
[InlineData("x", "A,B", true, MappingResults.Success, FlagsEnum.A | FlagsEnum.B)]
43-
[InlineData("z", "A,B", false, MappingResults.Success, FlagsEnum.A)]
41+
[InlineData("z", "A,B", true, MappingResult.MissingRequired, FlagsEnum.A)]
42+
[InlineData("x", "A,B", true, MappingResult.Success, FlagsEnum.A | FlagsEnum.B)]
43+
[InlineData("z", "A,B", false, MappingResult.Success, FlagsEnum.A)]
4444
public void Flags_enum(
4545
string key,
4646
string arg,
4747
bool required,
48-
MappingResults result,
48+
MappingResult result,
4949
FlagsEnum desiredValue)
5050
{
5151
var target = ServiceProvider.GetBindingTarget<EnumProperties>(true);
@@ -68,14 +68,14 @@ public void Flags_enum(
6868
}
6969

7070
[Theory]
71-
[InlineData("z", "A", true, MappingResults.Unbound, UnconvertibleEnum.A)]
72-
[InlineData("x", "B", true, MappingResults.Unbound, UnconvertibleEnum.A)]
73-
[InlineData("z", "A", false, MappingResults.Unbound, UnconvertibleEnum.A)]
71+
[InlineData("z", "A", true, MappingResult.Unbound, UnconvertibleEnum.A)]
72+
[InlineData("x", "B", true, MappingResult.Unbound, UnconvertibleEnum.A)]
73+
[InlineData("z", "A", false, MappingResult.Unbound, UnconvertibleEnum.A)]
7474
public void Unconvertible_enum(
7575
string key,
7676
string arg,
7777
bool required,
78-
MappingResults result,
78+
MappingResult result,
7979
UnconvertibleEnum desiredValue)
8080
{
8181
var target = ServiceProvider.GetBindingTarget<EnumProperties>(true);

‎J4JCommandLine.Tests/HelpErrorTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ protected class RootProperties
1818
}
1919

2020
[ Theory ]
21-
[ InlineData( "h", MappingResults.HelpRequested ) ]
21+
[ InlineData( "h", MappingResult.HelpRequested ) ]
2222
public void Trigger_help(
2323
string key,
24-
MappingResults result )
24+
MappingResult result )
2525
{
2626
var target = ServiceProvider.GetBindingTarget<RootProperties>(true);
2727
target.Should().NotBeNull();

‎J4JCommandLine.Tests/ListPropertyTest.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ namespace J4JCommandLine.Tests
88
public class ListPropertyTest
99
{
1010
[Theory]
11-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] { 33 })]
12-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
13-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] { 33 })]
14-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
11+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] { 33 })]
12+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
13+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] { 33 })]
14+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
1515
public void root_properties(
1616
string cmdLine,
1717
bool required,
18-
MappingResults result,
18+
MappingResult result,
1919
int[] optValue,
2020
int[] unkeyedValues)
2121
{
@@ -28,14 +28,14 @@ public void root_properties(
2828
}
2929

3030
[Theory]
31-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] { 33 })]
32-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
33-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] { 33 })]
34-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
31+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] { 33 })]
32+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
33+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] { 33 })]
34+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
3535
public void parameterless_properties(
3636
string cmdLine,
3737
bool required,
38-
MappingResults result,
38+
MappingResult result,
3939
int[] optValue,
4040
int[] unkeyedValues)
4141
{
@@ -48,14 +48,14 @@ public void parameterless_properties(
4848
}
4949

5050
[Theory]
51-
[InlineData("-z 32 33", true, MappingResults.MissingRequired, new int[] { }, new int[] { 33 })]
52-
[InlineData("-x 32 33", true, MappingResults.Success, new int[] { 32 }, new int[] { 33 })]
53-
[InlineData("-z 32 33", false, MappingResults.Success, new int[] { }, new int[] { 33 })]
54-
[InlineData("-x 32 -x 33", true, MappingResults.Success, new int[] { 32, 33 }, new int[] { })]
51+
[InlineData("-z 32 33", true, MappingResult.MissingRequired, new int[] { }, new int[] { 33 })]
52+
[InlineData("-x 32 33", true, MappingResult.Success, new int[] { 32 }, new int[] { 33 })]
53+
[InlineData("-z 32 33", false, MappingResult.Success, new int[] { }, new int[] { 33 })]
54+
[InlineData("-x 32 -x 33", true, MappingResult.Success, new int[] { 32, 33 }, new int[] { })]
5555
public void parametered_properties(
5656
string cmdLine,
5757
bool required,
58-
MappingResults result,
58+
MappingResult result,
5959
int[] optValue,
6060
int[] unkeyedValues)
6161
{
@@ -77,7 +77,7 @@ private void ProcessTest<T>(
7777
BindingTarget<T> target,
7878
Option option,
7979
Option unkeyed,
80-
MappingResults desiredParseResults,
80+
MappingResult desiredParseResult,
8181
Func<TestProperties> results,
8282
int[] optValue,
8383
int[] unkeyedValues)
@@ -92,7 +92,7 @@ private void ProcessTest<T>(
9292
option.Required();
9393

9494
var parseResults = target.Parse(new string[] { cmdLine });
95-
parseResults.Should().Be(desiredParseResults);
95+
parseResults.Should().Be(desiredParseResult);
9696

9797
results().IntList.Should().BeEquivalentTo(optValue);
9898
results().Unkeyed.Should().BeEquivalentTo(unkeyedValues);

‎J4JCommandLine.Tests/SimplePropertyTest.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ namespace J4JCommandLine.Tests
88
public class SimplePropertyTest
99
{
1010
[Theory]
11-
[InlineData("-z 32", true, MappingResults.MissingRequired, -1, new int[] { })]
12-
[InlineData("-x 32", true, MappingResults.Success, 32, new int[] { })]
13-
[InlineData("-z 32", false, MappingResults.Success, -1, new int[] { })]
11+
[InlineData("-z 32", true, MappingResult.MissingRequired, -1, new int[] { })]
12+
[InlineData("-x 32", true, MappingResult.Success, 32, new int[] { })]
13+
[InlineData("-z 32", false, MappingResult.Success, -1, new int[] { })]
1414
public void root_properties(
1515
string cmdLine,
1616
bool required,
17-
MappingResults result,
17+
MappingResult result,
1818
int optValue,
1919
int[] unkeyedValues)
2020
{
@@ -27,13 +27,13 @@ public void root_properties(
2727
}
2828

2929
[Theory]
30-
[InlineData("-z 32", true, MappingResults.MissingRequired, -1, new int[] { })]
31-
[InlineData("-x 32", true, MappingResults.Success, 32, new int[] { })]
32-
[InlineData("-z 32", false, MappingResults.Success, -1, new int[] { })]
30+
[InlineData("-z 32", true, MappingResult.MissingRequired, -1, new int[] { })]
31+
[InlineData("-x 32", true, MappingResult.Success, 32, new int[] { })]
32+
[InlineData("-z 32", false, MappingResult.Success, -1, new int[] { })]
3333
public void parameterless_properties(
3434
string cmdLine,
3535
bool required,
36-
MappingResults result,
36+
MappingResult result,
3737
int optValue,
3838
int[] unkeyedValues)
3939
{
@@ -46,13 +46,13 @@ public void parameterless_properties(
4646
}
4747

4848
[Theory]
49-
[InlineData("-z 32", true, MappingResults.MissingRequired, -1, new int[] { })]
50-
[InlineData("-x 32", true, MappingResults.Success, 32, new int[] { })]
51-
[InlineData("-z 32", false, MappingResults.Success, -1, new int[] { })]
49+
[InlineData("-z 32", true, MappingResult.MissingRequired, -1, new int[] { })]
50+
[InlineData("-x 32", true, MappingResult.Success, 32, new int[] { })]
51+
[InlineData("-z 32", false, MappingResult.Success, -1, new int[] { })]
5252
public void parametered_properties(
5353
string cmdLine,
5454
bool required,
55-
MappingResults result,
55+
MappingResult result,
5656
int optValue,
5757
int[] unkeyedValues)
5858
{
@@ -74,7 +74,7 @@ private void ProcessTest<T>(
7474
BindingTarget<T> target,
7575
Option option,
7676
Option unkeyed,
77-
MappingResults desiredParseResults,
77+
MappingResult desiredParseResult,
7878
Func<TestProperties> results,
7979
int optValue,
8080
int[] unkeyedValues )
@@ -91,7 +91,7 @@ private void ProcessTest<T>(
9191
option.Required();
9292

9393
var parseResults = target.Parse(new string[] { cmdLine });
94-
parseResults.Should().Be( desiredParseResults );
94+
parseResults.Should().Be( desiredParseResult );
9595

9696
results().Unkeyed.Should().BeEmpty();
9797
results().IntProperty.Should().Be(optValue);

‎J4JCommandLine.Tests/SwitchPropertyTest.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ namespace J4JCommandLine.Tests
88
public class SwitchPropertyTest
99
{
1010
[Theory]
11-
[InlineData("-x 32", MappingResults.Success, true, new int[] { 32 })]
12-
[InlineData("-x", MappingResults.Success, true, new int[] { })]
11+
[InlineData("-x 32", MappingResult.Success, true, new int[] { 32 })]
12+
[InlineData("-x", MappingResult.Success, true, new int[] { })]
1313
public void root_properties(
1414
string cmdLine,
15-
MappingResults result,
15+
MappingResult result,
1616
bool optValue,
1717
int[] unkeyedValues)
1818
{
@@ -25,11 +25,11 @@ public void root_properties(
2525
}
2626

2727
[Theory]
28-
[InlineData("-x 32", MappingResults.Success, true, new int[] { 32 })]
29-
[InlineData("-x", MappingResults.Success, true, new int[] { })]
28+
[InlineData("-x 32", MappingResult.Success, true, new int[] { 32 })]
29+
[InlineData("-x", MappingResult.Success, true, new int[] { })]
3030
public void parameterless_properties(
3131
string cmdLine,
32-
MappingResults result,
32+
MappingResult result,
3333
bool optValue,
3434
int[] unkeyedValues)
3535
{
@@ -42,11 +42,11 @@ public void parameterless_properties(
4242
}
4343

4444
[Theory]
45-
[InlineData("-x 32", MappingResults.Success, true, new int[] { 32 })]
46-
[InlineData("-x", MappingResults.Success, true, new int[] { })]
45+
[InlineData("-x 32", MappingResult.Success, true, new int[] { 32 })]
46+
[InlineData("-x", MappingResult.Success, true, new int[] { })]
4747
public void parametered_properties(
4848
string cmdLine,
49-
MappingResults result,
49+
MappingResult result,
5050
bool optValue,
5151
int[] unkeyedValues)
5252
{
@@ -67,7 +67,7 @@ private void ProcessTest<T>(
6767
BindingTarget<T> target,
6868
Option option,
6969
Option unkeyed,
70-
MappingResults desiredParseResults,
70+
MappingResult desiredParseResult,
7171
Func<TestProperties> results,
7272
bool optValue,
7373
int[] unkeyedValues)
@@ -79,7 +79,7 @@ private void ProcessTest<T>(
7979
unkeyed.Should().BeAssignableTo<MappableOption>();
8080

8181
var parseResults = target.Parse(new string[] { cmdLine });
82-
parseResults.Should().Be(desiredParseResults);
82+
parseResults.Should().Be(desiredParseResult);
8383

8484
results().Switch.Should().Be(optValue);
8585
results().Unkeyed.Should().BeEquivalentTo(unkeyedValues);

0 commit comments

Comments
 (0)