test: add tests for the majority of the Core assembly (#2)

Core/AssemblyInfo.cs

@@ -1,3 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("UnityGit.Tests.Core")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

Core/Internal/GitProcess.cs

@@ -6,7 +6,7 @@
 
 namespace UnityGit.Core.Internal
 {
-    internal sealed class GitProcess
+    public class GitProcess
     {
         private readonly Process _process;
 
@@ -64,7 +64,17 @@ public void SetTimeout(int timeoutMilliseconds)
             _timeoutMs = timeoutMilliseconds;
         }
 
-        public async Task<GitProcessResult> Run()
+        public int GetTimeout()
+        {
+            return _timeoutMs;
+        }
+
+        public string GetWorkingDirectory()
+        {
+            return _process.StartInfo.WorkingDirectory;
+        }
+
+        public virtual async Task<GitProcessResult> Run()
         {
             using (_process)
             {

Core/Services/CommandsService.cs

@@ -10,6 +10,8 @@ public interface ICommandsService
         void Stage(IRepository repository, string filePath);
 
         Commit Commit(IRepository repository, string message, Signature author);
+
+        MergeResult Pull(Repository repository, Signature signature, PullOptions pullOptions);
     }
 
     /// <summary>Acts as a wrapper for LibGit2Sharp.Commands.</summary>
@@ -30,5 +32,10 @@ public Commit Commit(IRepository repository, string message, Signature author)
         {
             return repository.Commit(message, author, author);
         }
+
+        public MergeResult Pull(Repository repository, Signature signature, PullOptions pullOptions)
+        {
+            return Commands.Pull(repository, signature, pullOptions);
+        }
     }
 }

Core/Services/DiffService.cs

@@ -4,6 +4,7 @@
 using LibGit2Sharp;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.TestTools;
 
 namespace UnityGit.Core.Services
 {
@@ -25,7 +26,7 @@ string ancestorFile
 
         private readonly InvokeDiffToolDelegate _invokeDiffDelegate;
 
-        [PublicAPI]
+        [PublicAPI] [ExcludeFromCoverage]
         public DiffService() : this(EditorUtility.InvokeDiffTool) {}
 
         public DiffService(InvokeDiffToolDelegate invokeDiffDelegate)

Core/Services/FileService.cs

@@ -0,0 +1,19 @@
+using System.IO;
+using UnityEngine.TestTools;
+
+namespace UnityGit.Core.Services
+{
+    internal interface IFileService
+    {
+        void Delete(string path);
+    }
+
+    [ExcludeFromCoverage]
+    internal sealed class FileService : IFileService
+    {
+        public void Delete(string path)
+        {
+            File.Delete(path);
+        }
+    }
+}

Core/Services/GitCommandService.cs

@@ -5,7 +5,6 @@
 using UIComponents;
 using UnityGit.Core.Data;
 using UnityGit.Core.Internal;
-using Debug = UnityEngine.Debug;
 
 namespace UnityGit.Core.Services
 {
@@ -30,6 +29,8 @@ public sealed partial class GitCommandService : Service, IGitCommandService
 
         public event CommandFinishedDelegate CommandFinished;
 
+        public delegate GitProcess CreateProcessDelegate(GitCommandInfo info);
+
         [Provide]
         private ILogService _logService;
 
@@ -39,6 +40,30 @@ public sealed partial class GitCommandService : Service, IGitCommandService
         private GitProcess _currentProcess;
 
         private int _progressId;
+
+        private readonly CreateProcessDelegate _createProcessDelegate;
+
+        public static GitProcess CreateGitProcess(GitCommandInfo info)
+        {
+            var process = new Process();
+            process.StartInfo.FileName = "git";
+            process.StartInfo.Arguments = info.Arguments;
+            process.StartInfo.WorkingDirectory = info.Repository.Info.WorkingDirectory;
+
+            var gitProcess = new GitProcess(process);
+
+            if (info.TimeoutMs > 0)
+                gitProcess.SetTimeout(info.TimeoutMs);
+
+            return gitProcess;
+        }
+
+        public GitCommandService() : this(CreateGitProcess) {}
+
+        public GitCommandService(CreateProcessDelegate createDelegate)
+        {
+            _createProcessDelegate = createDelegate;
+        }
 
         [CanBeNull]
         public async Task<GitProcessResult> Run(GitCommandInfo info)
@@ -56,7 +81,7 @@ public async Task<GitProcessResult> Run(GitCommandInfo info)
                 new ProgressOptions { Sticky = true }
             );
 
-            _currentProcess = CreateGitProcess(info);
+            _currentProcess = _createProcessDelegate(info);
 
             try
             {
@@ -76,20 +101,11 @@ public async Task<GitProcessResult> Run(GitCommandInfo info)
 
             return result;
         }
-
-        private static GitProcess CreateGitProcess(GitCommandInfo info)
+
+        /// <summary>Used for unit testing.</summary>
+        internal void SetIsRunning(bool isRunning)
         {
-            var process = new Process();
-            process.StartInfo.FileName = "git";
-            process.StartInfo.Arguments = info.Arguments;
-            process.StartInfo.WorkingDirectory = info.Repository.Info.WorkingDirectory;
-
-            var gitProcess = new GitProcess(process);
-
-            if (info.TimeoutMs > 0)
-                gitProcess.SetTimeout(info.TimeoutMs);
-
-            return gitProcess;
+            IsRunning = isRunning;
         }
 
         private void FinishProcessProgress(GitProcessResult result)
@@ -107,7 +123,7 @@ private void FinishProcessProgress(GitProcessResult result)
             else if (result.Timeout)
                 errorMessage = "Process timed out";
             else
-                errorMessage = $"Failed with exit code {result.ExitCode}";
+                errorMessage = $"Process ended with exit code {result.ExitCode}";
 
             _progressService.FinishWithError(_progressId, errorMessage);
         }

Core/Services/ProgressService.cs

@@ -1,4 +1,5 @@
 using UnityEditor;
+using UnityEngine.TestTools;
 
 namespace UnityGit.Core.Services
 {
@@ -18,6 +19,7 @@ public interface IProgressService
     }
 
     /// <summary>Acts as a wrapper for Unity's Progress API.</summary>
+    [ExcludeFromCoverage]
     public sealed class ProgressService : IProgressService
     {
         public int Start(string name, string description, ProgressOptions options)

Core/Services/PullService.cs

@@ -10,6 +10,7 @@ public interface IPullService
 
     [Dependency(typeof(ICredentialsService), provide: typeof(CredentialsService))]
     [Dependency(typeof(ISignatureService), provide: typeof(SignatureService))]
+    [Dependency(typeof(ICommandsService), provide: typeof(CommandsService))]
     public sealed partial class PullService : Service, IPullService
     {
         [Provide]
@@ -18,6 +19,9 @@ public sealed partial class PullService : Service, IPullService
         [Provide]
         private ISignatureService _signatureService;
 
+        [Provide]
+        private ICommandsService _commandsService;
+
         public MergeResult Pull(Repository repository)
         {
             var fetchOptions = new FetchOptions();
@@ -33,7 +37,7 @@ public MergeResult Pull(Repository repository)
                 FetchOptions = fetchOptions
             };
 
-            return Commands.Pull(repository, _signatureService.GetSignature(), pullOptions);
+            return _commandsService.Pull(repository, _signatureService.GetSignature(), pullOptions);
         }
     }
 }

