Merge pull request #1805 from ThunderFrame/next

Various fixes to allow Unit Tests in multiple projects to run

Author: retailcoder

RetailCoder.VBE/UnitTesting/TestEngine.cs

@@ -67,7 +67,8 @@ public void Run(IEnumerable<TestMethod> tests)
                 var testCleanup = module.Key.FindTestCleanupMethods(_state).ToList();
 
                 var moduleTestMethods = testMethods
-                    .Where(test => test.QualifiedMemberName.QualifiedModuleName.ComponentName == module.Key.ComponentName);
+                    .Where(test => test.QualifiedMemberName.QualifiedModuleName.ProjectId == module.Key.ProjectId
+                                && test.QualifiedMemberName.QualifiedModuleName.ComponentName == module.Key.ComponentName);
 
                 Run(module.Key.FindModuleInitializeMethods(_state));
                 foreach (var test in moduleTestMethods)

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -12,17 +12,6 @@ public struct QualifiedModuleName
     {
         private static string GetDisplayName(VBProject project)
         {
-            //Try reading the filename first
-            try
-            {
-                if (!string.IsNullOrEmpty(Path.GetDirectoryName(project.BuildFileName)))
-                {
-                    return Path.GetFileName(project.FileName);
-                }
-            }
-            catch
-            {  //The GetFileName getter probably threw
-            }
 
             if (project.Protection == vbext_ProjectProtection.vbext_pp_none)
             {
@@ -77,6 +66,19 @@ private static string GetDisplayName(VBProject project)
                     //The Properties collection either wasn't available, or didn't have the expected properties
                 }
             }
+
+            //Try reading the filename
+            try
+            {
+                if (!string.IsNullOrEmpty(Path.GetDirectoryName(project.BuildFileName)))
+                {
+                    return Path.GetFileName(project.FileName);
+                }
+            }
+            catch
+            {  //The GetFileName getter probably threw
+            }
+
             return null;
         }
 

Rubberduck.VBEEditor/VBEHost/ExcelApp.cs

@@ -9,7 +9,14 @@ public ExcelApp(VBE vbe) : base(vbe, "Excel") { }
 
         public override void Run(QualifiedMemberName qualifiedMemberName)
         {
-            Application.Run(qualifiedMemberName.ToString());
+            string call = GenerateMethodCall(qualifiedMemberName);
+            Application.Run(call);
+        }
+
+       protected virtual string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
+        {
+            var documentName = qualifiedMemberName.QualifiedModuleName.ProjectDisplayName;
+            return string.Concat(documentName, "!", qualifiedMemberName.ToString());
         }
     }
 }

Rubberduck.VBEEditor/VBEHost/WordApp.cs

@@ -1,4 +1,6 @@
 using Microsoft.Vbe.Interop;
+using Microsoft.Office.Interop.Word;
+using System.Linq;
 
 namespace Rubberduck.VBEditor.VBEHost
 {
@@ -10,13 +12,35 @@ public WordApp(VBE vbe) : base(vbe, "Word") { }
         public override void Run(QualifiedMemberName qualifiedMemberName)
         {
             var call = GenerateMethodCall(qualifiedMemberName);
-            Application.Run(call);
+
+            ActivateProjectDocument(qualifiedMemberName);
+            //Prevent TE hanging should Application.Run fail
+            try
+            {
+                Application.Run(call);
+            }
+            //TODO - Let TestEngine know that the method failed
+            catch { };
         }
 
         protected virtual string GenerateMethodCall(QualifiedMemberName qualifiedMemberName)
         {
             var moduleName = qualifiedMemberName.QualifiedModuleName.Component.Name;
             return string.Concat(moduleName, ".", qualifiedMemberName.MemberName);
         }
+
+        protected virtual void ActivateProjectDocument(QualifiedMemberName qualifiedMemberName)
+        {
+            // Word requires that the document be active for Application.Run to find the target Method in scope.
+            // Check the project's document or a document referring to a project's template is active.
+            var activeDoc = Application.ActiveDocument;
+            var template = activeDoc.get_AttachedTemplate();
+            var targetDoc = Application.Documents.Cast<Document>()
+                    .FirstOrDefault(doc => doc.Name == qualifiedMemberName.QualifiedModuleName.ProjectDisplayName
+                                        || doc.get_AttachedTemplate().Name == qualifiedMemberName.QualifiedModuleName.ProjectDisplayName);
+            if (activeDoc != targetDoc) { 
+                targetDoc.Activate();
+            }
+        }
     }
 }