Allow selecting and running multiple tests. Closes #4701

Author: comintern

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

@@ -270,16 +270,13 @@
                                 <Image Source="{StaticResource RunNotRunTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
-                        <MenuItem Command="{Binding RunSelectedTestCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedTests}" >
+                        <MenuItem Command="{Binding RunSelectedTestsCommand}" 
+                                  CommandParameter="{Binding ElementName=TestGrid, Path=SelectedItems}"
+                                  Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedTests}" >
                             <MenuItem.Icon>
                                 <Image Source="{StaticResource RunSelectedTestImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
-                        <MenuItem Command="{Binding RunSelectedCategoryTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedCategoryTests}" >
-                            <MenuItem.Icon>
-                                <Image Source="{StaticResource RunSelectedCategoryImage}" />
-                            </MenuItem.Icon>
-                        </MenuItem>
                         <MenuItem Command="{Binding RunInconclusiveTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunInconclusiveTests}" >
                             <MenuItem.Icon>
                                 <Image Source="{StaticResource RunInconclusiveTestsImage}" />
@@ -379,8 +376,10 @@
 
         <Border Grid.Row="2" Padding="2">
             <Grid>
-                <controls:GroupingGrid ItemsSource="{Binding Tests}"
+                <controls:GroupingGrid x:Name="TestGrid"
+                                       ItemsSource="{Binding Tests}"
                                        SelectedItem="{Binding SelectedTest}"
+                                       SelectionMode="Extended"
                                        ShowGroupingItemCount="True">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_Outcome}">

Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

@@ -1,13 +1,12 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
-using System.Windows;
 using System.Windows.Data;
 using NLog;
 using Rubberduck.Common;
-using Rubberduck.Interaction;
 using Rubberduck.Interaction.Navigation;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
@@ -16,7 +15,7 @@
 using Rubberduck.UI.UnitTesting.Commands;
 using Rubberduck.UI.UnitTesting.ViewModels;
 using Rubberduck.UnitTesting;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using DataFormats = System.Windows.DataFormats;
 
 namespace Rubberduck.UI.UnitTesting
 {
@@ -30,39 +29,29 @@ internal enum TestExplorerGrouping
 
     internal sealed class TestExplorerViewModel : ViewModelBase, INavigateSelection, IDisposable
     {
-        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly ITestEngine _testEngine;
         private readonly IClipboardWriter _clipboard;
         private readonly ISettingsFormFactory _settingsFormFactory;
-        private readonly IMessageBox _messageBox;
-        private readonly NavigateCommand _navigateCommand;
 
-        public TestExplorerViewModel(IVBE vbe,
-             RubberduckParserState state,
+        public TestExplorerViewModel(RubberduckParserState state,
              ITestEngine testEngine,
              TestExplorerModel model,
              IClipboardWriter clipboard,
              IGeneralConfigService configService,
-             ISettingsFormFactory settingsFormFactory,
-             IMessageBox messageBox,
-             ReparseCommand reparseCommand)
+             ISettingsFormFactory settingsFormFactory)
         {
-            _vbe = vbe;
             _state = state;
             _testEngine = testEngine;
             _testEngine.TestCompleted += TestEngineTestCompleted;
             _clipboard = clipboard;
             _settingsFormFactory = settingsFormFactory;
-            _messageBox = messageBox;
-
-            _navigateCommand = new NavigateCommand(_state.ProjectsProvider);
-            
-            RunSelectedTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestCommand, CanExecuteSelectedTestCommand);
-            RunSelectedCategoryTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunSelectedCategoryTestsCommand, CanExecuteRunSelectedCategoryTestsCommand);
 
+            NavigateCommand = new NavigateCommand(_state.ProjectsProvider);  
+            RunSingleTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSingleTestCommand, CanExecuteSingleTestCommand);
+            RunSelectedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestsCommand, CanExecuteSelectedTestsCommand);
+            RunSelectedGroupCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunSelectedCategoryTestsCommand, CanExecuteRunSelectedCategoryTestsCommand);
             CopyResultsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCopyResultsCommand);
-
             OpenTestSettingsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), OpenSettings);
 
             Model = model;
@@ -134,8 +123,9 @@ public TestExplorerGrouping TestGrouping
         public RunInconclusiveTestsCommand RunInconclusiveTestsCommand { get; set; }
         public RunFailedTestsCommand RunFailedTestsCommand { get; set; }
         public RunSucceededTestsCommand RunPassedTestsCommand { get; set; }
-        public CommandBase RunSelectedTestCommand { get; }
-        public CommandBase RunSelectedCategoryTestsCommand { get; }
+        public CommandBase RunSingleTestCommand { get; }
+        public CommandBase RunSelectedTestsCommand { get; }
+        public CommandBase RunSelectedGroupCommand { get; }
 
         public AddTestModuleCommand AddTestModuleCommand { get; set; }
         public AddTestMethodCommand AddTestMethodCommand { get; set; }
@@ -145,7 +135,7 @@ public TestExplorerGrouping TestGrouping
 
         public CommandBase OpenTestSettingsCommand { get; }
 
-        public INavigateCommand NavigateCommand => _navigateCommand;
+        public INavigateCommand NavigateCommand { get; }
 
         private void OpenSettings(object param)
         {
@@ -160,12 +150,17 @@ private void OpenSettings(object param)
 
         public ICollectionView Tests { get; }
 
-        private bool CanExecuteSelectedTestCommand(object obj)
+        private bool CanExecuteSingleTestCommand(object obj)
         {
             return !Model.IsBusy && SelectedItem != null;
         }
 
-        private void ExecuteSelectedTestCommand(object obj)
+        private bool CanExecuteSelectedTestsCommand(object obj)
+        {
+            return !Model.IsBusy && obj is IList viewModels && viewModels.Count > 0;
+        }
+
+        private void ExecuteSingleTestCommand(object obj)
         {
             if (SelectedTest == null)
             {
@@ -177,6 +172,25 @@ private void ExecuteSelectedTestCommand(object obj)
             Model.IsBusy = false;
         }
 
+        private void ExecuteSelectedTestsCommand(object obj)
+        {
+            if (Model.IsBusy || !(obj is IList viewModels && viewModels.Count > 0))
+            {
+                return;
+            }
+
+            var models = viewModels.OfType<TestMethodViewModel>().Select(model => model.Method).ToArray();
+
+            if (!models.Any())
+            {
+                return;
+            }
+
+            Model.IsBusy = true;
+            _testEngine.Run(models);
+            Model.IsBusy = false;
+        }
+
         private void ExecuteCopyResultsCommand(object parameter)
         {
             const string XML_SPREADSHEET_DATA_FORMAT = "XML Spreadsheet";