Core/Services/RepositoryService.cs

@@ -9,6 +9,8 @@ namespace UnityGit.Core.Services
 {
     public interface IRepositoryService
     {
+        IRepository GetRepository(string directoryPath);
+
         IRepository GetProjectRepository();
 
         List<IRepository> GetPackageRepositories();
@@ -20,32 +22,38 @@ public interface IRepositoryService
         string GetRepositoryName(IRepository repository);
 
         bool AreRepositoriesEqual(IRepository repositoryOne, IRepository repositoryTwo);
+
+        bool IsValid(IRepository repository);
     }
 
     public sealed class RepositoryService : IRepositoryService
     {
         [CanBeNull]
-        public IRepository GetProjectRepository()
+        public IRepository GetRepository(string repositoryPath)
         {
-            var projectFullPath = Directory.GetCurrentDirectory();
-            var gitRepositoryPath = Path.Combine(projectFullPath, ".git");
-
-            if (!Directory.Exists(gitRepositoryPath))
+            if (!Directory.Exists(repositoryPath))
                 return null;
 
             try
             {
-                if (!Repository.IsValid(gitRepositoryPath))
+                if (!Repository.IsValid(repositoryPath))
                     return null;
             }
             catch
             {
                 return null;
             }
 
-            return new Repository(gitRepositoryPath);
+            return new Repository(repositoryPath);
         }
 
+        [CanBeNull]
+        public IRepository GetProjectRepository()
+        {
+            var gitRepositoryPath = Path.Combine(Directory.GetCurrentDirectory(), ".git");
+            return GetRepository(gitRepositoryPath);
+        }
+
         public List<IRepository> GetPackageRepositories()
         {
             var repositories = new List<IRepository>();
@@ -109,5 +117,10 @@ public bool AreRepositoriesEqual(IRepository repositoryOne, IRepository reposito
 
             return repositoryOne.Info.Path.Equals(repositoryTwo.Info.Path);
         }
+
+        public bool IsValid(IRepository repository)
+        {
+            return Repository.IsValid(repository.Info.Path);
+        }
     }
 }

Core/Services/RestoreService.cs

@@ -12,12 +12,13 @@ public interface IRestoreService
 
         event FileRestoredDelegate FileRestored;
 
-        void RestoreFile(IRepository repository, string filePath);
+        bool RestoreFile(IRepository repository, string filePath);
     }
 
     [Dependency(typeof(IDialogService), provide: typeof(DialogService))]
     [Dependency(typeof(ICheckoutService), provide: typeof(CheckoutService))]
     [Dependency(typeof(ILogService), provide: typeof(UnityGitLogService))]
