Merge pull request #3778 from bclothier/ImplementRunMethod

Unit testing should now work in every single VBA host application!

Author: retailcoder

RetailCoder.VBE/UnitTesting/TestEngine.cs

@@ -10,6 +10,8 @@
 using Rubberduck.UI;
 using Rubberduck.UI.UnitTesting;
 using Rubberduck.VBEditor.Application;
+using Rubberduck.VBEditor.ComManagement.TypeLibs;
+using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UnitTesting
@@ -20,8 +22,6 @@ public class TestEngine : ITestEngine
         private readonly RubberduckParserState _state;
         private readonly IFakesProviderFactory _fakesFactory;
 
-        // can't be assigned from constructor because ActiveVBProject is null at startup:
-        private IHostApplication _hostApplication;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public TestEngine(TestExplorerModel model, IVBE vbe, RubberduckParserState state, IFakesProviderFactory fakesFactory)
@@ -118,20 +118,17 @@ public void Run(IEnumerable<TestMethod> tests)
 
         private void Run(IEnumerable<Declaration> members)
         {
-            if (_hostApplication == null)
+            var groupedMembers = members.GroupBy(m=> m.ProjectName);
+            foreach (var group in groupedMembers)
             {
-                _hostApplication = _vbe.HostApplication();
-            }
-            
-            foreach (var member in members)
-            {
-                try
-                {
-                    _hostApplication.Run(member);
-                }
-                catch (COMException ex)
+                using (var project = _vbe.VBProjects[group.Key])
+                using (var typeLib = TypeLibWrapper.FromVBProject(project))
                 {
-                    Logger.Error(ex, "Unexpected COM exception while running tests.", member?.QualifiedName);
+                    foreach (var member in group)
+                    {
+                        VBETypeLibsAPI.ExecuteCode(typeLib, member.QualifiedModuleName.ComponentName,
+                            member.QualifiedName.MemberName);
+                    }
                 }
             }
         }

RetailCoder.VBE/UnitTesting/TestMethod.cs

@@ -9,6 +9,7 @@
 using Rubberduck.UI.Controls;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Application;
+using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UnitTesting
@@ -17,12 +18,12 @@ namespace Rubberduck.UnitTesting
     public class TestMethod : ViewModelBase, IEquatable<TestMethod>, INavigateSource
     {
         private readonly ICollection<AssertCompletedEventArgs> _assertResults = new List<AssertCompletedEventArgs>();
-        private readonly IHostApplication _hostApp;
+        private readonly IVBE _vbe;
 
         public TestMethod(Declaration declaration, IVBE vbe)
         {
             _declaration = declaration;
-            _hostApp = vbe.HostApplication();
+            _vbe = vbe;
         }
 
         private Declaration _declaration;
@@ -44,7 +45,8 @@ public void Run()
             try
             {
                 AssertHandler.OnAssertCompleted += HandleAssertCompleted;
-                _hostApp.Run(Declaration);
+                VBETypeLibsAPI.ExecuteCode(_vbe, Declaration.ProjectName, Declaration.QualifiedModuleName.ComponentName,
+                    Declaration.QualifiedName.MemberName);
                 AssertHandler.OnAssertCompleted -= HandleAssertCompleted;
 
                 result = EvaluateResults();

Rubberduck.Parsing/Emitter.cs

@@ -149,7 +149,6 @@
     <Compile Include="ComReflection\ComStruct.cs" />
     <Compile Include="ComReflection\ComType.cs" />
     <Compile Include="ComReflection\ComVariant.cs" />
-    <Compile Include="Emitter.cs" />
     <Compile Include="Grammar\Annotations.cs" />
     <Compile Include="Grammar\PartialExtensions\IIdentifierContext.cs" />
     <Compile Include="Grammar\PartialExtensions\IAnnotatedContext.cs" />

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -8,7 +8,6 @@
 using System.Diagnostics;
 using NLog;
 using Rubberduck.VBEditor.SafeComWrappers;
-using System.Runtime.InteropServices;
 
 namespace Rubberduck.Parsing.VBA
 {
@@ -145,6 +144,8 @@ private Declaration SupertypeForDocument(QualifiedModuleName module, RubberduckP
             }
 
             Declaration superType = null;
+            // TODO: Replace with TypeLibAPI call, require a solution regarding thread synchronization or caching
+            /*
             using (var properties = component.Properties)
             {
                 int documentPropertyCount = 0;
@@ -194,6 +195,7 @@ private Declaration SupertypeForDocument(QualifiedModuleName module, RubberduckP
                     }
                 }
             }
+            */
 
             return superType;
         }

Rubberduck.Parsing/VBA/ReferenceResolveRunnerBase.cs

@@ -9,6 +9,7 @@ public interface IHostApplication : IDisposable
         /// This should ONLY be passed a Declaration object.
         /// </summary>
         /// <param name="declaration">The Declaration object for the method to be executed.</param>
+        [Obsolete("Use ExecuteCode in TypeLibAPI instead", true)]
         void Run(dynamic declaration);
 
         /// <summary>
@@ -20,6 +21,7 @@ public interface IHostApplication : IDisposable
         /// <remarks>
         /// May not be available in all host applications.
         /// </remarks>
+        [Obsolete("Use ExecuteCode in TypeLibAPI instead", true)]
         object Run(string name, params object[] args);
 
         /// <summary>