Fix tests

Author: shana

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading;
 using GitHub.Unity;
 using System.Threading.Tasks;
 
@@ -10,8 +11,8 @@ protected async Task<IEnvironment> Initialize(NPath repoPath, NPath environmentP
             bool enableEnvironmentTrace = false)
         {
             TaskManager = new TaskManager();
-            var sc = new ThreadSynchronizationContext(TaskManager.Token);
-            TaskManager.UIScheduler = new SynchronizationContextTaskScheduler(sc);
+            SyncContext = new ThreadSynchronizationContext(TaskManager.Token);
+            TaskManager.UIScheduler = new SynchronizationContextTaskScheduler(SyncContext);
 
             Environment = new IntegrationTestEnvironment(repoPath, SolutionDirectory, environmentPath, enableEnvironmentTrace);
 
@@ -25,7 +26,6 @@ protected async Task<IEnvironment> Initialize(NPath repoPath, NPath environmentP
 
             Platform.Initialize(ProcessManager, TaskManager);
 
-
             GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager);
 
             var usageTracker = new NullUsageTracker();
@@ -67,12 +67,13 @@ public override void OnTearDown()
         public IRepositoryManager RepositoryManager { get; private set; }
 
         protected IPlatform Platform { get; private set; }
-
+        protected IApplicationManager ApplicationManager { get; set; }
         protected IProcessManager ProcessManager { get; private set; }
         protected ITaskManager TaskManager { get; private set; }
 
         protected IProcessEnvironment GitEnvironment { get; private set; }
         protected IGitClient GitClient { get; set; }
+        protected SynchronizationContext SyncContext { get; set; }
 
         protected NPath DotGitConfig { get; private set; }
 

src/tests/IntegrationTests/Git/IntegrationTestEnvironment.cs

@@ -28,8 +28,8 @@ public IntegrationTestEnvironment(NPath repoPath, NPath solutionDirectory, NPath
 
             var installPath = solutionDirectory.Parent.Parent.Parent.Combine("GitHub.Api");
 
-            Initialize(installPath, solutionDirectory, repoPath.Combine("Assets"));
-            Initialize();
+            Initialize(UnityVersion, installPath, solutionDirectory, repoPath.Combine("Assets"));
+            InitializeRepository();
 
             this.enableTrace = enableTrace;
 
@@ -40,14 +40,14 @@ public IntegrationTestEnvironment(NPath repoPath, NPath solutionDirectory, NPath
             }
         }
 
-        public void Initialize(NPath extensionInstallPath, NPath unityPath, NPath assetsPath)
+        public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)
         {
-            defaultEnvironment.Initialize(extensionInstallPath, unityPath, assetsPath);
+            defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, assetsPath);
         }
 
-        public void Initialize()
+        public void InitializeRepository(NPath expectedPath = null)
         {
-            defaultEnvironment.Initialize();
+            defaultEnvironment.InitializeRepository(expectedPath);
         }
 
         public string ExpandEnvironmentVariables(string name)
@@ -82,6 +82,7 @@ public string GetSpecialFolder(Environment.SpecialFolder folder)
 
         public NPath Path => Environment.GetEnvironmentVariable("PATH").ToNPath();
         public string NewLine => Environment.NewLine;
+        public string UnityVersion => "5.6";
 
         public NPath GitExecutablePath
         {

src/tests/IntegrationTests/Git/RepositoryLocatorTests.cs

@@ -79,7 +79,6 @@
     <Compile Include="BaseIntegrationTest.cs" />
     <Compile Include="Git\GitSetupTests.cs" />
     <Compile Include="Git\IntegrationTestEnvironment.cs" />
-    <Compile Include="Git\RepositoryLocatorTests.cs" />
     <Compile Include="ProcessManagerExtensions.cs" />
     <Compile Include="Process\ProcessManagerIntegrationTests.cs" />
     <Compile Include="SetupFixture.cs" />