Skip to content

Commit 6eef294

Browse files
gsscodergsscoder
committed
All name of test fixture methods changed to a new convention.
1 parent 90c26b1 commit 6eef294

27 files changed

+249
-233
lines changed

‎CommandLine.sln.DotSettings.user

+1-1
Large diffs are not rendered by default.

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Compatibility:
1111

1212
News:
1313
---
14+
- All names of test fixture methods changed to a new convention (using https://gist.github.com/4655503).
1415
- Started refactoring on test project (migrating from NUnit to Xunit).
1516
- Thanks to @marcells, we can reference CommandLine.dll from CommandLine.Tests.dll keeping strong name.
1617
- Introduced ``ValueOptionAttribute`` enhancement of issue #33.

‎doc/ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2013-01-28 Giacomo Stelluti Scala <[email protected]>
2+
3+
* All name of test fixture methods changed to a new convention (e.g.: A_descriptive_assertion)
4+
using https://gist.github.com/4655503.
5+
16
2013-01-27 Giacomo Stelluti Scala <[email protected]>
27

38
* Started refactoring on test project (migrating from NUnit to Xunit).

‎src/tests/Attributes/AttributesFixture.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
namespace CommandLine.Tests
3535
{
36-
3736
public class AttributesFixture
3837
{
3938
class CustomOptionAttribute : BaseOptionAttribute
@@ -79,36 +78,36 @@ public CustomOptionAttribute(char shortName, string longName)
7978

8079
#region API change 01
8180
[Fact]
82-
public void ShortNameWithLineTerminatorThrowsException()
81+
public void Short_name_with_line_terminator_throws_exception()
8382
{
8483
Assert.Throws<ArgumentException>(() =>
8584
new OptionAttribute('\n'));
8685
}
8786

8887
[Fact]
89-
public void ShortNameWithLineTerminatorThrowsException_2()
88+
public void Short_name_with_line_terminator_throws_exception_2()
9089
{
9190
Assert.Throws<ArgumentException>(() =>
9291
new OptionAttribute('\r'));
9392
}
9493

9594
[Fact]
96-
public void ShortNameWithWhiteSpaceThrowsException()
95+
public void Short_name_with_white_space_throws_exception()
9796
{
9897
Assert.Throws<ArgumentException>(() =>
9998
new OptionAttribute(' '));
10099
}
101100

102101
[Fact]
103-
public void ShortNameWithWhiteSpaceThrowsException_2()
102+
public void Short_name_with_white_space_throws_exception_2()
104103
{
105104
Assert.Throws<ArgumentException>(() =>
106105
new OptionAttribute('\t'));
107106
}
108107
#endregion
109108

110109
[Fact]
111-
public void AllOptionsAllowOneCharacterInShortName()
110+
public void All_options_allow_one_character_in_short_name()
112111
{
113112
new OptionAttribute('o', null);
114113
new OptionListAttribute('l', null);
@@ -117,12 +116,12 @@ public void AllOptionsAllowOneCharacterInShortName()
117116
}
118117

119118
[Fact]
120-
public void AllOptionsAllowNullValueInShortName()
119+
public void All_options_allow_null_value_in_short_name()
121120
{
122121
new OptionAttribute("option-attr");
123122
new OptionListAttribute("option-list-attr");
124123
new HelpOptionAttribute("help-attr");
125124
new CustomOptionAttribute("custom-attr");
126125
}
127126
}
128-
}
127+
}

‎src/tests/Attributes/HelpOptionAttributeFixture.cs

+5-7
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@
2828
#endregion
2929
#region Using Directives
3030
using System;
31-
using System.ComponentModel;
3231
using System.IO;
3332
using CommandLine.Text;
3433
using Xunit;
3534
using FluentAssertions;
3635
#endregion
3736

3837
namespace CommandLine.Tests
39-
{
40-
38+
{
4139
public class HelpOptionAttributeFixture : CommandLineParserBaseFixture
4240
{
4341
#region Mock Objects
@@ -72,7 +70,7 @@ public string GetUsage()
7270
#endregion
7371

7472
[Fact]
75-
public void CorrectInputNotActivatesHelp()
73+
public void Correct_input_not_activates_help()
7674
{
7775
var options = new MockOptions();
7876
var writer = new StringWriter();
@@ -85,7 +83,7 @@ public void CorrectInputNotActivatesHelp()
8583
}
8684

8785
[Fact]
88-
public void BadInputActivatesHelp()
86+
public void Bad_input_activates_help()
8987
{
9088
var options = new MockOptions();
9189
var writer = new StringWriter();
@@ -102,7 +100,7 @@ public void BadInputActivatesHelp()
102100
}
103101

104102
[Fact]
105-
public void ExplicitHelpActivation()
103+
public void Explicit_help_activation()
106104
{
107105
var options = new MockOptions();
108106
var writer = new StringWriter();
@@ -116,4 +114,4 @@ public void ExplicitHelpActivation()
116114
(helpText.Length > 0).Should().BeTrue();
117115
}
118116
}
119-
}
117+
}

