Tests for parsing option /overrideconfig

Author: sergiorykov

src/GitVersionExe.Tests/ArgumentParserTests.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using GitVersion;
 using NUnit.Framework;
 using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 
 [TestFixture]
 public class ArgumentParserTests
@@ -199,7 +199,7 @@ public void update_assembly_info_false(string command)
     public void create_mulitple_assembly_info_protected(string command)
     {
         var exception = Assert.Throws<WarningException>(() => ArgumentParser.ParseArguments(command));
-        exception.Message.ShouldBe("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");
+        exception.Message.ShouldBe("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
     }
 
     [Test]
@@ -220,6 +220,37 @@ public void update_assembly_info_with_multiple_filenames()
         arguments.UpdateAssemblyInfoFileName.ShouldContain("VersionAssemblyInfo.cs");
     }
 
+    [Test]
+    public void overrideconfig_with_no_options()
+    {
+        var arguments = ArgumentParser.ParseArguments("/overrideconfig");
+        arguments.HasOverrideConfig.ShouldBe(false);
+        arguments.OverrideConfig.ShouldNotBeNull();
+    }
+
+    [Test]
+    public void overrideconfig_with_single_tagprefix_option()
+    {
+        var arguments = ArgumentParser.ParseArguments("/overrideconfig tag-prefix=sample");
+        arguments.HasOverrideConfig.ShouldBe(true);
+        arguments.OverrideConfig.TagPrefix.ShouldBe("sample");
+    }
+
+    [TestCase("tag-prefix=sample;tag-prefix=other")]
+    [TestCase("tag-prefix=sample;param2=other")]
+    public void overrideconfig_with_several_options(string options)
+    {
+        var exception = Assert.Throws<WarningException>(() => ArgumentParser.ParseArguments(string.Format("/overrideconfig {0}", options)));
+        exception.Message.ShouldContain("Can't specify multiple /overrideconfig options");
+    }
+
+    [TestCase("tag-prefix=sample=asdf")]
+    public void overrideconfig_with_invalid_option(string options)
+    {
+        var exception = Assert.Throws<WarningException>(() => ArgumentParser.ParseArguments(string.Format("/overrideconfig {0}", options)));
+        exception.Message.ShouldContain("Could not parse /overrideconfig option");
+    }
+
     [Test]
     public void update_assembly_info_with_relative_filename()
     {
@@ -248,7 +279,7 @@ public void ensure_assembly_info_false()
         var arguments = ArgumentParser.ParseArguments("-ensureAssemblyInfo false");
         arguments.EnsureAssemblyInfo.ShouldBe(false);
     }
-    
+
     [Test]
     public void dynamicRepoLocation()
     {

src/GitVersionExe/ArgumentParser.cs

@@ -270,7 +270,7 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
 
                 if (name.IsSwitch("overrideconfig"))
                 {
-                    var keyValueOptions = value.Split(';');
+                    var keyValueOptions = (value ?? "").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
                     if (keyValueOptions.Length == 0)
                     {
                         continue;
@@ -286,8 +286,8 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                     // key=value
                     foreach (var keyValueOption in keyValueOptions)
                     {
-                        var keyAndValue = keyValueOption.Split('=');
-                        if (keyAndValue.Length > 1)
+                        var keyAndValue = keyValueOption.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (keyAndValue.Length != 2)
                         {
                             throw new WarningException(string.Format("Could not parse /overrideconfig option: {0}. Ensure it is in format 'key=value'", keyValueOption));
                         }

src/GitVersionExe/HelpWriter.cs

@@ -25,7 +25,7 @@ path            The directory containing .git. If not defined current directory
                     eg /output json /showvariable SemVer - will output `1.2.3+beta.4`
     /l              Path to logfile.
     /showconfig     Outputs the effective GitVersion config (defaults + custom from GitVersion.yml) in yaml format
-    /overrideconfig Overrides GitVersion config values inline (semicolon-separated key value pairs e.g. /overrideconfig:tag-prefix=Foo)
+    /overrideconfig Overrides GitVersion config values inline (semicolon-separated key value pairs e.g. /overrideconfig tag-prefix=Foo)
                     Currently supported config overrides: tag-prefix
 
     # AssemblyInfo updating