Fixing compilation errors in test helpers

Author: StanleyGoldman

src/tests/IntegrationTests/CachingClasses.cs

@@ -449,172 +449,29 @@ sealed class BranchesCache : ManagedCacheBase<BranchesCache>, IBranchCache
 
         public BranchesCache() : base(CacheType.Branches)
         { }
-
-        public GitBranch[] LocalBranches
-        {
-            get { return localBranches; }
-            set
-            {
-                var now = DateTimeOffset.Now;
-                var isUpdated = false;
-
-                Logger.Trace("Updating: {0} localBranches:{1}", now, value.Length);
-
-                var localBranchesIsNull = localBranches == null;
-                var valueIsNull = value == null;
-
-                if (localBranchesIsNull != valueIsNull ||
-                    !localBranchesIsNull && !localBranches.SequenceEqual(value))
-                {
-                    localBranches = value;
-                    isUpdated = true;
-                }
-
-                SaveData(now, isUpdated);
-            }
-        }
-
-        public GitBranch[] RemoteBranches
-        {
-            get { return remoteBranches; }
-            set
-            {
-                var now = DateTimeOffset.Now;
-                var isUpdated = false;
-
-                Logger.Trace("Updating: {0} remoteBranches:{1}", now, value.Length);
-
-                var remoteBranchesIsNull = remoteBranches == null;
-                var valueIsNull = value == null;
-
-                if (remoteBranchesIsNull != valueIsNull ||
-                    !remoteBranchesIsNull && !remoteBranches.SequenceEqual(value))
-                {
-                    remoteBranches = value;
-                    isUpdated = true;
-                }
-
-                SaveData(now, isUpdated);
-            }
-        }
-
-        public GitRemote[] Remotes
-        {
-            get { return remotes; }
-            set
-            {
-                var now = DateTimeOffset.Now;
-                var isUpdated = false;
-
-                Logger.Trace("Updating: {0} remotes:{1}", now, value.Length);
-
-                var remotesIsNull = remotes == null;
-                var valueIsNull = value == null;
-
-                if (remotesIsNull != valueIsNull ||
-                    !remotesIsNull && !remotes.SequenceEqual(value))
-                {
-                    remotes = value;
-                    isUpdated = true;
-                }
-
-                SaveData(now, isUpdated);
-            }
-        }
-
-        public void RemoveLocalBranch(string branch)
-        {
-            if (LocalConfigBranches.ContainsKey(branch))
-            {
-                var now = DateTimeOffset.Now;
-                LocalConfigBranches.Remove(branch);
-                Logger.Trace("RemoveLocalBranch {0} branch:{1} ", now, branch);
-                SaveData(now, true);
-            }
-            else
-            {
-                Logger.Warning("Branch {0} is not found", branch);
-            }
-        }
-
-        public void AddLocalBranch(string branch)
-        {
-            if (!LocalConfigBranches.ContainsKey(branch))
-            {
-                var now = DateTimeOffset.Now;
-                LocalConfigBranches.Add(branch, new ConfigBranch(branch));
-                Logger.Trace("AddLocalBranch {0} branch:{1} ", now, branch);
-                SaveData(now, true);
-            }
-            else
-            {
-                Logger.Warning("Branch {0} is already present", branch);
-            }
-        }
-
-        public void AddRemoteBranch(string remote, string branch)
-        {
-            Dictionary<string, ConfigBranch> branchList;
-            if (RemoteConfigBranches.TryGetValue(remote, out branchList))
-            {
-                if (!branchList.ContainsKey(branch))
-                {
-                    var now = DateTimeOffset.Now;
-                    branchList.Add(branch, new ConfigBranch(branch, ConfigRemotes[remote]));
-                    Logger.Trace("AddRemoteBranch {0} remote:{1} branch:{2} ", now, remote, branch);
-                    SaveData(now, true);
-                }
-                else
-                {
-                    Logger.Warning("Branch {0} is already present in Remote {1}", branch, remote);
-                }
-            }
-            else
-            {
-                Logger.Warning("Remote {0} is not found", remote);
-            }
-        }
-
-        public void RemoveRemoteBranch(string remote, string branch)
-        {
-            Dictionary<string, ConfigBranch> branchList;
-            if (RemoteConfigBranches.TryGetValue(remote, out branchList))
-            {
-                if (branchList.ContainsKey(branch))
-                {
-                    var now = DateTimeOffset.Now;
-                    branchList.Remove(branch);
-                    Logger.Trace("RemoveRemoteBranch {0} remote:{1} branch:{2} ", now, remote, branch);
-                    SaveData(now, true);
-                }
-                else
-                {
-                    Logger.Warning("Branch {0} is not found in Remote {1}", branch, remote);
-                }
-            }
-            else
-            {
-                Logger.Warning("Remote {0} is not found", remote);
-            }
-        }
-
-        public void SetRemotes(Dictionary<string, ConfigRemote> remoteConfigs, Dictionary<string, Dictionary<string, ConfigBranch>> remoteConfigBranches)
+        public void SetRemotes(Dictionary<string, ConfigRemote> remoteConfigs, Dictionary<string, Dictionary<string, ConfigBranch>> configBranches, GitRemote[] gitRemotes, GitBranch[] gitBranches)
         {
             var now = DateTimeOffset.Now;
             configRemotes = new ConfigRemoteDictionary(remoteConfigs);
-            this.remoteConfigBranches = new RemoteConfigBranchDictionary(remoteConfigBranches);
+            remoteConfigBranches = new RemoteConfigBranchDictionary(remoteConfigBranches);
+            remotes = gitRemotes;
+            remoteBranches = gitBranches;
             Logger.Trace("SetRemotes {0}", now);
             SaveData(now, true);
         }
 
         public void SetLocals(Dictionary<string, ConfigBranch> configBranches, GitBranch[] gitBranches)
         {
             var now = DateTimeOffset.Now;
-            this.localConfigBranches = new LocalConfigBranchDictionary(configBranches);
-            Logger.Trace("SetRemotes {0}", now);
+            localConfigBranches = new LocalConfigBranchDictionary(configBranches);
+            localBranches = gitBranches;
+            Logger.Trace("SetLocals {0}", now);
             SaveData(now, true);
         }
 
+        public GitBranch[] LocalBranches { get { return localBranches; } }
+        public GitBranch[] RemoteBranches { get { return remoteBranches; } }
+        public GitRemote[] Remotes { get { return remotes; } }
         public ILocalConfigBranchDictionary LocalConfigBranches { get { return localConfigBranches; } }
         public IRemoteConfigBranchDictionary RemoteConfigBranches { get { return remoteConfigBranches; } }
         public IConfigRemoteDictionary ConfigRemotes { get { return configRemotes; } }