‎src/tests/Attributes/ValueListAttributeFixture.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,33 @@ private class MockOptions
5151
#endregion
5252

5353
[Fact]
54-
public void WillThrowExceptionIfConcreteTypeIsNull()
54+
public void Will_throw_exception_if_concrete_type_is_null()
5555
{
5656
Assert.Throws<ArgumentNullException>(
5757
() => new ValueListAttribute(null));
5858
}
5959

6060
[Fact]
61-
public void WillThrowExceptionIfConcreteTypeIsIncompatible()
61+
public void Will_throw_exception_if_concrete_type_is_incompatible()
6262
{
6363
Assert.Throws<CommandLineParserException>(
6464
() => new ValueListAttribute(new List<object>().GetType()));
6565
}
6666

6767
[Fact]
68-
public void ConcreteTypeIsGenericListOfString()
68+
public void Concrete_type_is_generic_list_of_string()
6969
{
7070
new ValueListAttribute(new List<string>().GetType());
7171
}
7272

7373
[Fact]
74-
public void ConcreteTypeIsGenericListOfStringSubType()
74+
public void Concrete_type_is_generic_list_of_string_sub_type()
7575
{
7676
new ValueListAttribute(new MockSpecializedList().GetType());
7777
}
7878

7979
[Fact]
80-
public void GetGenericListOfStringInterfaceReference()
80+
public void Get_generic_list_of_string_interface_reference()
8181
{
8282
var options = new MockOptions();
8383

@@ -87,7 +87,7 @@ public void GetGenericListOfStringInterfaceReference()
8787
}
8888

8989
[Fact]
90-
public void UseGenericListOfStringInterfaceReference()
90+
public void Use_generic_list_of_string_interface_reference()
9191
{
9292
var options = new MockOptions();
9393

@@ -99,4 +99,4 @@ public void UseGenericListOfStringInterfaceReference()
9999
base.ElementsShouldBeEqual(new string[] { "value0", "value1", "value2" }, options.Values);
100100
}
101101
}
102-
}
102+
}

‎src/tests/CommandLine.Tests.csproj

