Merge pull request rubberduck-vba#1714 from ThunderFrame/next

Fixes rubberduck-vba#1711 to run module-specific test methods, for each module
retailcoder · Jun 6, 2016 · f39821b · f39821b
2 parents ccd6225 + e24e551
commit f39821b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/RetailCoder.VBE/UnitTesting/TestEngine.cs b/RetailCoder.VBE/UnitTesting/TestEngine.cs
@@ -66,8 +66,11 @@ public void Run(IEnumerable<TestMethod> tests)
                 var testInitialize = module.Key.FindTestInitializeMethods(_state).ToList();
                 var testCleanup = module.Key.FindTestCleanupMethods(_state).ToList();
 
+                var moduleTestMethods = testMethods
+                    .Where(test => test.QualifiedMemberName.QualifiedModuleName.ComponentName == module.Key.ComponentName);
+
                 Run(module.Key.FindModuleInitializeMethods(_state));
-                foreach (var test in testMethods)
+                foreach (var test in moduleTestMethods)
                 {
                     // no need to run setup/teardown for ignored tests
                     if (test.Declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.IgnoreTest))