remove SymbolCannotContainDelimiterArgumentException (#727)

Author: jonsequitur

src/System.CommandLine.Tests/CommandTests.cs

@@ -135,14 +135,15 @@ public void Commands_at_multiple_levels_can_have_their_own_arguments()
         }
 
         [Theory]
-        [InlineData("aa:")]
-        [InlineData("aa=")]
-        [InlineData(":aa")]
-        [InlineData("=aa")]
-        [InlineData("aa:aa")]
-        [InlineData("aa=aa")]
+        [InlineData("aa:", ":")]
+        [InlineData("aa=", "=")]
+        [InlineData(":aa", ":")]
+        [InlineData("=aa", "=")]
+        [InlineData("aa:aa", ":")]
+        [InlineData("aa=aa", "=")]
         public void When_a_command_name_contains_a_delimiter_then_an_error_is_returned(
-            string commandWithDelimiter)
+            string commandWithDelimiter,
+            string delimiter)
         {
             Action create = () =>
             {
@@ -156,7 +157,12 @@ public void When_a_command_name_contains_a_delimiter_then_an_error_is_returned(
                     });
             };
 
-            create.Should().Throw<SymbolCannotContainDelimiterArgumentException>();
+            create.Should()
+                  .Throw<ArgumentException>()
+                  .Which
+                  .Message
+                  .Should()
+                  .Be($"Command \"{commandWithDelimiter}\" is not allowed to contain a delimiter but it contains \"{delimiter}\"");
         }
 
         [Theory]
@@ -187,14 +193,6 @@ public void When_a_command_alias_is_added_and_contains_whitespace_then_an_inform
                     .Be($"Command alias cannot contain whitespace: \"{alias}\"");
         }
 
-        [Fact]
-        public void When_a_command_name_contains_a_delimiter_then_the_error_is_informative()
-        {
-            var subject = new SymbolCannotContainDelimiterArgumentException('ツ');
-            subject.Message.Should()
-                   .Be(@"Symbol cannot contain delimiter: ""ツ""");
-        }
-
         [Theory]
         [InlineData("outer", "outer")]
         [InlineData("outer arg", "outer")]

src/System.CommandLine.Tests/OptionTests.cs

@@ -153,12 +153,19 @@ public void When_an_option_alias_contains_a_delimiter_then_an_informative_error_
             string delimiter,
             string template)
         {
-            Action create = () => new Parser(
-                new Option(
-                    string.Format(template, delimiter)));
+            var alias = string.Format(template, delimiter);
 
-            create.Should().Throw<ArgumentException>().Which.Message.Should()
-                  .Be($"Symbol cannot contain delimiter: \"{delimiter}\"");
+            Action create = () =>
+            {
+                new Parser(new Option(alias));
+            };
+
+            create.Should()
+                  .Throw<ArgumentException>()
+                  .Which
+                  .Message
+                  .Should()
+                  .Be($"Option \"{alias}\" is not allowed to contain a delimiter but it contains \"{delimiter}\"");
         }
 
         [Theory]

src/System.CommandLine/CommandLineConfiguration.cs

@@ -48,7 +48,7 @@ public CommandLineConfiguration(
                     {
                         if (alias.Contains(delimiter))
                         {
-                            throw new SymbolCannotContainDelimiterArgumentException(delimiter);
+                            throw new ArgumentException($"{symbol.GetType().Name} \"{alias}\" is not allowed to contain a delimiter but it contains \"{delimiter}\"");
                         }
                     }
                 }