Simplify integration test helpers

Author: sharwell

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/IdeSendKeys.cs

@@ -6,17 +6,18 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
     using System;
     using System.Runtime.InteropServices;
     using System.Threading.Tasks;
+    using Microsoft.VisualStudio.Threading;
     using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess;
     using WindowsInput;
     using WindowsInput.Native;
 
     public class IdeSendKeys
     {
-        private readonly VisualStudio_InProc _visualStudio;
+        private readonly VisualStudio_InProc2 _visualStudio;
 
-        public IdeSendKeys()
+        public IdeSendKeys(JoinableTaskFactory joinableTaskFactory)
         {
-            _visualStudio = VisualStudio_InProc.Create();
+            _visualStudio = new VisualStudio_InProc2(joinableTaskFactory);
         }
 
         internal async Task SendAsync(params object[] keys)
@@ -82,7 +83,7 @@ internal async Task SendAsync(Action<InputSimulator> actions)
             try
             {
                 var foreground = GetForegroundWindow();
-                await Task.Run(() => _visualStudio.ActivateMainWindow());
+                await _visualStudio.ActivateMainWindowAsync();
 
                 await Task.Run(() => actions(new InputSimulator()));
             }
@@ -94,7 +95,7 @@ internal async Task SendAsync(Action<InputSimulator> actions)
                 }
             }
 
-            await Task.Run(() => _visualStudio.WaitForApplicationIdle());
+            await InProcComponent2.WaitForApplicationIdleAsync();
         }
 
         private static bool AttachThreadInput(uint idAttach, uint idAttachTo)

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/InProcComponent.cs

@@ -40,7 +40,7 @@ protected async Task<DTE> GetDTEAsync()
         /// <summary>
         /// Waiting for the application to 'idle' means that it is done pumping messages (including WM_PAINT).
         /// </summary>
-        protected static async Task WaitForApplicationIdleAsync()
+        protected internal static async Task WaitForApplicationIdleAsync()
         {
             await Application.Current.Dispatcher.InvokeAsync(() => { }, DispatcherPriority.ApplicationIdle);
         }

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/InProcComponent2.cs

@@ -0,0 +1,37 @@
+// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
+
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
+{
+    using System;
+    using System.Diagnostics;
+    using System.Threading.Tasks;
+    using Microsoft.VisualStudio.Threading;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
+
+    internal partial class VisualStudio_InProc2 : InProcComponent2
+    {
+        public VisualStudio_InProc2(JoinableTaskFactory joinableTaskFactory)
+            : base(joinableTaskFactory)
+        {
+        }
+
+        public async Task ActivateMainWindowAsync()
+        {
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+
+            var dte = await GetDTEAsync();
+
+            var activeVisualStudioWindow = (IntPtr)dte.ActiveWindow.HWnd;
+            Debug.WriteLine($"DTE.ActiveWindow.HWnd = {activeVisualStudioWindow}");
+
+            if (activeVisualStudioWindow == IntPtr.Zero)
+            {
+                activeVisualStudioWindow = (IntPtr)dte.MainWindow.HWnd;
+                Debug.WriteLine($"DTE.MainWindow.HWnd = {activeVisualStudioWindow}");
+            }
+
+            IntegrationHelper.SetForegroundWindow(activeVisualStudioWindow);
+        }
+    }
+}

Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/VisualStudio_InProc.cs

@@ -24,7 +24,7 @@ public ScrollingIntegrationTest(ITestOutputHelper testOutputHelper)
         {
             TestOutputHelper = testOutputHelper;
             Editor = new Editor_InProc2(JoinableTaskFactory);
-            SendKeys = new IdeSendKeys();
+            SendKeys = new IdeSendKeys(JoinableTaskFactory);
         }
 
         protected ITestOutputHelper TestOutputHelper