Skip to content

Commit 0958edd

Browse files
committed
Test DLL namespaces reorganization finished.
1 parent a6ab356 commit 0958edd

21 files changed

Lines changed: 289 additions & 293 deletions

CommandLine.sln.DotSettings.user

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/tests/CommandLine.Tests.csproj

Lines changed: 134 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,135 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>10.0.0</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{86E1AC34-ED2D-4E42-8B95-65208FEA36C2}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>CommandLine.Tests</RootNamespace>
11-
<AssemblyName>CommandLine.Tests</AssemblyName>
12-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
13-
<RestorePackages>true</RestorePackages>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug</OutputPath>
20-
<DefineConstants>TRACE;DEBUG</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<ConsolePause>false</ConsolePause>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>none</DebugType>
27-
<Optimize>false</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<ConsolePause>false</ConsolePause>
32-
<DefineConstants>UNIT_TESTS</DefineConstants>
33-
</PropertyGroup>
34-
<PropertyGroup>
35-
<SignAssembly>true</SignAssembly>
36-
</PropertyGroup>
37-
<PropertyGroup>
38-
<AssemblyOriginatorKeyFile>CommandLine.snk</AssemblyOriginatorKeyFile>
39-
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="FluentAssertions">
42-
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
43-
</Reference>
44-
<Reference Include="System" />
45-
<Reference Include="System.Xml" />
46-
<Reference Include="System.Xml.Linq" />
47-
<Reference Include="xunit">
48-
<HintPath>..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
49-
</Reference>
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="..\SharedAssemblyInfo.cs">
53-
<Link>Properties\SharedAssemblyInfo.cs</Link>
54-
</Compile>
55-
<Compile Include="Fakes\OptionsWithImplicitLongName.cs" />
56-
<Compile Include="Fakes\OptionsWithTwoArrays.cs" />
57-
<Compile Include="Unit\Attributes\AttributesFixture.cs" />
58-
<Compile Include="Unit\Attributes\HelpOptionAttributeFixture.cs" />
59-
<Compile Include="Unit\Attributes\OptionArrayAttributeFixture.cs" />
60-
<Compile Include="Unit\Attributes\OptionAttributeFixture.cs" />
61-
<Compile Include="Unit\Attributes\ValueListAttributeFixture.cs" />
62-
<Compile Include="Unit\Attributes\ValueOptionAttributeFixture.cs" />
63-
<Compile Include="Unit\Infrastructure\ArgumentParserFixture.cs" />
64-
<Compile Include="Unit\Infrastructure\EnumeratorsFixture.cs" />
65-
<Compile Include="Unit\Infrastructure\OptionMapFixture.cs" />
66-
<Compile Include="Fakes\CommandLineOptionsBase.cs" />
67-
<Compile Include="Fakes\OptionsWithValueOptionExplicitIndex.cs" />
68-
<Compile Include="Fakes\OptionsWithValueOptionImplicitIndex.cs" />
69-
<Compile Include="Fakes\SimpleOptionsWithValueOptionAndValueList.cs" />
70-
<Compile Include="Fakes\SimpleOptionsWithValueOption.cs" />
71-
<Compile Include="Fakes\SimpleOptionsForStrict.cs" />
72-
<Compile Include="Fakes\OptionsWithVerbsHelp.cs" />
73-
<Compile Include="Fakes\OptionsWithVerbs.cs" />
74-
<Compile Include="Unit\Parser\ParserFixture.cs" />
75-
<Compile Include="Unit\Parser\ParserSettingsFixture.cs" />
76-
<Compile Include="Unit\Parser\MutuallyExclusiveParsingFixture.cs" />
77-
<Compile Include="Unit\Parser\NullableTypesParsingFixture.cs" />
78-
<Compile Include="Unit\Parser\OptionArrayAttributeParsingFixture.cs" />
79-
<Compile Include="Unit\Parser\SingletonFixture.cs" />
80-
<Compile Include="Unit\Parser\StrictFixture.cs" />
81-
<Compile Include="Unit\Parser\UnknownArgumentsFixture.cs" />
82-
<Compile Include="Unit\Parser\ValueListAttributeParsingFixture.cs" />
83-
<Compile Include="Unit\Parser\ValueOptionAttributeParsingFixture.cs" />
84-
<Compile Include="Unit\Parser\VerbsFixture.cs" />
85-
<Compile Include="Properties\AssemblyInfo.cs" />
86-
<Compile Include="Unit\BaseFixture.cs" />
87-
<Compile Include="Unit\ParserBaseFixture.cs" />
88-
<Compile Include="Unit\DebugStringUtil.cs" />
89-
<Compile Include="Fakes\BooleanSetOptions.cs" />
90-
<Compile Include="Fakes\ComplexOptions.cs" />
91-
<Compile Include="Fakes\MixedCaseOptions.cs" />
92-
<Compile Include="Fakes\NullableTypesOptions.cs" />
93-
<Compile Include="Fakes\NumberSetOptions.cs" />
94-
<Compile Include="Fakes\OptionsBase.cs" />
95-
<Compile Include="Fakes\OptionsWithDefaultSet.cs" />
96-
<Compile Include="Fakes\OptionsWithMultipleSet.cs" />
97-
<Compile Include="Fakes\OptionsWithMultipleSetAndOneOption.cs" />
98-
<Compile Include="Fakes\OptionsWithValueListMaximumThree.cs" />
99-
<Compile Include="Fakes\OptionsWithValueListMaximumZero.cs" />
100-
<Compile Include="Fakes\SimpleOptions.cs" />
101-
<Compile Include="Fakes\SimpleOptionsWithArray.cs" />
102-
<Compile Include="Fakes\SimpleOptionsWithArrayAndValueList.cs" />
103-
<Compile Include="Fakes\SimpleOptionsWithBadOptionArray.cs" />
104-
<Compile Include="Fakes\SimpleOptionsWithEnum.cs" />
105-
<Compile Include="Fakes\SimpleOptionsWithHelpOption.cs" />
106-
<Compile Include="Fakes\SimpleOptionsWithOptionList.cs" />
107-
<Compile Include="Fakes\SimpleOptionsWithValueList.cs" />
108-
<Compile Include="Fakes\SimpleOptionsWithDefaults.cs" />
109-
<Compile Include="Fakes\SimpleOptionsWithBadDefaults.cs" />
110-
<Compile Include="Fakes\SimpleOptionsWithDefaultArray.cs" />
111-
<Compile Include="Fakes\OptionsForErrorsScenario.cs" />
112-
<Compile Include="Fakes\SimpleOptionsForAutoBuid.cs" />
113-
<Compile Include="Fakes\OptionsForPlugInScenario.cs" />
114-
<Compile Include="Fakes\OptionsWithUIntArray.cs" />
115-
<Compile Include="Unit\Text\CopyrightInfoFixture.cs" />
116-
<Compile Include="Unit\Text\HeadingInfoFixture.cs" />
117-
<Compile Include="Unit\Text\HelpTextFixture.cs" />
118-
<Compile Include="Unit\Text\MultiLineTextAttributeFixture.cs" />
119-
<Compile Include="Unit\Text\VerbsHelpTextFixture.cs" />
120-
<Compile Include="Unit\Helpers\ReflectionUtilFixture.cs" />
121-
</ItemGroup>
122-
<ItemGroup>
123-
<None Include="CommandLine.snk" />
124-
<None Include="packages.config" />
125-
</ItemGroup>
126-
<ItemGroup>
127-
<ProjectReference Include="..\libcmdline\CommandLine.csproj">
128-
<Project>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</Project>
129-
<Name>CommandLine</Name>
130-
</ProjectReference>
131-
</ItemGroup>
132-
<ItemGroup />
133-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
134-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>10.0.0</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{86E1AC34-ED2D-4E42-8B95-65208FEA36C2}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>CommandLine.Tests</RootNamespace>
11+
<AssemblyName>CommandLine.Tests</AssemblyName>
12+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
13+
<RestorePackages>true</RestorePackages>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug</OutputPath>
20+
<DefineConstants>TRACE;DEBUG</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
<ConsolePause>false</ConsolePause>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>none</DebugType>
27+
<Optimize>false</Optimize>
28+
<OutputPath>bin\Release</OutputPath>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
<ConsolePause>false</ConsolePause>
32+
<DefineConstants>UNIT_TESTS</DefineConstants>
33+
</PropertyGroup>
34+
<PropertyGroup>
35+
<SignAssembly>true</SignAssembly>
36+
</PropertyGroup>
37+
<PropertyGroup>
38+
<AssemblyOriginatorKeyFile>CommandLine.snk</AssemblyOriginatorKeyFile>
39+
</PropertyGroup>
40+
<ItemGroup>
41+
<Reference Include="FluentAssertions">
42+
<HintPath>..\..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
43+
</Reference>
44+
<Reference Include="System" />
45+
<Reference Include="System.Xml" />
46+
<Reference Include="System.Xml.Linq" />
47+
<Reference Include="xunit">
48+
<HintPath>..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
49+
</Reference>
50+
</ItemGroup>
51+
<ItemGroup>
52+
<Compile Include="..\SharedAssemblyInfo.cs">
53+
<Link>Properties\SharedAssemblyInfo.cs</Link>
54+
</Compile>
55+
<Compile Include="Fakes\OptionsWithImplicitLongName.cs" />
56+
<Compile Include="Fakes\OptionsWithTwoArrays.cs" />
57+
<Compile Include="Unit\Attributes\AttributesFixture.cs" />
58+
<Compile Include="Unit\Attributes\HelpOptionAttributeFixture.cs" />
59+
<Compile Include="Unit\Attributes\OptionArrayAttributeFixture.cs" />
60+
<Compile Include="Unit\Attributes\OptionAttributeFixture.cs" />
61+
<Compile Include="Unit\Attributes\ValueListAttributeFixture.cs" />
62+
<Compile Include="Unit\Attributes\ValueOptionAttributeFixture.cs" />
63+
<Compile Include="Unit\Infrastructure\ArgumentParserFixture.cs" />
64+
<Compile Include="Unit\Infrastructure\EnumeratorsFixture.cs" />
65+
<Compile Include="Unit\Infrastructure\OptionMapFixture.cs" />
66+
<Compile Include="Fakes\CommandLineOptionsBase.cs" />
67+
<Compile Include="Fakes\OptionsWithValueOptionExplicitIndex.cs" />
68+
<Compile Include="Fakes\OptionsWithValueOptionImplicitIndex.cs" />
69+
<Compile Include="Fakes\SimpleOptionsWithValueOptionAndValueList.cs" />
70+
<Compile Include="Fakes\SimpleOptionsWithValueOption.cs" />
71+
<Compile Include="Fakes\SimpleOptionsForStrict.cs" />
72+
<Compile Include="Fakes\OptionsWithVerbsHelp.cs" />
73+
<Compile Include="Fakes\OptionsWithVerbs.cs" />
74+
<Compile Include="Unit\Parser\ParserFixture.cs" />
75+
<Compile Include="Unit\Parser\ParserSettingsFixture.cs" />
76+
<Compile Include="Unit\Parser\MutuallyExclusiveParsingFixture.cs" />
77+
<Compile Include="Unit\Parser\NullableTypesParsingFixture.cs" />
78+
<Compile Include="Unit\Parser\OptionArrayAttributeParsingFixture.cs" />
79+
<Compile Include="Unit\Parser\SingletonFixture.cs" />
80+
<Compile Include="Unit\Parser\StrictFixture.cs" />
81+
<Compile Include="Unit\Parser\UnknownArgumentsFixture.cs" />
82+
<Compile Include="Unit\Parser\ValueListAttributeParsingFixture.cs" />
83+
<Compile Include="Unit\Parser\ValueOptionAttributeParsingFixture.cs" />
84+
<Compile Include="Unit\Parser\VerbsFixture.cs" />
85+
<Compile Include="Properties\AssemblyInfo.cs" />
86+
<Compile Include="Unit\BaseFixture.cs" />
87+
<Compile Include="Unit\ParserBaseFixture.cs" />
88+
<Compile Include="Unit\DebugStringUtil.cs" />
89+
<Compile Include="Fakes\BooleanSetOptions.cs" />
90+
<Compile Include="Fakes\ComplexOptions.cs" />
91+
<Compile Include="Fakes\MixedCaseOptions.cs" />
92+
<Compile Include="Fakes\NullableTypesOptions.cs" />
93+
<Compile Include="Fakes\NumberSetOptions.cs" />
94+
<Compile Include="Fakes\OptionsBase.cs" />
95+
<Compile Include="Fakes\OptionsWithDefaultSet.cs" />
96+
<Compile Include="Fakes\OptionsWithMultipleSet.cs" />
97+
<Compile Include="Fakes\OptionsWithMultipleSetAndOneOption.cs" />
98+
<Compile Include="Fakes\OptionsWithValueListMaximumThree.cs" />
99+
<Compile Include="Fakes\OptionsWithValueListMaximumZero.cs" />
100+
<Compile Include="Fakes\SimpleOptions.cs" />
101+
<Compile Include="Fakes\SimpleOptionsWithArray.cs" />
102+
<Compile Include="Fakes\SimpleOptionsWithArrayAndValueList.cs" />
103+
<Compile Include="Fakes\SimpleOptionsWithBadOptionArray.cs" />
104+
<Compile Include="Fakes\SimpleOptionsWithEnum.cs" />
105+
<Compile Include="Fakes\SimpleOptionsWithHelpOption.cs" />
106+
<Compile Include="Fakes\SimpleOptionsWithOptionList.cs" />
107+
<Compile Include="Fakes\SimpleOptionsWithValueList.cs" />
108+
<Compile Include="Fakes\SimpleOptionsWithDefaults.cs" />
109+
<Compile Include="Fakes\SimpleOptionsWithBadDefaults.cs" />
110+
<Compile Include="Fakes\SimpleOptionsWithDefaultArray.cs" />
111+
<Compile Include="Fakes\OptionsForErrorsScenario.cs" />
112+
<Compile Include="Fakes\SimpleOptionsForAutoBuid.cs" />
113+
<Compile Include="Fakes\OptionsForPlugInScenario.cs" />
114+
<Compile Include="Fakes\OptionsWithUIntArray.cs" />
115+
<Compile Include="Unit\Text\CopyrightInfoFixture.cs" />
116+
<Compile Include="Unit\Text\HeadingInfoFixture.cs" />
117+
<Compile Include="Unit\Text\HelpTextFixture.cs" />
118+
<Compile Include="Unit\Text\MultiLineTextAttributeFixture.cs" />
119+
<Compile Include="Unit\Text\VerbsHelpTextFixture.cs" />
120+
<Compile Include="Unit\Helpers\ReflectionUtilFixture.cs" />
121+
</ItemGroup>
122+
<ItemGroup>
123+
<None Include="CommandLine.snk" />
124+
<None Include="packages.config" />
125+
</ItemGroup>
126+
<ItemGroup>
127+
<ProjectReference Include="..\libcmdline\CommandLine.csproj">
128+
<Project>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</Project>
129+
<Name>CommandLine</Name>
130+
</ProjectReference>
131+
</ItemGroup>
132+
<ItemGroup />
133+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
134+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
135135
</Project>

