Use WpfFact for integration tests

See dotnet/roslyn#25467

Author: sharwell

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIntegrationTest.cs

@@ -4,25 +4,37 @@
 namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
 {
     using System;
+    using System.Threading;
+    using System.Threading.Tasks;
     using System.Windows.Automation;
     using Xunit;
 
     [CaptureTestName]
     [Collection(nameof(SharedIntegrationHostFixture))]
-    public abstract class AbstractIntegrationTest : IDisposable
+    public abstract class AbstractIntegrationTest : IAsyncLifetime, IDisposable
     {
+        private readonly VisualStudioInstanceFactory _instanceFactory;
+        private readonly Version _version;
         private VisualStudioInstanceContext _visualStudioContext;
 
         protected AbstractIntegrationTest(VisualStudioInstanceFactory instanceFactory, Version version)
         {
+            Assert.Equal(ApartmentState.STA, Thread.CurrentThread.GetApartmentState());
+            _instanceFactory = instanceFactory;
+            _version = version;
             Automation.TransactionTimeout = 20000;
-            _visualStudioContext = instanceFactory.GetNewOrUsedInstance(version, SharedIntegrationHostFixture.RequiredPackageIds);
-            VisualStudio = _visualStudioContext.Instance;
         }
 
-        public VisualStudioInstance VisualStudio
+        public VisualStudioInstance VisualStudio => _visualStudioContext?.Instance;
+
+        public virtual async Task InitializeAsync()
+        {
+            _visualStudioContext = await _instanceFactory.GetNewOrUsedInstanceAsync(_version, SharedIntegrationHostFixture.RequiredPackageIds).ConfigureAwait(false);
+        }
+
+        public Task DisposeAsync()
         {
-            get;
+            return Task.FromResult<object>(null);
         }
 
         public void Dispose()

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/IntegrationHelper.cs

@@ -233,7 +233,7 @@ public static void SetForegroundWindow(IntPtr window, bool skipAttachingThread =
             try
             {
                 // No need to re-attach threads in case when VS initializaed an UI thread for a debugged application.
-                if (!skipAttachingThread)
+                if (!skipAttachingThread && activeThreadId != currentThreadId)
                 {
                     // Attach the thread inputs so that 'SetActiveWindow' and 'SetFocus' work
                     threadInputsAttached = AttachThreadInput(currentThreadId, activeThreadId);

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/TrivialIntegrationTest.cs

@@ -8,6 +8,7 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using System.Windows;
     using System.Windows.Media;
     using Microsoft.VisualStudio.Text.Formatting;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
     using WindowsInput;
     using WindowsInput.Native;
     using Xunit;
@@ -20,7 +21,7 @@ protected TrivialIntegrationTest(VisualStudioInstanceFactory instanceFactory, Ve
         {
         }
 
-        [Fact]
+        [WpfFact]
         public void TestOpenAndCloseIDE()
         {
             var currentVersion = VisualStudioInstance.RetryRpcCall(() => VisualStudio.Dte.Version);
@@ -34,7 +35,7 @@ public void TestOpenAndCloseIDE()
             Assert.Equal(expectedVersion.ToString(), currentVersion);
         }
 
-        [Fact]
+        [WpfFact]
         public void BasicScrollingBehavior()
         {
             var window = VisualStudioInstance.RetryRpcCall(() => VisualStudio.Dte.ItemOperations.NewFile(Name: Guid.NewGuid() + ".txt"));
@@ -129,7 +130,7 @@ public void BasicScrollingBehavior()
         /// <summary>
         /// Verifies that the Ctrl+Scroll operations do not change the zoom level in the editor.
         /// </summary>
-        [Fact]
+        [WpfFact]
         public void ZoomDisabled()
         {
             var window = VisualStudioInstance.RetryRpcCall(() => VisualStudio.Dte.ItemOperations.NewFile(Name: Guid.NewGuid() + ".txt"));

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/VisualStudioInstanceFactory.cs

@@ -9,6 +9,7 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using System.Diagnostics;
     using System.Linq;
     using System.Reflection;
+    using System.Threading.Tasks;
     using Microsoft.VisualStudio.ExtensionManager;
     using Microsoft.VisualStudio.Settings;
     using Microsoft.VisualStudio.Setup.Configuration;
@@ -55,12 +56,12 @@ private static Assembly AssemblyResolveHandler(object sender, ResolveEventArgs e
         /// <summary>
         /// Returns a <see cref="VisualStudioInstanceContext"/>, starting a new instance of Visual Studio if necessary.
         /// </summary>
-        public VisualStudioInstanceContext GetNewOrUsedInstance(Version version, ImmutableHashSet<string> requiredPackageIds)
+        public async Task<VisualStudioInstanceContext> GetNewOrUsedInstanceAsync(Version version, ImmutableHashSet<string> requiredPackageIds)
         {
             ThrowExceptionIfAlreadyHasActiveContext();
 
             bool shouldStartNewInstance = ShouldStartNewInstance(version, requiredPackageIds);
-            UpdateCurrentlyRunningInstance(version, requiredPackageIds, shouldStartNewInstance);
+            await UpdateCurrentlyRunningInstanceAsync(version, requiredPackageIds, shouldStartNewInstance).ConfigureAwait(false);
 
             return new VisualStudioInstanceContext(_currentlyRunningInstance, this);
         }
@@ -102,7 +103,7 @@ private void ThrowExceptionIfAlreadyHasActiveContext()
         /// <summary>
         /// Starts up a new <see cref="VisualStudioInstance"/>, shutting down any instances that are already running.
         /// </summary>
-        private void UpdateCurrentlyRunningInstance(Version version, ImmutableHashSet<string> requiredPackageIds, bool shouldStartNewInstance)
+        private async Task UpdateCurrentlyRunningInstanceAsync(Version version, ImmutableHashSet<string> requiredPackageIds, bool shouldStartNewInstance)
         {
             Process hostProcess;
             DTE dte;
@@ -123,7 +124,7 @@ private void UpdateCurrentlyRunningInstance(Version version, ImmutableHashSet<st
                 hostProcess = StartNewVisualStudioProcess(installationPath, version);
 
                 // We wait until the DTE instance is up before we're good
-                dte = IntegrationHelper.WaitForNotNullAsync(() => IntegrationHelper.TryLocateDteForProcess(hostProcess)).Result;
+                dte = await IntegrationHelper.WaitForNotNullAsync(() => IntegrationHelper.TryLocateDteForProcess(hostProcess)).ConfigureAwait(false);
             }
             else
             {