Move CacheContainer into environment and use a mock for the tests

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -116,7 +116,7 @@ public ITask InitializeRepository()
                 .Then(GitClient.Commit("Initial commit", null))
                 .Then(_ =>
                 {
-                    Environment.InitializeRepository(CacheContainer);
+                    Environment.InitializeRepository();
                     RestartRepository();
                 })
                 .ThenInUI(InitializeUI);
@@ -214,9 +214,7 @@ public void Dispose()
         public ISettings LocalSettings { get; protected set; }
         public ISettings SystemSettings { get; protected set; }
         public ISettings UserSettings { get; protected set; }
-        public ICacheContainer CacheContainer { get; protected set; }
         public IUsageTracker UsageTracker { get; protected set; }
-
         protected TaskScheduler UIScheduler { get; private set; }
         protected SynchronizationContext SynchronizationContext { get; private set; }
         protected IRepositoryManager RepositoryManager { get { return repositoryManager; } }

src/GitHub.Api/Application/IApplicationManager.cs

@@ -15,7 +15,6 @@ public interface IApplicationManager : IDisposable
         ISettings LocalSettings { get; }
         ISettings UserSettings { get; }
         ITaskManager TaskManager { get; }
-        ICacheContainer CacheContainer { get; }
         IGitClient GitClient { get; }
         IUsageTracker UsageTracker { get; }
 

src/GitHub.Api/Platform/DefaultEnvironment.cs

@@ -7,6 +7,7 @@ namespace GitHub.Unity
     public class DefaultEnvironment : IEnvironment
     {
         private const string logFile = "github-unity.log";
+        private ICacheContainer cacheContainer;
 
         public NPath LogPath { get; }
         public DefaultEnvironment()
@@ -35,6 +36,12 @@ public DefaultEnvironment()
             LogPath = UserCachePath.Combine(logFile);
         }
 
+        public DefaultEnvironment(ICacheContainer cacheContainer)
+            : this()
+        {
+            this.cacheContainer = cacheContainer;
+        }
+
         public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)
         {
             ExtensionInstallPath = extensionInstallPath;
@@ -44,7 +51,7 @@ public void Initialize(string unityVersion, NPath extensionInstallPath, NPath un
             UnityVersion = unityVersion;
         }
 
-        public void InitializeRepository(ICacheContainer cacheContainer, NPath expectedRepositoryPath = null)
+        public void InitializeRepository(NPath expectedRepositoryPath = null)
         {
             Guard.NotNull(this, FileSystem, nameof(FileSystem));
 

src/GitHub.Api/Platform/IEnvironment.cs

@@ -5,7 +5,7 @@ namespace GitHub.Unity
     public interface IEnvironment
     {
         void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath);
-        void InitializeRepository(ICacheContainer cacheContainer, NPath expectedRepositoryPath = null);
+        void InitializeRepository(NPath expectedRepositoryPath = null);
         string ExpandEnvironmentVariables(string name);
         string GetEnvironmentVariable(string v);
         string GetSpecialFolder(Environment.SpecialFolder folder);

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -67,7 +67,7 @@ public IEnvironment Environment
             {
                 if (environment == null)
                 {
-                    environment = new DefaultEnvironment();
+                    environment = new DefaultEnvironment(new CacheContainer());
                     if (unityApplication == null)
                     {
                         unityAssetsPath = Application.dataPath;
@@ -77,7 +77,7 @@ public IEnvironment Environment
                     }
                     environment.Initialize(unityVersion, extensionInstallPath.ToNPath(), unityApplication.ToNPath(),
                         unityAssetsPath.ToNPath());
-                    environment.InitializeRepository(EntryPoint.ApplicationManager.CacheContainer, !String.IsNullOrEmpty(repositoryPath)
+                    environment.InitializeRepository(!String.IsNullOrEmpty(repositoryPath)
                         ? repositoryPath.ToNPath()
                         : null);
                     Flush();

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs

@@ -19,7 +19,6 @@ public ApplicationManager(IMainThreadSynchronizationContext synchronizationConte
         {
             ListenToUnityExit();
             Initialize();
-            CacheContainer = new CacheContainer();
         }
 
         protected override void SetupMetrics()

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -2,6 +2,7 @@
 using System.Threading;
 using GitHub.Unity;
 using System.Threading.Tasks;
+using NSubstitute;
 
 namespace IntegrationTests
 {
@@ -14,7 +15,9 @@ protected async Task<IEnvironment> Initialize(NPath repoPath, NPath environmentP
             SyncContext = new ThreadSynchronizationContext(TaskManager.Token);
             TaskManager.UIScheduler = new SynchronizationContextTaskScheduler(SyncContext);
 
-            Environment = new IntegrationTestEnvironment(repoPath, SolutionDirectory, environmentPath, enableEnvironmentTrace);
+            //TODO: Mock CacheContainer
+            ICacheContainer cacheContainer = Substitute.For<ICacheContainer>();
+            Environment = new IntegrationTestEnvironment(cacheContainer, repoPath, SolutionDirectory, environmentPath, enableEnvironmentTrace);
 
             var gitSetup = new GitInstaller(Environment, TaskManager.Token);
             await gitSetup.SetupIfNeeded();
@@ -31,8 +34,6 @@ protected async Task<IEnvironment> Initialize(NPath repoPath, NPath environmentP
             RepositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, repoPath);
             RepositoryManager.Initialize();
 
-            //TODO: Mock CacheContainer
-            ICacheContainer cacheContainer = null;
             Environment.Repository = new Repository(repoPath, cacheContainer);
             Environment.Repository.Initialize(RepositoryManager);
 

src/tests/IntegrationTests/Git/IntegrationTestEnvironment.cs

@@ -12,10 +12,10 @@ class IntegrationTestEnvironment : IEnvironment
 
         private DefaultEnvironment defaultEnvironment;
 
-        public IntegrationTestEnvironment(NPath repoPath, NPath solutionDirectory, NPath environmentPath = null,
+        public IntegrationTestEnvironment(ICacheContainer cacheContainer, NPath repoPath, NPath solutionDirectory, NPath environmentPath = null,
             bool enableTrace = false)
         {
-            defaultEnvironment = new DefaultEnvironment();
+            defaultEnvironment = new DefaultEnvironment(cacheContainer);
             defaultEnvironment.FileSystem.SetCurrentDirectory(repoPath);
             environmentPath = environmentPath ??
                 defaultEnvironment.GetSpecialFolder(Environment.SpecialFolder.LocalApplicationData)
@@ -28,10 +28,8 @@ public IntegrationTestEnvironment(NPath repoPath, NPath solutionDirectory, NPath
 
             var installPath = solutionDirectory.Parent.Parent.Combine("src", "GitHub.Api");
 
-            //TODO: Mock CacheContainer
-            ICacheContainer cacheContainer = null;
             Initialize(UnityVersion, installPath, solutionDirectory, repoPath.Combine("Assets"));
-            InitializeRepository(cacheContainer);
+            InitializeRepository();
 
             this.enableTrace = enableTrace;
 
@@ -47,9 +45,9 @@ public void Initialize(string unityVersion, NPath extensionInstallPath, NPath un
             defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, assetsPath);
         }
 
-        public void InitializeRepository(ICacheContainer cacheContainer, NPath expectedPath = null)
+        public void InitializeRepository(NPath expectedPath = null)
         {
-            defaultEnvironment.InitializeRepository(cacheContainer, expectedPath);
+            defaultEnvironment.InitializeRepository(expectedPath);
         }
 
         public string ExpandEnvironmentVariables(string name)