Add UiDispatcher.Invoke to the test engine.

Update UiContext to provide the GetEntryAssembly method to replace the Assembly.GetEntryAssembly() because the latter can return null and thus is not reliable.

Author: bclothier

Rubberduck.API/API/VBA/ParserState.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
 using Rubberduck.Parsing.PreProcessing;
@@ -57,7 +58,7 @@ public sealed class ParserState : IParserState, IDisposable
 
         public ParserState()
         {
-            UiContextProvider.Initialize();
+            UiContextProvider.Initialize(Assembly.GetExecutingAssembly());
             _dispatcher = new UiDispatcher(UiContextProvider.Instance());
         }
 

Rubberduck.Core/App.cs

@@ -13,9 +13,7 @@
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.UI.Command;
-using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.Utility;
 using Rubberduck.VersionCheck;
 using Application = System.Windows.Forms.Application;
 
@@ -50,8 +48,6 @@ public App(IVBE vbe,
             _checkVersionCommand = checkVersionCommand;
 
             _configService.SettingsChanged += _configService_SettingsChanged;
-            
-            UiContextProvider.Initialize();
         }
 
         private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)

Rubberduck.Core/UnitTesting/TestEngine.cs

@@ -6,6 +6,7 @@
 using NLog;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.UI.UnitTesting;
@@ -21,17 +22,36 @@ public class TestEngine : ITestEngine
         private readonly RubberduckParserState _state;
         private readonly IFakesFactory _fakesFactory;
         private readonly IVBETypeLibsAPI _typeLibApi;
+        private readonly IUiDispatcher _uiDispatcher;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public TestEngine(TestExplorerModel model, IVBE vbe, RubberduckParserState state, IFakesFactory fakesFactory, IVBETypeLibsAPI typeLibApi)
+        private bool _testRequested;
+        private IEnumerable<TestMethod> _tests;
+
+        public TestEngine(TestExplorerModel model, IVBE vbe, RubberduckParserState state, IFakesFactory fakesFactory, IVBETypeLibsAPI typeLibApi, IUiDispatcher uiDispatcher)
         {
             Debug.WriteLine("TestEngine created.");
             Model = model;
             _vbe = vbe;
             _state = state;
             _fakesFactory = fakesFactory;
             _typeLibApi = typeLibApi;
+            _uiDispatcher = uiDispatcher;
+
+            _state.StateChanged += StateChangedHandler;
+        }
+
+        private void StateChangedHandler(object sender, ParserStateEventArgs e)
+        {
+            if (_testRequested && (e.State == ParserState.Ready))
+            {
+                _testRequested = false;
+                _uiDispatcher.InvokeAsync(() =>
+                {
+                    RunInternal(_tests);
+                });
+            }
         }
 
         public TestExplorerModel Model { get; }
@@ -51,11 +71,18 @@ public void Refresh()
 
         public void Run()
         {
+            _testRequested = true;
+            _tests = Model.LastRun;
+            // We will run the tests once parsing has completed
             Refresh();
-            Run(Model.LastRun);
         }
 
         public void Run(IEnumerable<TestMethod> tests)
+        {
+            _uiDispatcher.InvokeAsync(() => RunInternal(tests));
+        }
+
+        private void RunInternal(IEnumerable<TestMethod> tests)
         {
             var testMethods = tests as IList<TestMethod> ?? tests.ToList();
             if (!testMethods.Any())

Rubberduck.Core/UnitTesting/TestMethod.cs

@@ -8,7 +8,6 @@
 using Rubberduck.UI;
 using Rubberduck.UI.Controls;
 using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.Application;
 using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 

Rubberduck.Main/Extension.cs

@@ -19,6 +19,7 @@
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 using Windows = Rubberduck.VBEditor.SafeComWrappers.VBA.Windows;
 
 namespace Rubberduck
@@ -219,7 +220,9 @@ private void Startup()
                 currentDomain.AssemblyResolve += LoadFromSameFolder;
 
                 _container = new WindsorContainer().Install(new RubberduckIoCInstaller(_ide, _addin, _initialSettings));
-                
+
+                UiContextProvider.Initialize(Assembly.GetExecutingAssembly());
+
                 _app = _container.Resolve<App>();
                 _app.Startup();
 

Rubberduck.VBEEditor/Utility/UiContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,6 +10,7 @@ public interface IUiContextProvider
         bool IsExecutingInUiContext();
         SynchronizationContext UiContext { get; }
         TaskScheduler UiTaskScheduler { get; }
+        Assembly GetEntryAssembly { get; }
     }
 
     public class UiContextProvider : IUiContextProvider
@@ -17,10 +19,11 @@ public class UiContextProvider : IUiContextProvider
         private static TaskScheduler TaskScheduler { get; set; }
         private static readonly UiContextProvider UiContextInstance = new UiContextProvider();
         private static readonly object Lock = new object();
+        private static Assembly _entryAssembly;
 
         private UiContextProvider() { }
 
-        public static void Initialize()
+        public static void Initialize(Assembly entryAssembly)
         {
             lock (Lock)
             {
@@ -31,13 +34,15 @@ public static void Initialize()
 
                 Context = SynchronizationContext.Current;
                 TaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+                _entryAssembly = entryAssembly;
             }
         }
 
         public static UiContextProvider Instance() => UiContextInstance;
 
         public SynchronizationContext UiContext => Context;
         public TaskScheduler UiTaskScheduler => TaskScheduler;
+        public Assembly GetEntryAssembly => _entryAssembly;
 
         public bool IsExecutingInUiContext()
         {