Merge pull request #4277 from rkapka/rkapka-master

Test Explorer fixes

Author: retailcoder

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

@@ -484,7 +484,7 @@
         <Border Grid.Row="0" Grid.RowSpan="3" Background="#FFEEF5FD" />
 
         <ToolBarTray Grid.Row="0" IsLocked="True">
-            <ToolBar IsEnabled="{Binding Model.IsReady}" Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
+            <ToolBar Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
                 <ToolBar.Resources>
                     <Style TargetType="Image">
                         <Setter Property="Height" Value="16" />

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Threading;
-using System.Windows.Input;
 
 namespace Rubberduck.UI.UnitTesting
 {
@@ -37,9 +35,17 @@ private void OnTestCompleted(object sender, EventArgs eventArgs)
         {
             _dispatcher.Invoke(() =>
             {
-                if (FindResource("ResultsByOutcome") is CollectionViewSource resource)
+                if (FindResource("ResultsByOutcome") is CollectionViewSource outcome)
                 {
-                    resource.View.Refresh();
+                    outcome.View.Refresh();
+                }
+                if (FindResource("ResultsByModule") is CollectionViewSource module)
+                {
+                    module.View.Refresh();
+                }
+                if (FindResource("ResultsByCategory") is CollectionViewSource category)
+                {
+                    category.View.Refresh();
                 }
             });
         }

Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

@@ -34,7 +34,8 @@ public TestExplorerViewModel(IVBE vbe,
              IClipboardWriter clipboard,
              IGeneralConfigService configService,
              ISettingsFormFactory settingsFormFactory,
-             IMessageBox messageBox)
+             IMessageBox messageBox,
+             ReparseCommand reparseCommand)
         {
             _vbe = vbe;
             _state = state;
@@ -54,7 +55,7 @@ public TestExplorerViewModel(IVBE vbe,
             AddTestMethodCommand = new AddTestMethodCommand(vbe, state);
             AddErrorTestMethodCommand = new AddTestMethodExpectedErrorCommand(vbe, state);
 
-            RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, CanExecuteRefreshCommand);
+            RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, o => !Model.IsBusy && reparseCommand.CanExecute(o));
             RepeatLastRunCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRepeatLastRunCommand, CanExecuteRepeatLastRunCommand);
             RunNotExecutedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunNotExecutedTestsCommand, CanExecuteRunNotExecutedTestsCommand);
             RunInconclusiveTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunInconclusiveTestsCommand, CanExecuteRunInconclusiveTestsCommand);
@@ -262,11 +263,6 @@ private void ExecuteRefreshCommand(object parameter)
             SelectedTest = null;
         }
 
-        private bool CanExecuteRefreshCommand(object parameter)
-        {
-            return !Model.IsBusy && _state.IsDirty();
-        }
-
         private void EnsureRubberduckIsReferencedForEarlyBoundTests()
         {
             var projectIdsOfMembersUsingAddInLibrary = _state.DeclarationFinder.AllUserDeclarations

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using Castle.Facilities.TypedFactory;
@@ -149,7 +148,10 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
 
             RegisterWindowsHooks(container);
 
-            RegisterHotkeyFactory(container);
+            container.Register(Component.For<HotkeyFactory>()
+                .LifestyleSingleton());
+            container.Register(Component.For<ITestEngine>().ImplementedBy<TestEngine>()
+                .LifestyleSingleton());
 
             var assembliesToRegister = AssembliesToRegister().ToArray();
 
@@ -888,10 +890,5 @@ private void RegisterConstantVbeAndAddIn(IWindsorContainer container)
             container.Register(Component.For<IVBEEvents>().Instance(VBEEvents.Initialize(_vbe)).LifestyleSingleton());
             container.Register(Component.For<ITempSourceFileHandler>().Instance(_vbe.TempSourceFileHandler));
         }
-
-        private void RegisterHotkeyFactory(IWindsorContainer container)
-        {
-            container.Register(Component.For<HotkeyFactory>().LifestyleSingleton());
-        }
     }
 }