make sure help respects case-sensitive/ignore case

Author: siywilliams

FluentCommandLineParser.Tests/FluentCommandLineParserMSpecTests.cs

@@ -8,8 +8,7 @@ class FluentCommandLineParserMSpecTests
 		[Subject(typeof(Fclp.FluentCommandLineParser))]
 		abstract class FluentCommandLineParserTestContext : TestContextBase<Fclp.FluentCommandLineParser>
 		{
-			Establish context = () =>
-				CreateSut();
+			Establish context = () => CreateSut();
 		}
 
 		sealed class IsCaseSensitive

FluentCommandLineParser.Tests/FluentCommandLineParserTests.cs

@@ -641,6 +641,8 @@ public void Setup_Help_And_Ensure_It_Is_Called_With_Custom_Formatter()
 		{
 			var parser = new Fclp.FluentCommandLineParser();
 
+			parser.IsCaseSensitive = false;
+
 			var formatter = new Mock<ICommandLineOptionFormatter>();
 
 			var args = new[] { "/help", "i", "s" };
@@ -668,6 +670,8 @@ public void Setup_Help_And_Ensure_It_Is_Called()
 		{
 			var parser = new Fclp.FluentCommandLineParser();
 
+			parser.IsCaseSensitive = false;
+
 			var formatter = new Mock<ICommandLineOptionFormatter>();
 
 			var args = new[] { "/help", "i", "s" };
@@ -694,10 +698,12 @@ public void Setup_Help_And_Ensure_It_Is_Called()
 		#region Case Sensitive
 
 		[Test]
-		public void Ensure_Short_Options_Are_Case_Sensitive()
+		public void Ensure_Short_Options_Are_Case_Sensitive_When_Enabled()
 		{
 			var parser = CreateFluentParser();
 
+			parser.IsCaseSensitive = true;
+
 			const string expectedUpperCaseValue = "UPPERCASE VALUE";
 			const string expectedLowerCaseValue = "LOWERCASE VALUE";
 
@@ -714,12 +720,13 @@ public void Ensure_Short_Options_Are_Case_Sensitive()
 			Assert.AreEqual(expectedLowerCaseValue, lowerCaseValue);
 		}
 
-
 		[Test]
-		public void Ensure_Long_Options_Are_Case_Sensitive()
+		public void Ensure_Long_Options_Are_Case_Sensitive_When_Enabled()
 		{
 			var parser = CreateFluentParser();
 
+			parser.IsCaseSensitive = true;
+
 			const string expectedUpperCaseValue = "UPPERCASE VALUE";
 			const string expectedLowerCaseValue = "LOWERCASE VALUE";
 
@@ -736,6 +743,44 @@ public void Ensure_Long_Options_Are_Case_Sensitive()
 			Assert.AreEqual(expectedLowerCaseValue, lowerCaseValue);
 		}
 
+		[Test]
+		public void Ensure_Short_Options_Ignore_Case_When_Disabled()
+		{
+			var parser = CreateFluentParser();
+
+			parser.IsCaseSensitive = false;
+
+			const string expectedValue = "expected value";
+
+			string actualValue = null;
+
+			parser.Setup<string>('s').Callback(str => actualValue = str).Required();
+
+			var result = parser.Parse(new[] { "--S", expectedValue });
+
+			Assert.IsFalse(result.HasErrors);
+			Assert.AreEqual(expectedValue, actualValue);
+		}
+
+		[Test]
+		public void Ensure_Long_Options_Ignore_Case_When_Disabled()
+		{
+			var parser = CreateFluentParser();
+
+			parser.IsCaseSensitive = false;
+
+			const string expectedValue = "expected value";
+
+			string actualValue = null;
+
+			parser.Setup<string>("longoption").Callback(str => actualValue = str).Required();
+
+			var result = parser.Parse(new[] { "--LONGOPTION", expectedValue });
+
+			Assert.IsFalse(result.HasErrors);
+			Assert.AreEqual(expectedValue, actualValue);
+		}
+
 		#endregion
 
 		#region Obsolete

FluentCommandLineParser.Tests/Internals/HelpCommandLineOptionTests.cs

@@ -22,6 +22,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
+using System;
 using System.Collections.Generic;
 using Fclp.Internals;
 using Machine.Specifications;
@@ -42,8 +43,12 @@ abstract class ShouldShowHelpTestContext : HelpCommandLineOptionTestContext
 			{
 				protected static bool actualResult;
 				protected static IEnumerable<ParsedOption> parsedOptions;
+				protected static StringComparison comparisonType;
 
-				Because of = () => actualResult = sut.ShouldShowHelp(parsedOptions);
+				Establish context = () =>
+					comparisonType = StringComparison.CurrentCulture;
+
+				Because of = () => actualResult = sut.ShouldShowHelp(parsedOptions, comparisonType);
 			}
 
 			class when_the_args_are_empty_and_the_option_is_setup_to_handle_empty_args_like_help_args : ShouldShowHelpTestContext

FluentCommandLineParser/FluentCommandLineParser.cs

@@ -216,7 +216,7 @@ public ICommandLineParserResult Parse(string[] args)
 
 			var result = new CommandLineParserResult { EmptyArgs = parsedOptions.IsNullOrEmpty() };
 
-			if (this.HelpOption.ShouldShowHelp(parsedOptions))
+			if (this.HelpOption.ShouldShowHelp(parsedOptions, StringComparison))
 			{
 				result.HelpCalled = true;
 				this.HelpOption.ShowHelp(this.Options);

FluentCommandLineParser/Internals/EmptyHelpCommandLineOption.cs

@@ -35,7 +35,10 @@ public class EmptyHelpCommandLineOption : IHelpCommandLineOption
 		/// <summary>
 		/// Always returns false.
 		/// </summary>
-		public bool ShouldShowHelp(IEnumerable<ParsedOption> commandLineArgs)
+		/// <param name="commandLineArgs">The command line args.</param>
+		/// <param name="comparisonType">Type of the comparison.</param>
+		/// <returns></returns>
+		public bool ShouldShowHelp(IEnumerable<ParsedOption> commandLineArgs, StringComparison comparisonType)
 		{
 			return false;
 		}

FluentCommandLineParser/Internals/HelpCommandLineOption.cs

@@ -136,8 +136,11 @@ public IHelpCommandLineOptionFluent UseForEmptyArgs()
 		/// Determines whether the help text should be shown.
 		/// </summary>
 		/// <param name="parsedOptions">The parsed command line arguments</param>
-		/// <returns>true if the parser operation should cease and <see cref="ShowHelp"/> should be called; otherwise false if the parse operation to continue.</returns>
-		public bool ShouldShowHelp(IEnumerable<ParsedOption> parsedOptions)
+		/// <param name="comparisonType">The type of comparison to use when comparing Option names.</param>
+		/// <returns>
+		/// true if the parser operation should cease and <see cref="ShowHelp" /> should be called; otherwise false if the parse operation to continue.
+		/// </returns>
+		public bool ShouldShowHelp(IEnumerable<ParsedOption> parsedOptions, StringComparison comparisonType)
 		{
 			var parsed = parsedOptions != null ? parsedOptions.ToList() : new List<ParsedOption>();
 
@@ -146,7 +149,7 @@ public bool ShouldShowHelp(IEnumerable<ParsedOption> parsedOptions)
 				return true;
 			}
 
-			return this.HelpArgs.Any(helpArg => parsed.Any(cmdArg => helpArg.Equals(cmdArg.Key, StringComparison.CurrentCultureIgnoreCase)));
+			return this.HelpArgs.Any(helpArg => parsed.Any(cmdArg => helpArg.Equals(cmdArg.Key, comparisonType)));
 		}
 
 		/// <summary>

FluentCommandLineParser/Internals/IHelpCommandLineOption.cs

@@ -22,6 +22,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
+using System;
 using System.Collections.Generic;
 
 namespace Fclp.Internals
@@ -35,8 +36,9 @@ public interface IHelpCommandLineOption
 		/// Determines whether the help text should be shown.
 		/// </summary>
 		/// <param name="parsedOptions">The parsed command line arguments</param>
+		/// <param name="comparisonType">The type of comparison to use when comparing Option names.</param>
 		/// <returns>true if the parser operation should cease and <see cref="ShowHelp"/> should be called; otherwise false if the parse operation to continue.</returns>
-		bool ShouldShowHelp(IEnumerable<ParsedOption> parsedOptions);
+		bool ShouldShowHelp(IEnumerable<ParsedOption> parsedOptions, StringComparison comparisonType);
 
 		/// <summary>
 		/// Shows the help text for the specified registered options.