Added ArgumentBuilder class to handle argument building and overloads to GitVersionHelper in preparation for a test that needs to pass in invalid arguments.

Author: asbjornu

GitVersionExe.Tests/ArgumentBuilder.cs

@@ -0,0 +1,60 @@
+using System.IO;
+using System.Text;
+
+public class ArgumentBuilder
+{
+    public ArgumentBuilder(string workingDirectory)
+    {
+        this.workingDirectory = workingDirectory;
+    }
+
+    public string WorkingDirectory
+    {
+        get { return workingDirectory; }
+    }
+
+    public string Exec { get; set; }
+
+    public string ExecArgs { get; set; }
+
+    public string ProjectFile { get; set; }
+
+    public string ProjectArgs { get; set; }
+
+    public string LogFile { get; set; }
+
+    public bool IsTeamCity { get; set; }
+
+    public string AdditionalArguments { get; set; }
+
+    public override string ToString()
+    {
+        var arguments = new StringBuilder();
+
+        arguments.AppendFormat("\"{0}\"", WorkingDirectory);
+
+        if (!string.IsNullOrWhiteSpace(Exec))
+            arguments.AppendFormat(" /exec \"{0}\"", Exec);
+
+        if (!string.IsNullOrWhiteSpace(ExecArgs))
+            arguments.AppendFormat(" /execArgs \"{0}\"", ExecArgs);
+
+        if (!string.IsNullOrWhiteSpace(ProjectFile))
+            arguments.AppendFormat(" /proj \"{0}\"", ProjectFile);
+
+        if (!string.IsNullOrWhiteSpace(ProjectArgs))
+            arguments.AppendFormat(" /projargs \"{0}\"", ProjectArgs);
+
+        arguments.Append(AdditionalArguments);
+
+        if (!string.IsNullOrWhiteSpace(LogFile))
+        {
+            arguments.AppendFormat(" /l \"{0}\"", LogFile);
+        }
+
+        return arguments.ToString();
+    }
+
+
+    readonly string workingDirectory;
+}

GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -73,6 +73,7 @@
     <None Include="TestBuildFile.proj" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ArgumentBuilder.cs" />
     <Compile Include="ArgumentParserTests.cs" />
     <Compile Include="ExecCmdLineArgumentTest.cs" />
     <Compile Include="ExecutionResults.cs" />

GitVersionExe.Tests/GitVersionHelper.cs

@@ -11,38 +11,61 @@ public static ExecutionResults ExecuteIn(string workingDirectory,
         string exec = null, string execArgs = null, string projectFile = null, string projectArgs = null,
         bool isTeamCity = false)
     {
-        var logFile = Path.Combine(workingDirectory, "log.txt");
-        var gitHubFlowVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");
-        var execArg = exec == null ? null : string.Format(" /exec \"{0}\"", exec);
-        var execArgsArg = execArgs == null ? null : string.Format(" /execArgs \"{0}\"", execArgs);
-        var projectFileArg = projectFile == null ? null : string.Format(" /proj \"{0}\"", projectFile);
-        var targetsArg = projectArgs == null ? null : string.Format(" /projargs \"{0}\"", projectArgs);
-        var logArg = string.Format(" /l \"{0}\"", logFile);
-        var arguments = string.Format("\"{0}\"{1}{2}{3}{4}{5}", workingDirectory, execArg, execArgsArg,
-            projectFileArg, targetsArg, logArg);
+        var args = new ArgumentBuilder(workingDirectory)
+        {
+            Exec = exec,
+            ExecArgs = execArgs,
+            ProjectFile = projectFile,
+            ProjectArgs = projectArgs,
+            IsTeamCity = isTeamCity,
+            LogFile = Path.Combine(workingDirectory, "log.txt")
+        };
+
+        return ExecuteIn(args);
+    }
 
+    public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false)
+    {
+        var args = new ArgumentBuilder(workingDirectory)
+        {
+            AdditionalArguments = arguments,
+            IsTeamCity = isTeamCity,
+        };
+
+        return ExecuteIn(args);
+    }
+
+    static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
+    {
+        var gitHubFlowVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");
         var output = new StringBuilder();
 
         Console.WriteLine("Executing: {0} {1}", gitHubFlowVersion, arguments);
         Console.WriteLine();
         var environmentalVariables =
             new[]
             {
-                new KeyValuePair<string, string>("TEAMCITY_VERSION", isTeamCity ? "8.0.0" : null)
+                new KeyValuePair<string, string>("TEAMCITY_VERSION", arguments.IsTeamCity ? "8.0.0" : null)
             };
 
         var exitCode = ProcessHelper.Run(
             s => output.AppendLine(s), s => output.AppendLine(s), null,
-            gitHubFlowVersion, arguments, workingDirectory,
+            gitHubFlowVersion, arguments.ToString(), arguments.WorkingDirectory,
             environmentalVariables);
 
-        var logContents = File.ReadAllText(logFile);
         Console.WriteLine("Output from GitVersion.exe");
         Console.WriteLine("-------------------------------------------------------");
         Console.WriteLine(output.ToString());
         Console.WriteLine();
         Console.WriteLine();
         Console.WriteLine("-------------------------------------------------------");
+
+        if (string.IsNullOrWhiteSpace(arguments.LogFile))
+        {
+            return new ExecutionResults(exitCode, output.ToString(), null);
+        }
+
+        var logContents = File.ReadAllText(arguments.LogFile);
         Console.WriteLine("Log from GitVersion.exe");
         Console.WriteLine("-------------------------------------------------------");
         Console.WriteLine(logContents);