Fixing my mistakes

Author: StanleyGoldman

src/GitHub.Api/ApplicationManagerBase.cs

@@ -103,7 +103,7 @@ private async Task RunInternal()
         {
             await ThreadingHelper.SwitchToThreadAsync();
 
-            var gitSetup = new GitSetup(Environment, ProcessManager, FileSystem, CancellationToken);
+            var gitSetup = new GitSetup(Environment, FileSystem, CancellationToken);
             var expectedPath = gitSetup.GitInstallationPath;
 
             var setupDone = await gitSetup.SetupIfNeeded(

src/GitHub.Api/GitSetup.cs

@@ -6,30 +6,24 @@ namespace GitHub.Unity
 {
     class GitSetup
     {
-        private readonly CancellationToken cancellationToken;
         private readonly IEnvironment environment;
+        private readonly CancellationToken cancellationToken;
         private readonly GitInstaller gitInstaller;
-        private readonly IProcessManager processManager;
+        public NPath GitInstallationPath { get; private set; }
+        public NPath GitExecutablePath { get; private set; }
 
-        public GitSetup(IEnvironment environment, IProcessManager processManager, IFileSystem fileSystem,
-            CancellationToken cancellationToken)
+        public GitSetup(IEnvironment environment, IFileSystem fileSystem, CancellationToken cancellationToken)
         {
             this.environment = environment;
-            this.processManager = processManager;
             this.cancellationToken = cancellationToken;
             gitInstaller = new GitInstaller(environment, fileSystem, cancellationToken);
             GitInstallationPath = gitInstaller.PackageDestinationDirectory;
             GitExecutablePath = gitInstaller.GitDestinationPath;
         }
 
-        public async Task<bool> SetupIfNeeded(IProgress<float> percentage = null, IProgress<long> timeRemaining = null)
+        public Task<bool> SetupIfNeeded(IProgress<float> percentage = null, IProgress<long> timeRemaining = null)
         {
-            var setupIfNeeded = await gitInstaller.SetupIfNeeded(percentage, timeRemaining);
-
-            return setupIfNeeded;
+            return gitInstaller.SetupIfNeeded(percentage, timeRemaining);
         }
-
-        public NPath GitInstallationPath { get; private set; }
-        public NPath GitExecutablePath { get; private set; }
     }
-}
+}

src/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -14,16 +14,16 @@ protected void InitializeEnvironment(NPath repoPath)
                 UnityProjectPath = repoPath
             };
 
-            Platform = new Platform(Environment, FileSystem, new TestUIDispatcher());
-            GitEnvironment = Platform.GitEnvironment;
-            ProcessManager = new ProcessManager(Environment, GitEnvironment);
-
-            var gitSetup = new GitSetup(Environment, ProcessManager, FileSystem, CancellationToken.None);
+            var gitSetup = new GitSetup(Environment, FileSystem, CancellationToken.None);
             gitSetup.SetupIfNeeded().Wait();
 
             Environment.GitExecutablePath = gitSetup.GitExecutablePath;
 
             FileSystem.SetCurrentDirectory(repoPath);
+
+            Platform = new Platform(Environment, FileSystem, new TestUIDispatcher());
+            GitEnvironment = Platform.GitEnvironment;
+            ProcessManager = new ProcessManager(Environment, GitEnvironment);
             Platform.Initialize(ProcessManager);
 
             Environment.UnityProjectPath = repoPath;

src/IntegrationTests/Git/GitSetupTests.cs

@@ -14,12 +14,7 @@ public void InstallGit()
         {
             var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
             var environment = new IntegrationTestEnvironment(SolutionDirectory, environmentPath);
-
-            var platform = new Platform(environment, FileSystem, new TestUIDispatcher());
-            var gitEnvironment = platform.GitEnvironment;
-            var processManager = new ProcessManager(environment, gitEnvironment);
-
-            var gitSetup = new GitSetup(environment, processManager, FileSystem, CancellationToken.None);
+            var gitSetup = new GitSetup(environment, FileSystem, CancellationToken.None);
             var expectedPath = gitSetup.GitInstallationPath;
 
             var setupDone = false;
@@ -56,6 +51,10 @@ public void InstallGit()
                 setupDone.Should().BeFalse ();
             }
 
+            var platform = new Platform(environment, FileSystem, new TestUIDispatcher());
+            var gitEnvironment = platform.GitEnvironment;
+            var processManager = new ProcessManager(environment, gitEnvironment);
+
             var gitBranches = processManager.GetGitBranches(TestRepoMasterDirtyUnsynchronized, environment.GitExecutablePath);
 
             gitBranches.Should().BeEquivalentTo(