Add tests for flag validation

DarthFubuMVC · Apr 19, 2012 · 18b99c8 · 18b99c8
1 parent 74b921e
commit 18b99c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/FubuCore.Testing/CommandLine/FlagTester.cs b/src/FubuCore.Testing/CommandLine/FlagTester.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using FubuCore.CommandLine;
 using FubuCore.Conversion;
@@ -49,6 +50,22 @@ public void flag_is_selectively_optional_if_attribute_states_specific_usages()
             forProp(x => x.EnumFlag).OptionalForUsage("b").ShouldBeTrue();
             forProp(x => x.EnumFlag).OptionalForUsage("c").ShouldBeFalse();
         }
+
+        [Test]
+        public void should_provide_useful_error_message_when_no_value_provided()
+        {
+            typeof(InvalidUsageException).ShouldBeThrownBy(() =>
+                forProp(x => x.AliasFlag).Handle(new FlagTarget(), new Queue<string>(new[] { "-a" })))
+                .Message.ShouldEqual("No value specified for flag -a.");
+        }
+
+        [Test]
+        public void should_provide_useful_error_message_for_invalid_enum_value()
+        {
+            typeof(InvalidUsageException).ShouldBeThrownBy(() =>
+                forProp(x => x.EnumFlag).Handle(new FlagTarget(), new Queue<string>(new[] { "-e", "x" })))
+                .Message.ShouldEqual("'x' is not a valid value for flag [-e, --enum]");
+        }
     }
 
     public enum FlagEnum

diff --git a/src/FubuCore/CommandLine/Flag.cs b/src/FubuCore/CommandLine/Flag.cs
@@ -41,7 +41,7 @@ private void checkEnum(Type propertyType, string rawValue)
         {
             if( propertyType.CanBeCastTo<Enum>() && !Enum.IsDefined(propertyType, rawValue))
             {
-                throw new InvalidUsageException("'{0}' is not a valid value for argument [{1}]".ToFormat(rawValue, InputParser.ToFlagAliases(_property)));
+                throw new InvalidUsageException("'{0}' is not a valid value for flag [{1}]".ToFormat(rawValue, InputParser.ToFlagAliases(_property)));
             }
         }