src/tests/Unit/Attributes/AttributesFixture.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
namespace CommandLine.Tests.Unit.Attributes
3535
{
36-
37-
3836
public class AttributesFixture
3937
{
4038
class CustomOptionAttribute : BaseOptionAttribute

src/tests/Unit/Attributes/HelpOptionAttributeFixture.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636

3737
namespace CommandLine.Tests.Unit.Attributes
3838
{
39-
40-
4139
public class HelpOptionAttributeFixture : ParserBaseFixture
4240
{
4341
#region Mock Objects
@@ -76,7 +74,7 @@ public void Correct_input_not_activates_help()
7674
{
7775
var options = new MockOptions();
7876
var writer = new StringWriter();
79-
var parser = new Parser(with => with.HelpWriter = writer);
77+
var parser = new CommandLine.Parser(with => with.HelpWriter = writer);
8078
var result = parser.ParseArguments(
8179
new string[] { "-imath.xml", "-oresult.xml" }, options);
8280

@@ -89,7 +87,7 @@ public void Bad_input_activates_help()
8987
{
9088
var options = new MockOptions();
9189
var writer = new StringWriter();
92-
var parser = new Parser(with => with.HelpWriter = writer);
90+
var parser = new CommandLine.Parser(with => with.HelpWriter = writer);
9391
var result = parser.ParseArguments(
9492
new string[] { "math.xml", "-oresult.xml" }, options);
9593

@@ -106,7 +104,7 @@ public void Explicit_help_activation()
106104
{
107105
var options = new MockOptions();
108106
var writer = new StringWriter();
109-
var parser = new Parser(with => with.HelpWriter = writer);
107+
var parser = new CommandLine.Parser(with => with.HelpWriter = writer);
110108
var result = parser.ParseArguments(
111109
new string[] { "--help" }, options);
112110

src/tests/Unit/Attributes/OptionArrayAttributeFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void Should_correctly_parse_two_consecutive_arrays()
1818
{
1919
// Given
2020
var options = new OptionsWithTwoArrays();
21-
var parser = new Parser();
21+
var parser = new CommandLine.Parser();
2222
var argumets = new[] { "--source", @"d:/document.docx", "--output", @"d:/document.xlsx",
2323
"--headers", "1", "2", "3", "4", // first array
2424
"--content", "5", "6", "7", "8", "--verbose" // second array

src/tests/Unit/Attributes/OptionAttributeFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void Should_use_property_name_as_long_name_if_omitted()
1515
{
1616
// Given
1717
var options = new OptionsWithImplicitLongName();
18-
var parser = new Parser();
18+
var parser = new CommandLine.Parser();
1919
var arguments = new[] {
2020
"--download", "something",
2121
"--up-load", "this",

src/tests/Unit/Attributes/ValueOptionAttributeFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public void Index_Implicit_By_Declaration_Order()
1111
{
1212
var options = new OptionsWithValueOptionImplicitIndex();
1313
string[] args = "foo bar".Split();
14-
Parser.Default.ParseArguments(args, options);
14+
CommandLine.Parser.Default.ParseArguments(args, options);
1515
options.A.ShouldBeEquivalentTo("foo");
1616
options.B.ShouldBeEquivalentTo("bar");
1717
options.C.Should().BeNull();
@@ -22,7 +22,7 @@ public void Index_Explicitly_Set_On_Value_Option()
2222
{
2323
var options = new OptionsWithValueOptionExplicitIndex();
2424
string[] args = "foo bar".Split();
25-
Parser.Default.ParseArguments(args, options);
25+
CommandLine.Parser.Default.ParseArguments(args, options);
2626
options.A.Should().BeNull();
2727
options.B.ShouldBeEquivalentTo("bar");
2828
options.C.ShouldBeEquivalentTo("foo");

src/tests/Unit/Helpers/ReflectionUtilFixture.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737

3838
namespace CommandLine.Tests.Unit.Helpers
3939
{
40-
41-
4240
public class ReflectionUtilFixture
4341
{
4442
#region Mock Objects

0 commit comments

Comments
 (0)