+    [Dependency(typeof(IFileService), provide: typeof(FileService))]
     public sealed partial class RestoreService : Service, IRestoreService
     {
         public event IRestoreService.FileRestoredDelegate FileRestored;
@@ -28,29 +29,33 @@ public sealed partial class RestoreService : Service, IRestoreService
         private ICheckoutService _checkoutService;
         [Provide]
         private ILogService _logService;
+        [Provide]
+        private IFileService _fileService;
 
-        public void RestoreFile(IRepository repository, string filePath)
+        public bool RestoreFile(IRepository repository, string filePath)
         {
             var status = repository.RetrieveStatus(filePath);
 
             if (status == FileStatus.Nonexistent)
-                return;
+                return false;
 
             if (FileStatusUtilities.IsNew(status))
             {
                 if (!TryDeleteFile(repository, filePath))
-                    return;
+                    return false;
             }
             else
             {
                 if (!TryRestoreFile(repository, filePath))
-                    return;
+                    return false;
             }
 
             FileRestored?.Invoke(repository, filePath);
+
+            return true;
         }
 
-        private bool TryDeleteFile(IRepository repository, string filePath)
+        public bool TryDeleteFile(IRepository repository, string filePath)
         {
             if (!_dialogService.Confirm($"Are you sure you want to delete {filePath}?"))
                 return false;
@@ -62,26 +67,27 @@ private bool TryDeleteFile(IRepository repository, string filePath)
 
             try
             {
-                File.Delete(path);
+                _fileService.Delete(path);
                 success = true;
                 _logService.LogMessage("File deleted.");
             } catch (Exception exception)
             {
-                _dialogService.Error($"Failed to delete {filePath}.");
+                _dialogService.Error($"Failed to delete {path}.");
                 _logService.LogException(exception);
             }
 
             return success;
         }
 
-        private bool TryRestoreFile(IRepository repository, string filePath)
+        public bool TryRestoreFile(IRepository repository, string filePath)
         {
             if (!_dialogService.Confirm($"Are you sure you want to restore {filePath}?"))
                 return false;
 
             var success = false;
 
-            _logService.LogMessage($"Restoring file {filePath}...");
+            var path = Path.Combine(repository.Info.WorkingDirectory, filePath);
+            _logService.LogMessage($"Restoring file {path}...");
 
             try
             {
@@ -91,7 +97,7 @@ private bool TryRestoreFile(IRepository repository, string filePath)
             }
             catch (Exception exception)
             {
-                _dialogService.Error($"Failed to restore file {filePath}.");
+                _dialogService.Error($"Failed to restore {path}.");
                 _logService.LogException(exception);
             }