diff --git a/src/GitHub.Api/Application/ApiClient.cs b/src/GitHub.Api/Application/ApiClient.cs index c4ae1782d..9783078d4 100644 --- a/src/GitHub.Api/Application/ApiClient.cs +++ b/src/GitHub.Api/Application/ApiClient.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Octokit; @@ -27,14 +26,10 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain) private readonly IKeychain keychain; private readonly IGitHubClient githubClient; private readonly ILoginManager loginManager; - private static readonly SemaphoreSlim sem = new SemaphoreSlim(1); IList organizationsCache; Octokit.User userCache; - string owner; - bool? isEnterprise; - public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient) { Guard.ArgumentNotNull(hostUrl, nameof(hostUrl)); diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs index d0eb0bc3e..2622ec60c 100644 --- a/src/GitHub.Api/Application/ApplicationManagerBase.cs +++ b/src/GitHub.Api/Application/ApplicationManagerBase.cs @@ -39,7 +39,7 @@ protected void Initialize() Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false); ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken); Platform.Initialize(ProcessManager, TaskManager); - GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager); + GitClient = new GitClient(Environment, ProcessManager, TaskManager); SetupMetrics(); } @@ -127,7 +127,7 @@ public void RestartRepository() { if (Environment.RepositoryPath != null) { - repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, UsageTracker, GitClient, Environment.RepositoryPath); + repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath); repositoryManager.Initialize(); Environment.Repository.Initialize(repositoryManager); repositoryManager.Start(); diff --git a/src/GitHub.Api/Events/RepositoryWatcher.cs b/src/GitHub.Api/Events/RepositoryWatcher.cs index b72d6bd3c..6528b0d3a 100644 --- a/src/GitHub.Api/Events/RepositoryWatcher.cs +++ b/src/GitHub.Api/Events/RepositoryWatcher.cs @@ -30,10 +30,8 @@ class RepositoryWatcher : IRepositoryWatcher private readonly CancellationToken cancellationToken; private readonly NPath[] ignoredPaths; private readonly ManualResetEventSlim pauseEvent; - private readonly bool disableNative; private NativeInterface nativeInterface; private bool running; - private Task task; private int lastCountOfProcessedEvents = 0; private bool processingEvents; private readonly ManualResetEventSlim signalProcessingEventsDone = new ManualResetEventSlim(false); @@ -68,8 +66,7 @@ public void Initialize() try { - if (!disableNative) - nativeInterface = new NativeInterface(pathsRepositoryPath); + nativeInterface = new NativeInterface(pathsRepositoryPath); } catch (Exception ex) { @@ -79,12 +76,6 @@ public void Initialize() public void Start() { - if (disableNative) - { - Logger.Trace("Native interface is disabled"); - return; - } - if (nativeInterface == null) { Logger.Warning("NativeInterface is null"); @@ -95,7 +86,7 @@ public void Start() running = true; pauseEvent.Reset(); - task = Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default); + Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default); } public void Stop() diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs index 0b7978338..63e9a4656 100644 --- a/src/GitHub.Api/Git/GitClient.cs +++ b/src/GitHub.Api/Git/GitClient.cs @@ -87,16 +87,13 @@ class GitClient : IGitClient { private readonly IEnvironment environment; private readonly IProcessManager processManager; - private readonly ICredentialManager credentialManager; private readonly ITaskManager taskManager; private readonly CancellationToken cancellationToken; - public GitClient(IEnvironment environment, IProcessManager processManager, - ICredentialManager credentialManager, ITaskManager taskManager) + public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager) { this.environment = environment; this.processManager = processManager; - this.credentialManager = credentialManager; this.taskManager = taskManager; this.cancellationToken = taskManager.Token; } diff --git a/src/GitHub.Api/Git/GitConfig.cs b/src/GitHub.Api/Git/GitConfig.cs index c80d59662..05ce1bb10 100644 --- a/src/GitHub.Api/Git/GitConfig.cs +++ b/src/GitHub.Api/Git/GitConfig.cs @@ -216,16 +216,16 @@ public string GetString(string key) public int GetInt(string key) { var value = this[key]; - var result = 0; - var success = int.TryParse(value, out result); + int result = 0; + int.TryParse(value, out result); return result; } public float GetFloat(string key) { var value = this[key]; - var result = 0F; - var success = float.TryParse(value, out result); + float result = 0F; + float.TryParse(value, out result); return result; } diff --git a/src/GitHub.Api/Git/GitCredentialManager.cs b/src/GitHub.Api/Git/GitCredentialManager.cs index 4922d7a26..fceeec221 100644 --- a/src/GitHub.Api/Git/GitCredentialManager.cs +++ b/src/GitHub.Api/Git/GitCredentialManager.cs @@ -11,14 +11,12 @@ class GitCredentialManager : ICredentialManager private ICredential credential; private string credHelper = null; - private readonly IEnvironment environment; private readonly IProcessManager processManager; private readonly ITaskManager taskManager; - public GitCredentialManager(IEnvironment environment, IProcessManager processManager, + public GitCredentialManager(IProcessManager processManager, ITaskManager taskManager) { - this.environment = environment; this.processManager = processManager; this.taskManager = taskManager; } diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs index e3892806a..d36633f28 100644 --- a/src/GitHub.Api/Git/RepositoryManager.cs +++ b/src/GitHub.Api/Git/RepositoryManager.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; namespace GitHub.Unity @@ -94,13 +93,11 @@ public RepositoryPathConfiguration(NPath repositoryPath) class RepositoryManager : IRepositoryManager { - private readonly CancellationToken cancellationToken; private readonly IGitConfig config; private readonly IGitClient gitClient; private readonly IPlatform platform; private readonly IRepositoryPathConfiguration repositoryPaths; private readonly ITaskManager taskManager; - private readonly IUsageTracker usageTracker; private readonly IRepositoryWatcher watcher; private bool isBusy; @@ -119,15 +116,13 @@ class RepositoryManager : IRepositoryManager public event Action OnRemoteBranchRemoved; public event Action OnStatusUpdated; - public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker, IGitConfig gitConfig, + public RepositoryManager(IPlatform platform, ITaskManager taskManager, IGitConfig gitConfig, IRepositoryWatcher repositoryWatcher, IGitClient gitClient, - IRepositoryPathConfiguration repositoryPaths, CancellationToken cancellationToken) + IRepositoryPathConfiguration repositoryPaths) { this.repositoryPaths = repositoryPaths; this.platform = platform; this.taskManager = taskManager; - this.usageTracker = usageTracker; - this.cancellationToken = cancellationToken; this.gitClient = gitClient; this.watcher = repositoryWatcher; this.config = gitConfig; @@ -135,7 +130,7 @@ public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTra SetupWatcher(); } - public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker, + public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IGitClient gitClient, NPath repositoryRoot) { var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot); @@ -144,8 +139,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token); - return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher, - gitClient, repositoryPathConfiguration, taskManager.Token); + return new RepositoryManager(platform, taskManager, gitConfig, repositoryWatcher, + gitClient, repositoryPathConfiguration); } public void Initialize() diff --git a/src/GitHub.Api/Helpers/SimpleJson.cs b/src/GitHub.Api/Helpers/SimpleJson.cs index da3325c28..dd2cf8483 100644 --- a/src/GitHub.Api/Helpers/SimpleJson.cs +++ b/src/GitHub.Api/Helpers/SimpleJson.cs @@ -517,7 +517,6 @@ static class SimpleJson private static readonly char[] EscapeTable; private static readonly char[] EscapeCharacters = new char[] { '"', '\\', '\b', '\f', '\n', '\r', '\t' }; - private static readonly string EscapeCharactersString = new string(EscapeCharacters); static SimpleJson() { diff --git a/src/GitHub.Api/NewTaskSystem/BaseOutputProcessor.cs b/src/GitHub.Api/NewTaskSystem/BaseOutputProcessor.cs index 9456c7c43..1c2f2ea0d 100644 --- a/src/GitHub.Api/NewTaskSystem/BaseOutputProcessor.cs +++ b/src/GitHub.Api/NewTaskSystem/BaseOutputProcessor.cs @@ -84,7 +84,6 @@ public override void LineReceived(string line) abstract class FirstResultOutputProcessor : BaseOutputProcessor { - private readonly StringBuilder sb = new StringBuilder(); private bool isSet = false; public override void LineReceived(string line) { diff --git a/src/GitHub.Api/Platform/Platform.cs b/src/GitHub.Api/Platform/Platform.cs index 6e4a20e4e..71456a5a5 100644 --- a/src/GitHub.Api/Platform/Platform.cs +++ b/src/GitHub.Api/Platform/Platform.cs @@ -26,7 +26,7 @@ public IPlatform Initialize(IProcessManager processManager, ITaskManager taskMan if (CredentialManager == null) { - CredentialManager = new GitCredentialManager(Environment, processManager, taskManager); + CredentialManager = new GitCredentialManager(processManager, taskManager); Keychain = new Keychain(Environment, CredentialManager); Keychain.Initialize(); } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs index c18c19d51..5200df7ec 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs @@ -38,7 +38,6 @@ sealed class EnvironmentCache : ScriptObjectSingleton [SerializeField] private string unityApplication; [SerializeField] private string unityAssetsPath; [SerializeField] private string extensionInstallPath; - [SerializeField] private string gitExecutablePath; [SerializeField] private string unityVersion; [NonSerialized] private IEnvironment environment; @@ -80,7 +79,6 @@ public void Flush() unityApplication = Environment.UnityApplication; unityAssetsPath = Environment.UnityAssetsPath; extensionInstallPath = Environment.ExtensionInstallPath; - gitExecutablePath = Environment.GitExecutablePath; Save(true); } } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs index a4c57790a..0e282ee88 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs @@ -49,8 +49,6 @@ class Styles private const string WarningLabel = "Warning: {0}"; - private static Color headerGreyColor = new Color(0.878f, 0.878f, 0.878f, 1.0f); - private static GUIStyle label, boldLabel, errorLabel, @@ -97,8 +95,6 @@ class Styles lockIcon, dropdownListIcon; - private static Color timelineBarColor; - public static Texture2D GetFileStatusIcon(GitFileStatus status, bool isLocked) { if (isLocked) @@ -597,18 +593,6 @@ public static GUIStyle GenericBoxStyle } } - public static Color TimelineBarColor - { - get - { - if (timelineBarColor == null) - { - timelineBarColor = new Color(0.51F, 0.51F, 0.51F, 0.2F); - } - return timelineBarColor; - } - } - public static Texture2D ActiveBranchIcon { get diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Threading/SingleThreadSynchronizationContext.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Threading/SingleThreadSynchronizationContext.cs index 5db0285d9..a4dfe6038 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/Threading/SingleThreadSynchronizationContext.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/Threading/SingleThreadSynchronizationContext.cs @@ -1,4 +1,3 @@ -using GitHub.Unity; using System; using System.Threading; using UnityEditor; @@ -7,8 +6,6 @@ namespace GitHub.Unity { class MainThreadSynchronizationContext : SynchronizationContext, IMainThreadSynchronizationContext { - private static readonly ILogging logger = Logging.GetLogger(); - public void Schedule(Action action) { Guard.ArgumentNotNull(action, "action"); diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs index 03ce9534c..c864652c5 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs @@ -7,7 +7,6 @@ namespace GitHub.Unity abstract class BaseWindow : EditorWindow, IView { [NonSerialized] private bool initialized = false; - [NonSerialized] private IApplicationManager cachedManager; [NonSerialized] private IRepository cachedRepository; [NonSerialized] private bool initializeWasCalled; [NonSerialized] private bool inLayout; diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs index 83d7d44d7..14e803c78 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs @@ -35,7 +35,6 @@ class HistoryView : Subview [NonSerialized] private int historyStartIndex; [NonSerialized] private int historyStopIndex; - [NonSerialized] private float lastWidth; [NonSerialized] private int listID; [NonSerialized] private int newSelectionIndex; [NonSerialized] private float scrollOffset; @@ -60,7 +59,6 @@ public override void InitializeView(IView parent) { base.InitializeView(parent); - lastWidth = Position.width; selectionIndex = newSelectionIndex = -1; changesetTree.InitializeView(this); @@ -453,7 +451,6 @@ private void RevertCommit() private bool HistoryEntry(GitLogEntry entry, LogEntryState state, bool selected) { var entryRect = GUILayoutUtility.GetRect(Styles.HistoryEntryHeight, Styles.HistoryEntryHeight); - var timelineBarRect = new Rect(entryRect.x + Styles.BaseSpacing, 0, 2, Styles.HistoryDetailsHeight); if (Event.current.type == EventType.Repaint) { @@ -461,7 +458,6 @@ private bool HistoryEntry(GitLogEntry entry, LogEntryState state, bool selected) var summaryRect = new Rect(entryRect.x, entryRect.y + (Styles.BaseSpacing / 2), entryRect.width, Styles.HistorySummaryHeight + Styles.BaseSpacing); var timestampRect = new Rect(entryRect.x, entryRect.yMax - Styles.HistoryDetailsHeight - (Styles.BaseSpacing / 2), entryRect.width, Styles.HistoryDetailsHeight); - var authorRect = new Rect(timestampRect.xMax, timestampRect.y, timestampRect.width, timestampRect.height); var contentOffset = new Vector2(Styles.BaseSpacing * 2, 0); @@ -610,7 +606,6 @@ private void Push() private void Fetch() { - var remote = Repository.CurrentRemote.HasValue ? Repository.CurrentRemote.Value.Name : String.Empty; Repository .Fetch() .FinallyInUI((success, e) => { diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs index 6bec1cb99..731fe401b 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs @@ -11,7 +11,6 @@ namespace GitHub.Unity [Serializable] class SettingsView : Subview { - private const string GitInstallTitle = "Git installation"; private const string GitRepositoryTitle = "Repository Configuration"; private const string GitRepositoryRemoteLabel = "Remote"; private const string GitRepositorySave = "Save Repository"; @@ -20,15 +19,9 @@ class SettingsView : Subview private const string EnableTraceLoggingLabel = "Enable Trace Logging"; private const string MetricsOptInLabel = "Help us improve by sending anonymous usage data"; private const string DefaultRepositoryRemoteName = "origin"; - private const string BrowseButton = "..."; - private const string PathToGit = "Path to Git"; - private const string GitPathSaveButton = "Save Path"; - [NonSerialized] private int newGitIgnoreRulesSelection = -1; [NonSerialized] private bool isBusy; - [SerializeField] private int gitIgnoreRulesSelection = 0; - [SerializeField] private string initDirectory; [SerializeField] private List lockedFiles = new List(); [SerializeField] private Vector2 lockScrollPos; [SerializeField] private string repositoryRemoteName; @@ -39,16 +32,12 @@ class SettingsView : Subview [NonSerialized] private bool remoteHasChanged; [NonSerialized] private bool locksHaveChanged; - [SerializeField] private string newGitName; - [SerializeField] private string newGitEmail; [SerializeField] private string newRepositoryRemoteUrl; - [SerializeField] private User cachedUser; [SerializeField] private bool metricsEnabled; [NonSerialized] private bool metricsHasChanged; [SerializeField] private GitPathView gitPathView = new GitPathView(); - [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView(); public override void InitializeView(IView parent) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs index a9bbaca1b..f9a32fa25 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs @@ -283,7 +283,7 @@ private void DoHeaderGUI() private void DoToolbarGUI() { // Subtabs & toolbar - Rect mainNavRect = EditorGUILayout.BeginHorizontal(EditorStyles.toolbar); + GUILayout.BeginHorizontal(EditorStyles.toolbar); { changeTab = activeTab; EditorGUI.BeginChangeCheck(); diff --git a/src/tests/IntegrationTests/BaseGitEnvironmentTest.cs b/src/tests/IntegrationTests/BaseGitEnvironmentTest.cs index e65489359..5bbec9fd9 100644 --- a/src/tests/IntegrationTests/BaseGitEnvironmentTest.cs +++ b/src/tests/IntegrationTests/BaseGitEnvironmentTest.cs @@ -26,11 +26,9 @@ protected async Task Initialize(NPath repoPath, NPath environmentP Platform.Initialize(ProcessManager, TaskManager); - GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager); + GitClient = new GitClient(Environment, ProcessManager, TaskManager); - var usageTracker = new NullUsageTracker(); - - RepositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, usageTracker, GitClient, repoPath); + RepositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, repoPath); RepositoryManager.Initialize(); Environment.Repository = new Repository("TestRepo", repoPath); diff --git a/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs b/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs index ed50875a8..8766b3798 100644 --- a/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs +++ b/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs @@ -175,8 +175,7 @@ public async Task CredentialHelperGetTest() { await Initialize(TestRepoMasterCleanSynchronized); - string s = null; - s = await ProcessManager + await ProcessManager .GetGitCreds(TestRepoMasterCleanSynchronized, Environment, GitEnvironment) .StartAsAsync(); } diff --git a/src/tests/IntegrationTests/ThreadSynchronizationContext.cs b/src/tests/IntegrationTests/ThreadSynchronizationContext.cs index bb7e4925d..7e92bf06a 100644 --- a/src/tests/IntegrationTests/ThreadSynchronizationContext.cs +++ b/src/tests/IntegrationTests/ThreadSynchronizationContext.cs @@ -58,7 +58,6 @@ private void Start() while (!token.IsCancellationRequested) { var current = DateTime.Now.Ticks; - var elapsed = current - lastTime; count++; if (current - secondStart > TimeSpan.TicksPerMillisecond * 1000) { diff --git a/src/tests/TaskSystemIntegrationTests/Tests.cs b/src/tests/TaskSystemIntegrationTests/Tests.cs index 97647db89..d916283ff 100644 --- a/src/tests/TaskSystemIntegrationTests/Tests.cs +++ b/src/tests/TaskSystemIntegrationTests/Tests.cs @@ -266,7 +266,6 @@ public async void NonUITasksAlwaysRunOnDifferentThreadFromUITasks() var output = new Dictionary(); var tasks = new List(); var seed = Randomizer.RandomSeed; - var rand = new Randomizer(seed); var uiThread = 0; await new ActionTask(Token, _ => uiThread = Thread.CurrentThread.ManagedThreadId) { Affinity = TaskAffinity.UI } @@ -290,7 +289,6 @@ public async void ChainingOnDifferentSchedulers() var output = new Dictionary>(); var tasks = new List(); var seed = Randomizer.RandomSeed; - var rand = new Randomizer(seed); var uiThread = 0; await new ActionTask(Token, _ => uiThread = Thread.CurrentThread.ManagedThreadId) { Affinity = TaskAffinity.UI } @@ -567,32 +565,14 @@ public async Task StartAndEndAreAlwaysRaised() [ExpectedException(typeof(InvalidOperationException))] public async Task ExceptionPropagatesOutIfNoFinally() { - var runOrder = new List(); var task = new ActionTask(Token, _ => { throw new InvalidOperationException(); }) .Catch(_ => { }); await task.StartAsAsync(); } - //[Test] - //[Ignore("borked")] - [ExpectedException(typeof(InvalidOperationException))] - public async Task DeferExceptions() - { - var runOrder = new List(); - var task = new FuncTask(Token, _ => 1) - .Defer(async d => - { - throw new InvalidOperationException(); - return await TaskEx.FromResult(d); - }) - .Then(_ => { }); - await task.StartAsAsync(); - } - [Test] public async Task StartAsyncWorks() { - var runOrder = new List(); var task = new FuncTask(Token, _ => 1); var ret = await task.StartAsAsync(); Assert.AreEqual(1, ret); @@ -643,7 +623,6 @@ public async Task ContinueAfterException() [Test] public async Task StartAwaitSafelyAwaits() { - var runOrder = new List(); var task = new ActionTask(Token, _ => { throw new InvalidOperationException(); }) .Catch(_ => { }); await task.StartAwait(_ => { }); @@ -663,106 +642,6 @@ public async Task CanWrapATask() CollectionAssert.AreEqual(new string[] { $"ran" }, runOrder); } - /// - /// Always call Then or another non-Defer variant after calling Defer - /// - //[Test] - //[Ignore("borked")] - public async Task AlwaysChainAsyncBodiesWithNonAsync() - { - var runOrder = new List(); - var act = new FuncTask>(Token, _ => runOrder) { Name = "First" } - .Defer(GetData) - .Then((_, v) => - { - v.Add(2); - return v; - }) - .Defer(GetData2) - .Then((_, v) => - { - v.Add(4); - return v; - }) - .Defer(async v => - { - await TaskEx.Delay(10); - v.Add(5); - return v; - }) - .Then((_, v) => - { - v.Add(6); - return v; - }) - .Defer(v => new Task>(() => - { - v.Add(7); - return v; - }), TaskAffinity.Concurrent) - .Finally((_, e, v) => v); - ; - var ret = await act.StartAsAsync(); - CollectionAssert.AreEqual(Enumerable.Range(1, 7), runOrder); - } - - /// - /// Always call Then or another non-Defer variant after calling Defer - /// - //[Test] - //[Ignore("borked")] - public async Task TwoDefersInARowWillNotWork() - { - var runOrder = new List(); - var act = new FuncTask>(Token, _ => runOrder) { Name = "First" } - .Defer(GetData) - .Defer(GetData2) - .Finally((_, e, v) => v); - ; - var ret = await act.StartAsAsync(); - Assert.IsNull(ret); - } - - //[Test] - //[Ignore("borked")] - public async Task DoNotEndChainsWithDefer() - { - var runOrder = new List(); - var act = new FuncTask>(Token, _ => runOrder) { Name = "First" } - .Defer(GetData) - .Then((_, v) => - { - v.Add(2); - return v; - }) - .Defer(GetData2) - .Then((_, v) => - { - v.Add(4); - return v; - }) - .Defer(async v => - { - await TaskEx.Delay(10); - v.Add(5); - return v; - }) - .Then((_, v) => - { - v.Add(6); - return v; - }) - .Defer(v => new Task>(() => - { - v.Add(7); - return v; - }), TaskAffinity.Concurrent); - ; - var ret = await act.Start().Task; - // the last one hasn't finished before await is done - CollectionAssert.AreEqual(Enumerable.Range(1, 6), runOrder); - } - private async Task> GetData(List v) { await TaskEx.Delay(10); diff --git a/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs b/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs index 17e8d52cc..742d47c53 100644 --- a/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs +++ b/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs @@ -59,7 +59,6 @@ private void Start() while (!token.IsCancellationRequested) { var current = DateTime.Now.Ticks; - var elapsed = current - lastTime; count++; if (current - secondStart > TimeSpan.TicksPerMillisecond * 1000) { diff --git a/src/tests/UnitTests/Extensions/EnvironmentExtensionTests.cs b/src/tests/UnitTests/Extensions/EnvironmentExtensionTests.cs index d3ef863b7..bd6e4aa11 100644 --- a/src/tests/UnitTests/Extensions/EnvironmentExtensionTests.cs +++ b/src/tests/UnitTests/Extensions/EnvironmentExtensionTests.cs @@ -53,7 +53,7 @@ public void GetRepositoryPathThrowsWhenRepositoryIsChildOfProject( environment.RepositoryPath.Returns(repositoryPath.ToNPath()); environment.UnityProjectPath.Returns(projectPath.ToNPath()); - var repositoryFilePath = environment.GetRepositoryPath(path.ToNPath()); + environment.GetRepositoryPath(path.ToNPath()); } [Test, Sequential] @@ -83,7 +83,7 @@ public void GetAssetPathShouldThrowWhenRepositoryRootIsChild( environment.RepositoryPath.Returns(repositoryPath.ToNPath()); environment.UnityProjectPath.Returns(projectPath.ToNPath()); - var repositoryFilePath = environment.GetAssetPath(path.ToNPath()); + environment.GetAssetPath(path.ToNPath()); } } } \ No newline at end of file diff --git a/src/tests/UnitTests/IO/GitStatusEntryFactoryTests.cs b/src/tests/UnitTests/IO/GitStatusEntryFactoryTests.cs index eec8473fe..78fe0482b 100644 --- a/src/tests/UnitTests/IO/GitStatusEntryFactoryTests.cs +++ b/src/tests/UnitTests/IO/GitStatusEntryFactoryTests.cs @@ -23,7 +23,7 @@ public void CreateObjectWhenProjectRootIsChildOfGitRootAndFileInGitRoot() var repositoryPath = "/Source".ToNPath(); var unityProjectPath = repositoryPath.Combine("UnityProject"); - var gitEnvironment = SubstituteFactory.CreateProcessEnvironment(repositoryPath); + SubstituteFactory.CreateProcessEnvironment(repositoryPath); var environment = SubstituteFactory.CreateEnvironment(new CreateEnvironmentOptions { RepositoryPath = repositoryPath, UnityProjectPath = unityProjectPath @@ -54,7 +54,7 @@ public void CreateObjectWhenProjectRootIsChildOfGitRootAndFileInProjectRoot() var repositoryPath = "/Source".ToNPath(); var unityProjectPath = repositoryPath.Combine("UnityProject"); - var gitEnvironment = SubstituteFactory.CreateProcessEnvironment(repositoryPath); + SubstituteFactory.CreateProcessEnvironment(repositoryPath); var environment = SubstituteFactory.CreateEnvironment(new CreateEnvironmentOptions { RepositoryPath = repositoryPath, UnityProjectPath = unityProjectPath @@ -84,7 +84,7 @@ public void CreateObjectWhenProjectRootIsSameAsGitRootAndFileInGitRoot() var repositoryPath = "/Source".ToNPath(); var unityProjectPath = repositoryPath; - var gitEnvironment = SubstituteFactory.CreateProcessEnvironment(repositoryPath); + SubstituteFactory.CreateProcessEnvironment(repositoryPath); var environment = SubstituteFactory.CreateEnvironment(new CreateEnvironmentOptions { RepositoryPath = repositoryPath, UnityProjectPath = unityProjectPath diff --git a/src/tests/UnitTests/IO/LinuxBasedGitEnvironmentTests.cs b/src/tests/UnitTests/IO/LinuxBasedGitEnvironmentTests.cs index aaacd02c6..f7d123c24 100644 --- a/src/tests/UnitTests/IO/LinuxBasedGitEnvironmentTests.cs +++ b/src/tests/UnitTests/IO/LinuxBasedGitEnvironmentTests.cs @@ -10,29 +10,6 @@ namespace UnitTests [TestFixture] public class LinuxGitEnvironmentTests: GitEnvironmentTestsBase { - //public static IEnumerable GetDefaultGitPath_TestCases() - //{ - // var testCase = new TestCaseData(true, LinuxGitEnvironment.DefaultGitPath); - // testCase.SetName("Should be found"); - // yield return testCase; - - // testCase = new TestCaseData(false, null); - // testCase.SetName("Should be null"); - // yield return testCase; - //} - - //[TestCaseSource(nameof(GetDefaultGitPath_TestCases))] - //public void GetDefaultGitPath(bool fileFound, string filePath) - //{ - // var environment = Substitute.For(); - - // var filesystem = Substitute.For(); - // filesystem.FileExists(Args.String).Returns(fileFound); - - // var linuxBasedGitInstallationStrategy = new LinuxGitEnvironment(environment, filesystem); - // linuxBasedGitInstallationStrategy.FindGitInstallationPath(TODO).Should().Be(filePath); - //} - public static IEnumerable ValidateGitPath_TestCases() { var testCase = new TestCaseData(true, true); @@ -47,8 +24,6 @@ public static IEnumerable ValidateGitPath_TestCases() [TestCaseSource(nameof(ValidateGitPath_TestCases))] public void ValidateGitPath(bool inFileSystem, bool found) { - var environment = Substitute.For(); - var filesystem = Substitute.For(); filesystem.FileExists(Args.String).Returns(inFileSystem); diff --git a/src/tests/UnitTests/IO/MacBasedGitEnvironmentTests.cs b/src/tests/UnitTests/IO/MacBasedGitEnvironmentTests.cs index 87a8827a3..959e65e37 100644 --- a/src/tests/UnitTests/IO/MacBasedGitEnvironmentTests.cs +++ b/src/tests/UnitTests/IO/MacBasedGitEnvironmentTests.cs @@ -10,29 +10,6 @@ namespace UnitTests [TestFixture] public class MacGitEnvironmentTests { - //public static IEnumerable GetDefaultGitPath_TestCases() - //{ - // var testCase = new TestCaseData(true, MacGitEnvironment.DefaultGitPath); - // testCase.SetName("Should be found"); - // yield return testCase; - - // testCase = new TestCaseData(false, null); - // testCase.SetName("Should be null"); - // yield return testCase; - //} - - //[TestCaseSource(nameof(GetDefaultGitPath_TestCases))] - //public void GetDefaultGitPath(bool fileFound, string filePath) - //{ - // var environment = Substitute.For(); - - // var filesystem = Substitute.For(); - // filesystem.FileExists(Args.String).Returns(fileFound); - - // var linuxBasedGitInstallationStrategy = new MacGitEnvironment(environment, filesystem); - // linuxBasedGitInstallationStrategy.FindGitInstallationPath(TODO).Should().Be(filePath); - //} - public static IEnumerable ValidateGitPath_TestCases() { var testCase = new TestCaseData(true, true); @@ -47,8 +24,6 @@ public static IEnumerable ValidateGitPath_TestCases() [TestCaseSource(nameof(ValidateGitPath_TestCases))] public void ValidateGitPath(bool inFileSystem, bool found) { - var environment = Substitute.For(); - var filesystem = Substitute.For(); filesystem.FileExists(Args.String).Returns(inFileSystem); diff --git a/src/tests/UnitTests/IO/WindowsGitEnvironmentTests.cs b/src/tests/UnitTests/IO/WindowsGitEnvironmentTests.cs index 05be9b4fe..29f036638 100644 --- a/src/tests/UnitTests/IO/WindowsGitEnvironmentTests.cs +++ b/src/tests/UnitTests/IO/WindowsGitEnvironmentTests.cs @@ -48,21 +48,6 @@ public static IEnumerable GetDefaultGitPath_TestCases() yield return testCase; } - //[TestCaseSource(nameof(GetDefaultGitPath_TestCases))] - //public void GetDefaultGitPath(string localAppDataPath, string gitHubRootPath, string[] gitHubRootPathChildren, string gitExecutablePath) - //{ - // var environment = Substitute.For(); - // environment.GetSpecialFolder(Arg.Is(Environment.SpecialFolder.LocalApplicationData)) - // .Returns(localAppDataPath); - - // var filesystem = Substitute.For(); - // filesystem.GetDirectories(gitHubRootPath) - // .Returns(gitHubRootPathChildren); - - // var windowsGitInstallationStrategy = new WindowsGitEnvironment(environment, filesystem); - // windowsGitInstallationStrategy.FindGitInstallationPath(TODO).Should().Be(gitExecutablePath); - //} - public static IEnumerable ValidateGitPath_TestCases() { var testCase = new TestCaseData(true, true); @@ -77,8 +62,6 @@ public static IEnumerable ValidateGitPath_TestCases() [TestCaseSource(nameof(ValidateGitPath_TestCases))] public void ValidateGitPath(bool inFileSystem, bool found) { - var environment = Substitute.For(); - var filesystem = Substitute.For(); filesystem.FileExists(Args.String).Returns(inFileSystem); diff --git a/src/tests/UnitTests/UI/TreeBuilderTests.cs b/src/tests/UnitTests/UI/TreeBuilderTests.cs index 6cb21977f..4a3594564 100644 --- a/src/tests/UnitTests/UI/TreeBuilderTests.cs +++ b/src/tests/UnitTests/UI/TreeBuilderTests.cs @@ -13,8 +13,6 @@ namespace UnitTests.UI [TestFixture, Isolated] public class TreeBuilderTests { - private ILogging logger = Logging.GetLogger(); - private IEnvironment environment; private GitObjectFactory gitObjectFactory;