Fixed code inspection problems

Author: asbjornu

GitVersionExe.Tests/ArgumentBuilder.cs

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

GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using NUnit.Framework;
 using Shouldly;
 

GitVersionExe.Tests/GitVersionHelper.cs

@@ -11,27 +11,14 @@ public static ExecutionResults ExecuteIn(string workingDirectory,
         string exec = null, string execArgs = null, string projectFile = null, string projectArgs = null,
         bool isTeamCity = false)
     {
-        var args = new ArgumentBuilder(workingDirectory)
-        {
-            Exec = exec,
-            ExecArgs = execArgs,
-            ProjectFile = projectFile,
-            ProjectArgs = projectArgs,
-            IsTeamCity = isTeamCity,
-            LogFile = Path.Combine(workingDirectory, "log.txt")
-        };
-
+        var logFile = Path.Combine(workingDirectory, "log.txt");
+        var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile, isTeamCity);
         return ExecuteIn(args);
     }
 
     public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false)
     {
-        var args = new ArgumentBuilder(workingDirectory)
-        {
-            AdditionalArguments = arguments,
-            IsTeamCity = isTeamCity,
-        };
-
+        var args = new ArgumentBuilder(workingDirectory, arguments, isTeamCity);
         return ExecuteIn(args);
     }