Conflict merge part 2, fixed hacked up resx from manual web merge.

rubberduck-vba · Mar 19, 2017 · fb4a835 · fb4a835
1 parent 53f65a2
commit fb4a835
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -2052,6 +2052,7 @@ Would you like to import them to Rubberduck?</value>
   <data name="Assert_VerifyParameterNotPassed" xml:space="preserve">
     <value>Parameter {0} was not passed on invocation {1}. {2}</value>
     <comment>{0} = parameter name, {1} = invocation under test, {2} = optional user supplied message (always last)</comment>
+  </data>
   <data name="Preview" xml:space="preserve">
     <value>Preview</value>
   </data>

diff --git a/RetailCoder.VBE/UnitTesting/TestEngine.cs b/RetailCoder.VBE/UnitTesting/TestEngine.cs
@@ -59,7 +59,7 @@ public void Run()
         }
 
         public void Run(IEnumerable<TestMethod> tests)
-        {         
+        {
             var testMethods = tests as IList<TestMethod> ?? tests.ToList();
             if (!testMethods.Any())
             {
@@ -76,7 +76,7 @@ public void Run(IEnumerable<TestMethod> tests)
                 var moduleTestMethods = testMethods
                     .Where(test => test.Declaration.QualifiedName.QualifiedModuleName.ProjectId == capturedModule.Key.ProjectId
                                 && test.Declaration.QualifiedName.QualifiedModuleName.ComponentName == capturedModule.Key.ComponentName);
-                
+
                 Run(module.Key.FindModuleInitializeMethods(_state));
                 foreach (var test in moduleTestMethods)
                 {
@@ -109,7 +109,7 @@ public void Run(IEnumerable<TestMethod> tests)
                     OnTestCompleted();
                     _model.AddExecutedTest(test);
                 }
-                Run(module.Key.FindModuleCleanupMethods(_state));                
+                Run(module.Key.FindModuleCleanupMethods(_state));
             }
         }
 
@@ -135,7 +135,7 @@ private void Run(IEnumerable<Declaration> members)
                 finally
                 {
                     fakes.StopTest();
-                }     
+                }
             }
         }
     }