Added tests for AutoHelp and AutoVersion config options.

Author: Athari

tests/CommandLine.Tests/CommandLine.Tests.csproj

@@ -58,6 +58,8 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="CultureInfoExtensions.cs" />
+    <Compile Include="Fakes\Options_With_Custom_Help_Option.cs" />
+    <Compile Include="Fakes\Options_With_Custom_Version_Option.cs" />
     <Compile Include="Fakes\Options_With_Default_Set_To_Sequence.cs" />
     <Compile Include="Fakes\Options_With_Guid.cs" />
     <Compile Include="Fakes\Options_With_Option_And_Value_Of_String_Type.cs" />

tests/CommandLine.Tests/Fakes/Options_With_Custom_Help_Option.cs

@@ -0,0 +1,8 @@
+namespace CommandLine.Tests.Fakes
+{
+    class Options_With_Custom_Help_Option : Simple_Options
+    {
+        [Option('h', "help")]
+        public bool Help { get; set; }
+    }
+}

tests/CommandLine.Tests/Fakes/Options_With_Custom_Version_Option.cs

@@ -0,0 +1,8 @@
+namespace CommandLine.Tests.Fakes
+{
+    class Options_With_Custom_Version_Option : Simple_Options
+    {
+        [Option('v', "version")]
+        public bool MyVersion { get; set; }
+    }
+}

tests/CommandLine.Tests/Unit/Core/InstanceBuilderTests.cs

@@ -19,7 +19,7 @@ namespace CommandLine.Tests.Unit.Core
 {
     public class InstanceBuilderTests
     {
-        private static ParserResult<T> InvokeBuild<T>(string[] arguments)
+        private static ParserResult<T> InvokeBuild<T>(string[] arguments, bool autoHelp = true, bool autoVersion = true)
             where T : new()
         {
             return InstanceBuilder.Build(
@@ -29,8 +29,8 @@ private static ParserResult<T> InvokeBuild<T>(string[] arguments)
                 StringComparer.Ordinal,
                 false,
                 CultureInfo.InvariantCulture,
-                true,
-                true,
+                autoHelp,
+                autoVersion,
                 Enumerable.Empty<ErrorType>());
         }
 
@@ -1015,6 +1015,76 @@ public void Parse_string_with_dashes_except_in_beginning(string[] arguments, str
             // Teardown
         }
 
+        [Theory]
+        [InlineData(new[] { "--help" }, ErrorType.UnknownOptionError)]
+        public void Parse_without_auto_help_should_not_recognize_help_option(string[] arguments, ErrorType errorType)
+        {
+            // Fixture setup in attributes
+
+            // Exercize system 
+            var result = InvokeBuild<Simple_Options>(arguments, autoHelp: false);
+
+            // Verify outcome
+            result.Should().BeOfType<NotParsed<Simple_Options>>()
+                .Which.Errors.Should().ContainSingle()
+                .Which.Tag.Should().Be(errorType);
+
+            // Teardown
+        }
+
+        [Theory]
+        [InlineData(new[] { "--help" }, true)]
+        [InlineData(new[] { "-h" }, true)]
+        [InlineData(new[] { "-x" }, false)]
+        public void Parse_with_custom_help_option(string[] arguments, bool isHelp)
+        {
+            // Fixture setup in attributes
+
+            // Exercize system 
+            var result = InvokeBuild<Options_With_Custom_Help_Option>(arguments, autoHelp: false);
+
+            // Verify outcome
+            result.Should().BeOfType<Parsed<Options_With_Custom_Help_Option>>()
+                .Which.Value.Help.Should().Be(isHelp);
+
+            // Teardown
+        }
+
+        [Theory]
+        [InlineData(new[] { "--version" }, ErrorType.UnknownOptionError)]
+        public void Parse_without_auto_version_should_not_recognize_version_option(string[] arguments, ErrorType errorType)
+        {
+            // Fixture setup in attributes
+
+            // Exercize system 
+            var result = InvokeBuild<Simple_Options>(arguments, autoVersion: false);
+
+            // Verify outcome
+            result.Should().BeOfType<NotParsed<Simple_Options>>()
+                .Which.Errors.Should().ContainSingle()
+                .Which.Tag.Should().Be(errorType);
+
+            // Teardown
+        }
+
+        [Theory]
+        [InlineData(new[] { "--version" }, true)]
+        [InlineData(new[] { "-v" }, true)]
+        [InlineData(new[] { "-s", "s" }, false)]
+        public void Parse_with_custom_version_option(string[] arguments, bool isVersion)
+        {
+            // Fixture setup in attributes
+
+            // Exercize system 
+            var result = InvokeBuild<Options_With_Custom_Version_Option>(arguments, autoVersion: false);
+
+            // Verify outcome
+            result.Should().BeOfType<Parsed<Options_With_Custom_Version_Option>>()
+                .Which.Value.MyVersion.Should().Be(isVersion);
+
+            // Teardown
+        }
+
         [Theory]
         [MemberData("GuidData")]
         public void Parse_Guid(string[] arguments, Options_With_Guid expected)