Unit test tweaks (#1533)

* Disable commands when the parser state isn't ready.

* No reparse between adding a module and the default stub.

* Disable Add Test Method commands if the selected component is not a test module.

* Close #1102

Author: Hosch250

RetailCoder.VBE/UI/Command/AddTestMethodCommand.cs

@@ -1,5 +1,9 @@
+using System.Linq;
 using System.Runtime.InteropServices;
-using Rubberduck.UI.UnitTesting;
+using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.Annotations;
+using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA;
 using Rubberduck.UnitTesting;
 
 namespace Rubberduck.UI.Command
@@ -10,11 +14,26 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class AddTestMethodCommand : CommandBase
     {
+        private readonly VBE _vbe;
         private readonly NewTestMethodCommand _command;
+        private readonly RubberduckParserState _state;
 
-        public AddTestMethodCommand(NewTestMethodCommand command)
+        public AddTestMethodCommand(VBE vbe, RubberduckParserState state, NewTestMethodCommand command)
         {
+            _vbe = vbe;
             _command = command;
+            _state = state;
+        }
+
+        public override bool CanExecute(object parameter)
+        {
+            if (_state.Status != ParserState.Ready) { return false; }
+
+            var testModules = _state.AllUserDeclarations.Where(d =>
+                        d.DeclarationType == DeclarationType.ProceduralModule &&
+                        d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
+
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
         }
 
         public override void Execute(object parameter)

RetailCoder.VBE/UI/Command/AddTestMethodExpectedErrorCommand.cs

@@ -1,4 +1,9 @@
+using System.Linq;
 using System.Runtime.InteropServices;
+using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.Annotations;
+using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA;
 using Rubberduck.UnitTesting;
 
 namespace Rubberduck.UI.Command
@@ -9,11 +14,26 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class AddTestMethodExpectedErrorCommand : CommandBase
     {
+        private readonly VBE _vbe;
         private readonly NewTestMethodCommand _command;
+        private readonly RubberduckParserState _state;
 
-        public AddTestMethodExpectedErrorCommand(NewTestMethodCommand command)
+        public AddTestMethodExpectedErrorCommand(VBE vbe, RubberduckParserState state, NewTestMethodCommand command)
         {
+            _vbe = vbe;
             _command = command;
+            _state = state;
+        }
+
+        public override bool CanExecute(object parameter)
+        {
+            if (_state.Status != ParserState.Ready) { return false; }
+
+            var testModules = _state.AllUserDeclarations.Where(d =>
+                        d.DeclarationType == DeclarationType.ProceduralModule &&
+                        d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
+
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
         }
 
         public override void Execute(object parameter)

RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs

@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.VBA;
 using Rubberduck.UnitTesting;
 using Rubberduck.VBEditor.Extensions;
 
@@ -12,26 +13,26 @@ namespace Rubberduck.UI.Command
     public class AddTestModuleCommand : CommandBase
     {
         private readonly VBE _vbe;
+        private readonly RubberduckParserState _state;
         private readonly NewUnitTestModuleCommand _command;
 
-        public AddTestModuleCommand(VBE vbe, NewUnitTestModuleCommand command)
+        public AddTestModuleCommand(VBE vbe, RubberduckParserState state, NewUnitTestModuleCommand command)
         {
             _vbe = vbe;
+            _state = state;
             _command = command;
         }
 
         public override bool CanExecute(object parameter)
         {
             var app = _vbe.HostApplication();
-            if (app == null)
+            if (app == null || _state.Status != ParserState.Ready)
             {
                 return false;
             }
-            else
-            {
-                // Outlook requires test methods to be located in [ThisOutlookSession] class.
-                return app.ApplicationName != "Outlook";
-            }
+            
+            // Outlook requires test methods to be located in [ThisOutlookSession] class.
+            return app.ApplicationName != "Outlook";
         }
 
         public override void Execute(object parameter)

RetailCoder.VBE/UI/Command/RunAllTestsCommand.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Diagnostics;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.UnitTesting;
 using Rubberduck.UnitTesting;
@@ -12,8 +14,8 @@ public class RunAllTestsCommand : CommandBase
         private readonly ITestEngine _engine;
         private readonly TestExplorerModel _model;
         private readonly RubberduckParserState _state;
-
-        public RunAllTestsCommand(ITestEngine engine, TestExplorerModel model, RubberduckParserState state)
+        
+        public RunAllTestsCommand(RubberduckParserState state, ITestEngine engine, TestExplorerModel model)
         {
             _engine = engine;
             _model = model;
@@ -31,11 +33,39 @@ private void StateChanged(object sender, ParserStateEventArgs e)
         {
             if (e.State != ParserState.Ready) { return; }
 
+            var stopwatch = new Stopwatch();
+
             _model.ClearLastRun();
             _model.IsBusy = true;
+
+            stopwatch.Start();
             _engine.Run(_model.Tests);
+            stopwatch.Stop();
+            
             _model.IsBusy = false;
             _state.StateChanged -= StateChanged;
+
+            OnRunCompleted(new TestRunEventArgs(stopwatch.ElapsedMilliseconds));
+        }
+
+        public event EventHandler<TestRunEventArgs> RunCompleted;
+        protected virtual void OnRunCompleted(TestRunEventArgs e)
+        {
+            var handler = RunCompleted;
+            if (handler != null)
+            {
+                handler.Invoke(this, e);
+            }
+        }
+    }
+    
+    public struct TestRunEventArgs
+    {
+        public long Duration { get; private set; }
+
+        public TestRunEventArgs(long duration)
+        {
+            Duration = duration;
         }
     }
 }

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1584,4 +1584,7 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="TestOutcome_Ignored" xml:space="preserve">
     <value>Ignored</value>
   </data>
+  <data name="UnitTest_TotalDuration" xml:space="preserve">
+    <value>Total Duration</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -2,9 +2,9 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Media;
-using System.Windows.Threading;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UnitTesting;
 
 namespace Rubberduck.UI.UnitTesting
@@ -13,15 +13,12 @@ public class TestExplorerModel : ViewModelBase
     {
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
-        private readonly Dispatcher _uiDispatcher;
 
         public TestExplorerModel(VBE vbe, RubberduckParserState state)
         {
             _vbe = vbe;
             _state = state;
             _state.StateChanged += State_StateChanged;
-
-            _uiDispatcher = Dispatcher.CurrentDispatcher;
         }
 
         private void State_StateChanged(object sender, ParserStateEventArgs e)
@@ -30,9 +27,6 @@ private void State_StateChanged(object sender, ParserStateEventArgs e)
 
             var tests = UnitTestHelpers.GetAllTests(_vbe, _state).ToList();
 
-            UpdateTestList addTest = AddTest;
-            UpdateTestList removeTest = RemoveTest;
-
             var removedTests = Tests.Where(test =>
                          !tests.Any(t =>
                                  t.Declaration.ComponentName == test.Declaration.ComponentName &&
@@ -42,7 +36,7 @@ private void State_StateChanged(object sender, ParserStateEventArgs e)
             // remove old tests
             foreach (var test in removedTests)
             {
-                _uiDispatcher.Invoke(removeTest, test);
+                UiDispatcher.Invoke(() => { Tests.Remove(test); });
             }
 
             // update declarations for existing tests--declarations are immutable
@@ -64,23 +58,11 @@ private void State_StateChanged(object sender, ParserStateEventArgs e)
                     t.Declaration.IdentifierName == test.Declaration.IdentifierName &&
                     t.Declaration.ProjectId == test.Declaration.ProjectId))
                 {
-                    _uiDispatcher.Invoke(addTest, test);
+                    UiDispatcher.Invoke(() => { Tests.Add(test); });
                 }
             }
         }
 
-        private delegate void UpdateTestList(TestMethod test);
-
-        private void AddTest(TestMethod test)
-        {
-            Tests.Add(test);
-        }
-
-        private void RemoveTest(TestMethod test)
-        {
-            Tests.Remove(test);
-        }
-
         private readonly ObservableCollection<TestMethod> _tests = new ObservableCollection<TestMethod>();
         public ObservableCollection<TestMethod> Tests { get { return _tests; } }