+20-19
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,27 @@
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>
50+
<Compile Include="Attributes\AttributesFixture.cs" />
51+
<Compile Include="Attributes\HelpOptionAttributeFixture.cs" />
52+
<Compile Include="Attributes\ValueListAttributeFixture.cs" />
53+
<Compile Include="Core\ArgumentParserFixture.cs" />
54+
<Compile Include="Core\EnumeratorsFixture.cs" />
55+
<Compile Include="Core\OptionMapFixture.cs" />
5056
<Compile Include="Mocks\CommandLineOptionsBase.cs" />
5157
<Compile Include="Mocks\SimpleOptionsWithValueOptionAndValueList.cs" />
5258
<Compile Include="Mocks\SimpleOptionsWithValueOption.cs" />
5359
<Compile Include="Mocks\SimpleOptionsForStrict.cs" />
5460
<Compile Include="Mocks\OptionsWithVerbsHelp.cs" />
5561
<Compile Include="Mocks\OptionsWithVerbs.cs" />
62+
<Compile Include="Parser\CommandLineParserFixture.cs" />
63+
<Compile Include="Parser\CommandLineParserSettingsFixture.cs" />
64+
<Compile Include="Parser\MutuallyExclusiveParsingFixture.cs" />
65+
<Compile Include="Parser\NullableTypesParsingFixture.cs" />
66+
<Compile Include="Parser\OptionArrayAttributeParsingFixture.cs" />
67+
<Compile Include="Parser\SingletonFixture.cs" />
5668
<Compile Include="Parser\StrictFixture.cs" />
69+
<Compile Include="Parser\UnknownArgumentsFixture.cs" />
70+
<Compile Include="Parser\ValueListAttributeParsingFixture.cs" />
5771
<Compile Include="Parser\ValueOptionAttributeParsingFixture.cs" />
5872
<Compile Include="Parser\VerbsFixture.cs" />
5973
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -79,35 +93,21 @@
7993
<Compile Include="Mocks\SimpleOptionsWithHelpOption.cs" />
8094
<Compile Include="Mocks\SimpleOptionsWithOptionList.cs" />
8195
<Compile Include="Mocks\SimpleOptionsWithValueList.cs" />
82-
<Compile Include="Attributes\AttributesFixture.cs" />
83-
<Compile Include="Attributes\HelpOptionAttributeFixture.cs" />
84-
<Compile Include="Attributes\ValueListAttributeFixture.cs" />
85-
<Compile Include="Core\ArgumentParserFixture.cs" />
86-
<Compile Include="Core\EnumeratorsFixture.cs" />
87-
<Compile Include="Core\OptionMapFixture.cs" />
88-
<Compile Include="Parser\CommandLineParserFixture.cs" />
89-
<Compile Include="Parser\CommandLineParserSettingsFixture.cs" />
90-
<Compile Include="Parser\MutuallyExclusiveParsingFixture.cs" />
91-
<Compile Include="Parser\NullableTypesParsingFixture.cs" />
92-
<Compile Include="Parser\OptionArrayAttributeParsingFixture.cs" />
93-
<Compile Include="Parser\ValueListAttributeParsingFixture.cs" />
94-
<Compile Include="Text\CopyrightInfoFixture.cs" />
95-
<Compile Include="Text\HeadingInfoFixture.cs" />
96-
<Compile Include="Text\HelpTextFixture.cs" />
97-
<Compile Include="Text\VerbsHelpTextFixture.cs" />
98-
<Compile Include="Parser\SingletonFixture.cs" />
9996
<Compile Include="Mocks\SimpleOptionsWithDefaults.cs" />
10097
<Compile Include="Mocks\SimpleOptionsWithBadDefaults.cs" />
10198
<Compile Include="Mocks\SimpleOptionsWithDefaultArray.cs" />
10299
<Compile Include="Mocks\RPEOptions.cs" />
103100
<Compile Include="Mocks\SimpleOptionsForAutoBuid.cs" />
104-
<Compile Include="Parser\UnknownArgumentsFixture.cs" />
105101
<Compile Include="Mocks\OptionsForPlugInScenario.cs" />
106102
<Compile Include="Mocks\OptionsWithUIntArray.cs" />
107-
<Compile Include="Text\MultiLineTextAttributeFixture.cs" />
108103
<Compile Include="..\CommonAssemblyInfo.cs">
109104
<Link>Properties\CommonAssemblyInfo.cs</Link>
110105
</Compile>
106+
<Compile Include="Text\CopyrightInfoFixture.cs" />
107+
<Compile Include="Text\HeadingInfoFixture.cs" />
108+
<Compile Include="Text\HelpTextFixture.cs" />
109+
<Compile Include="Text\MultiLineTextAttributeFixture.cs" />
110+
<Compile Include="Text\VerbsHelpTextFixture.cs" />
111111
<Compile Include="Utils\ReflectionUtilFixture.cs" />
112112
</ItemGroup>
113113
<ItemGroup>
@@ -120,5 +120,6 @@
120120
<Name>CommandLine</Name>
121121
</ProjectReference>
122122
</ItemGroup>
123+
<ItemGroup />
123124
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
124125
</Project>

‎src/tests/Core/ArgumentParserFixture.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace CommandLine.Tests
3939
public class ArgumentParserFixture : BaseFixture
4040
{
4141
[Fact]
42-
public void GetNextInputValues()
42+
public void Get_next_input_values()
4343
{
4444
var ae = new StringArrayEnumerator(new string[] { "--optarr", "one", "two", "--plain", "3" });
4545

@@ -51,4 +51,4 @@ public void GetNextInputValues()
5151
ae.Current.Should().Be("two");
5252
}
5353
}
54-
}
54+
}

‎src/tests/Core/EnumeratorsFixture.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434

3535
namespace CommandLine.Tests
3636
{
37-
3837
public class EnumeratorsFixture
3938
{
4039
[Fact]
41-
public void StringIteration()
40+
public void String_iteration()
4241
{
4342
const string valueOne = "one";
4443
const string valueTwo = "two";
@@ -66,7 +65,7 @@ public void StringIteration()
6665
}
6766

6867
[Fact]
69-
public void CharIteration()
68+
public void Char_iteration()
7069
{
7170
IArgumentEnumerator e = new OneCharStringEnumerator("abcd");
7271
e.MoveNext();
@@ -96,4 +95,4 @@ public void CharIteration()
9695
e.IsLast.Should().BeTrue();
9796
}
9897
}
99-
}
98+
}

‎src/tests/Core/OptionMapFixture.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public OptionMap OptionMap
8989
#endregion
9090

9191
[Fact]
92-
public void ManageOptions()
92+
public void Manage_options()
9393
{
9494
var omBuilder = new OptionMapBuilder(3);
9595
omBuilder.AppendOption('p', "pretend");
@@ -146,4 +146,5 @@ private static OptionMap CreateMap (ref OptionMap map, IDictionary<string, Optio
146146
return map;
147147
}
148148
}
149-
}
149+
}
150+

0 commit comments

Comments
 (0)