refactor

Author: arturcic

src/GitVersionExe.Tests/ArgumentBuilder.cs

@@ -10,21 +10,19 @@ public ArgumentBuilder(string workingDirectory)
         }
 
 
-        public ArgumentBuilder(string workingDirectory, string exec, string execArgs, string projectFile, string projectArgs, string logFile, bool isTeamCity)
+        public ArgumentBuilder(string workingDirectory, string exec, string execArgs, string projectFile, string projectArgs, string logFile)
         {
             this.workingDirectory = workingDirectory;
             this.exec = exec;
             this.execArgs = execArgs;
             this.projectFile = projectFile;
             this.projectArgs = projectArgs;
             this.logFile = logFile;
-            this.isTeamCity = isTeamCity;
         }
 
-        public ArgumentBuilder(string workingDirectory, string additionalArguments, bool isTeamCity, string logFile)
+        public ArgumentBuilder(string workingDirectory, string additionalArguments, string logFile)
         {
             this.workingDirectory = workingDirectory;
-            this.isTeamCity = isTeamCity;
             this.additionalArguments = additionalArguments;
             this.logFile = logFile;
         }
@@ -35,9 +33,6 @@ public ArgumentBuilder(string workingDirectory, string additionalArguments, bool
 
         public string LogFile => logFile;
 
-        public bool IsTeamCity => isTeamCity;
-
-
         public override string ToString()
         {
             var arguments = new StringBuilder();
@@ -78,7 +73,6 @@ public override string ToString()
         private readonly string additionalArguments;
         private readonly string exec;
         private readonly string execArgs;
-        private readonly bool isTeamCity;
         private readonly string logFile;
         private readonly string projectArgs;
         private readonly string projectFile;

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -74,7 +74,7 @@ public void CheckBuildServerVerbosityConsole(string verbosityArg, string expecte
         [Test]
         public void WorkingDirectoryWithoutGitFolderCrashesWithInformativeMessage()
         {
-            var results = GitVersionHelper.ExecuteIn(Environment.SystemDirectory, null, isTeamCity: false, logToFile: false);
+            var results = GitVersionHelper.ExecuteIn(Environment.SystemDirectory, null, false);
             results.Output.ShouldContain("Can't find the .git directory in");
         }
 

src/GitVersionExe.Tests/GitVersionHelper.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using GitVersion.BuildServers;
 using GitVersion.Helpers;
@@ -15,34 +16,53 @@ public static ExecutionResults ExecuteIn(string workingDirectory,
             string execArgs = null,
             string projectFile = null,
             string projectArgs = null,
-            bool isTeamCity = false,
-            bool logToFile = true)
+            bool logToFile = true,
+            params KeyValuePair<string, string>[] environments
+            )
         {
             var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
-            var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile, isTeamCity);
-            return ExecuteIn(args);
+            var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile);
+            return ExecuteIn(args, environments);
         }
 
-        public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false, bool logToFile = true)
+        public static ExecutionResults ExecuteIn(
+            string workingDirectory,
+            string arguments,
+            bool logToFile = true,
+            params KeyValuePair<string, string>[] environments)
         {
             var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
-            var args = new ArgumentBuilder(workingDirectory, arguments, isTeamCity, logFile);
-            return ExecuteIn(args);
+            var args = new ArgumentBuilder(workingDirectory, arguments, logFile);
+            return ExecuteIn(args, environments);
         }
 
-        private static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
+        private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
+            params KeyValuePair<string, string>[] environments
+        )
         {
             var executable = PathHelper.GetExecutable();
             var output = new StringBuilder();
 
-            var environmentalVariables =
-                new[]
+            var environmentalVariables = new Dictionary<string, string>
+            {
+                { TeamCity.EnvironmentVariableName, null },
+                { AppVeyor.EnvironmentVariableName, null },
+                { TravisCi.EnvironmentVariableName, null },
+                { Jenkins.EnvironmentVariableName, null },
+                { AzurePipelines.EnvironmentVariableName, null },
+            };
+
+            foreach (var environment in environments)
+            {
+                if (environmentalVariables.ContainsKey(environment.Key))
                 {
-                    new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, arguments.IsTeamCity ? "8.0.0" : null),
-                    new KeyValuePair<string, string>(AppVeyor.EnvironmentVariableName, null),
-                    new KeyValuePair<string, string>(TravisCi.EnvironmentVariableName, null),
-                    new KeyValuePair<string, string>(AzurePipelines.EnvironmentVariableName, null),
-                };
+                    environmentalVariables[environment.Key] = environment.Value;
+                }
+                else
+                {
+                    environmentalVariables.Add(environment.Key, environment.Value);
+                }
+            }
 
             var exitCode = -1;
 
@@ -60,7 +80,7 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
                     executable,
                     args,
                     arguments.WorkingDirectory,
-                    environmentalVariables);
+                    environmentalVariables.ToArray());
             }
             catch (Exception exception)
             {

src/GitVersionExe.Tests/JsonOutputOnBuildServer.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using GitTools.Testing;
+using GitVersion.BuildServers;
 using NUnit.Framework;
 using Shouldly;
 
@@ -13,7 +15,9 @@ public void BeingOnBuildServerDoesntOverrideOutputJson()
             fixture.Repository.MakeATaggedCommit("1.2.3");
             fixture.Repository.MakeACommit();
 
-            var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json", isTeamCity: true);
+            var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
+
+            var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json", environments: env);
 
             result.ExitCode.ShouldBe(0);
             result.Output.ShouldStartWith("{");

src/GitVersionExe.Tests/PullRequestInJenkinsPipelineTest.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using GitTools.Testing;
+using GitVersion.BuildServers;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -14,7 +16,6 @@ public class PullRequestInJenkinsTest
         public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()
         {
             var pipelineBranch = "BRANCH_NAME";
-            var pipelineBranchOrig = Environment.GetEnvironmentVariable(pipelineBranch);
 
             using var fixture = new EmptyRepositoryFixture();
             var remoteRepositoryPath = PathHelper.GetTempPath();
@@ -43,20 +44,19 @@ public void GivenJenkinsPipelineHasDuplicatedOriginVersionIsCalculatedProperly()
                 Commands.Checkout(fixture.Repository, mergeCommitSha);
             }
 
-            // Emulating Jenkins environment variable
-            Environment.SetEnvironmentVariable(pipelineBranch, "PR-5");
-            Environment.SetEnvironmentVariable("JENKINS_URL", "url");
+            var env = new[]
+            {
+                new KeyValuePair<string, string>(Jenkins.EnvironmentVariableName, "url"),
+                new KeyValuePair<string, string>(pipelineBranch, "PR-5")
+            };
 
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath);
+            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, environments: env);
 
             result.ExitCode.ShouldBe(0);
             result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3");
 
             // Cleanup repository files
             DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
-
-            Environment.SetEnvironmentVariable(pipelineBranch, pipelineBranchOrig);
-            Environment.SetEnvironmentVariable("JENKINS_URL", null);
         }
     }
 }

src/GitVersionExe.Tests/PullRequestInTeamCityTest.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using GitTools.Testing;
+using GitVersion.BuildServers;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -41,7 +43,8 @@ public void GivenARemoteWithATagOnMasterAndAPullRequestWithTwoCommitsAndBuildIsR
                 Commands.Checkout(fixture.Repository, mergeCommitSha);
             }
 
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, isTeamCity: true);
+            var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
+            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, environments: env);
 
             result.ExitCode.ShouldBe(0);
             result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3");