Adjusted refactoring Tests to use IAsyncLifetime instead of IDisposable

Author: Razmo99

test/PowerShellEditorServices.Test/Refactoring/RefactorFunctionTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
@@ -18,18 +19,18 @@
 namespace PowerShellEditorServices.Test.Refactoring
 {
     [Trait("Category", "RefactorFunction")]
-    public class RefactorFunctionTests : IDisposable
+    public class RefactorFunctionTests : IAsyncLifetime
 
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly WorkspaceService workspace;
-        public void Dispose()
+        private PsesInternalHost psesHost;
+        private WorkspaceService workspace;
+        public async Task InitializeAsync()
         {
-#pragma warning disable VSTHRD002
-            psesHost.StopAsync().Wait();
-#pragma warning restore VSTHRD002
-            GC.SuppressFinalize(this);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
+            workspace = new WorkspaceService(NullLoggerFactory.Instance);
         }
+
+        public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);
         private ScriptFile GetTestScript(string fileName) => workspace.GetFile(TestUtilities.GetSharedPath(Path.Combine("Refactoring\\Functions", fileName)));
 
         internal static string GetModifiedScript(string OriginalScript, ModifiedFileResponse Modification)
@@ -72,11 +73,7 @@ internal static string TestRenaming(ScriptFile scriptFile, RenameSymbolParams re
             };
             return GetModifiedScript(scriptFile.Contents, changes);
         }
-        public RefactorFunctionTests()
-        {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
-            workspace = new WorkspaceService(NullLoggerFactory.Instance);
-        }
+
         [Fact]
         public void RefactorFunctionSingle()
         {

test/PowerShellEditorServices.Test/Refactoring/RefactorUtilitiesTests.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
@@ -20,24 +20,18 @@
 namespace PowerShellEditorServices.Test.Refactoring
 {
     [Trait("Category", "RefactorUtilities")]
-    public class RefactorUtilitiesTests : IDisposable
+    public class RefactorUtilitiesTests : IAsyncLifetime
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly WorkspaceService workspace;
+        private PsesInternalHost psesHost;
+        private WorkspaceService workspace;
 
-        public RefactorUtilitiesTests()
+        public async Task InitializeAsync()
         {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
             workspace = new WorkspaceService(NullLoggerFactory.Instance);
         }
 
-        public void Dispose()
-        {
-#pragma warning disable VSTHRD002
-            psesHost.StopAsync().Wait();
-#pragma warning restore VSTHRD002
-            GC.SuppressFinalize(this);
-        }
+        public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);
         private ScriptFile GetTestScript(string fileName) => workspace.GetFile(TestUtilities.GetSharedPath(Path.Combine("Refactoring\\Utilities", fileName)));
 
         [Fact]

test/PowerShellEditorServices.Test/Refactoring/RefactorVariableTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
@@ -17,18 +18,17 @@
 namespace PowerShellEditorServices.Test.Refactoring
 {
     [Trait("Category", "RenameVariables")]
-    public class RefactorVariableTests : IDisposable
+    public class RefactorVariableTests : IAsyncLifetime
 
     {
-        private readonly PsesInternalHost psesHost;
-        private readonly WorkspaceService workspace;
-        public void Dispose()
+        private PsesInternalHost psesHost;
+        private WorkspaceService workspace;
+        public async Task InitializeAsync()
         {
-#pragma warning disable VSTHRD002
-            psesHost.StopAsync().Wait();
-#pragma warning restore VSTHRD002
-            GC.SuppressFinalize(this);
+            psesHost = await PsesHostFactory.Create(NullLoggerFactory.Instance);
+            workspace = new WorkspaceService(NullLoggerFactory.Instance);
         }
+        public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);
         private ScriptFile GetTestScript(string fileName) => workspace.GetFile(TestUtilities.GetSharedPath(Path.Combine("Refactoring\\Variables", fileName)));
 
         internal static string GetModifiedScript(string OriginalScript, ModifiedFileResponse Modification)
@@ -71,11 +71,7 @@ internal static string TestRenaming(ScriptFile scriptFile, RenameSymbolParams re
             };
             return GetModifiedScript(scriptFile.Contents, changes);
         }
-        public RefactorVariableTests()
-        {
-            psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
-            workspace = new WorkspaceService(NullLoggerFactory.Instance);
-        }
+
         [Fact]
         public void RefactorVariableSingle()
         {