Merge pull request #1139 from TestCentric/FixRunSelectedTests

Fix crash when 'run selected tests' but no tests are selected
TestCentric · Oct 16, 2024 · 23c860c · 23c860c
2 parents 03b79d6 + 7ef7135
commit 23c860c
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 4 deletions.
diff --git a/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs b/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs
@@ -231,6 +231,8 @@ void OnRunFinished(ResultNode result)
                 }
             };
 
+            _model.Events.SelectedTestsChanged += (e) => UpdateViewCommands();
+
             _settings.Changed += (s, e) =>
             {
                 switch (e.SettingName)
@@ -754,10 +756,11 @@ private void UpdateViewCommands(bool testLoading = false)
             bool hasFailures = _model.HasResults && _model.ResultSummary.FailedCount > 0;
 
             _view.RunAllButton.Enabled =
-            _view.RunSelectedButton.Enabled =
             _view.DisplayFormatButton.Enabled =
             _view.RunParametersButton.Enabled = testLoaded && !testRunning;
 
+            _view.RunSelectedButton.Enabled = testLoaded && !testRunning && _model.SelectedTests != null && _model.SelectedTests.Any();
+
             _view.RerunButton.Enabled = testLoaded && !testRunning && hasResults;
 
             _view.RunFailedButton.Enabled = testLoaded && !testRunning && hasFailures;

diff --git a/src/TestCentric/tests/Presenters/Main/CommandTests.cs b/src/TestCentric/tests/Presenters/Main/CommandTests.cs
@@ -250,9 +250,10 @@ public void RunAllButton_RunsAllTests()
         [Test]
         public void RunButton_RunsSelectedTests()
         {
-            // TODO: Specify Results and test with specific argument
+            var testSelection = new TestSelection();
+            _model.SelectedTests = testSelection;
             _view.RunSelectedButton.Execute += Raise.Event<CommandHandler>();
-            _model.Received().RunTests(Arg.Any<TestSelection>());
+            _model.Received().RunTests(testSelection);
         }
 
         [Test]
@@ -309,5 +310,44 @@ public void ForceStopButton_ForcesTestsToStop()
             _view.ForceStopButton.Execute += Raise.Event<CommandHandler>();
             _model.Received().StopTestRun(true);
         }
+
+        [Test]
+        public void RunSelectedTestCommand_NoTestsSelected_IsDisabled()
+        {
+            // Arrange
+            _model.HasTests.Returns(true);
+            _model.SelectedTests = null;
+
+            // Act + Assert
+            Assert.That(_view.RunSelectedButton.Enabled, Is.False);
+        }
+
+        [Test]
+        public void SelectedTestsChanged_NoTestSelected_CommandIsDisabled()
+        {
+            // Arrange
+            _model.HasTests.Returns(true);
+            _model.SelectedTests.Returns(new TestSelection());
+
+            // Act
+            _model.Events.SelectedTestsChanged += Raise.Event<TestSelectionEventHandler>(new TestSelectionEventArgs(null));
+
+            // Assert
+            Assert.That(_view.RunSelectedButton.Enabled, Is.False);
+        }
+
+        [Test]
+        public void SelectedTestsChanged_TestSelected_CommandIsEnabled()
+        {
+            // Arrange
+            _model.HasTests.Returns(true);
+            _model.SelectedTests.Returns(new TestSelection(new[] { new TestNode("<test-case id='1' />") }));
+
+            // Act
+            _model.Events.SelectedTestsChanged += Raise.Event<TestSelectionEventHandler>(new TestSelectionEventArgs(null));
+
+            // Assert
+            Assert.That(_view.RunSelectedButton.Enabled, Is.True);
+        }
     }
 }
diff --git a/src/TestCentric/tests/Presenters/Main/WhenTestRunCompletes.cs b/src/TestCentric/tests/Presenters/Main/WhenTestRunCompletes.cs
@@ -21,6 +21,7 @@ public void SimulateTestRunFinish()
             _model.HasResults.Returns(true);
             _model.ResultSummary.Returns(new ResultSummary() { FailureCount = 1 });
             _model.IsTestRunning.Returns(false);
+            _model.SelectedTests.Returns(new TestSelection(new[] { new TestNode("<test-case id='1' />") }));
 
             var resultNode = new ResultNode("<test-run id='XXX' result='Failed' />");
             FireRunFinishedEvent(resultNode);

diff --git a/src/TestCentric/tests/Presenters/Main/WhenTestsAreLoaded.cs b/src/TestCentric/tests/Presenters/Main/WhenTestsAreLoaded.cs
@@ -22,6 +22,7 @@ public void SimulateTestLoad()
 
             TestNode testNode = new TestNode("<test-suite id='1'/>");
             _model.LoadedTests.Returns(testNode);
+            _model.SelectedTests.Returns(new TestSelection(new[] { testNode }));
 
             var project = new TestCentricProject(_model, "dummy.dll");
             _model.TestCentricProject.Returns(project);

diff --git a/src/TestCentric/tests/Presenters/Main/WhenTestsAreReloaded.cs b/src/TestCentric/tests/Presenters/Main/WhenTestsAreReloaded.cs
@@ -22,6 +22,7 @@ public void SimulateTestReload()
 
             TestNode testNode = new TestNode("<test-suite id='1'/>");
             _model.LoadedTests.Returns(testNode);
+            _model.SelectedTests.Returns(new TestSelection(new[] { testNode }));
 
             FireTestReloadedEvent(testNode);
         }

diff --git a/src/TestModel/model/ITestEvents.cs b/src/TestModel/model/ITestEvents.cs
@@ -13,6 +13,7 @@ namespace TestCentric.Gui.Model
     public delegate void TestNodeEventHandler(TestNodeEventArgs args);
     public delegate void TestResultEventHandler(TestResultEventArgs args);
     public delegate void TestItemEventHandler(TestItemEventArgs args);
+    public delegate void TestSelectionEventHandler(TestSelectionEventArgs args);
     public delegate void TestOutputEventHandler(TestOutputEventArgs args);
     public delegate void UnhandledExceptionEventHandler(UnhandledExceptionEventArgs args);
     public delegate void TestFilesLoadingEventHandler(TestFilesLoadingEventArgs args);
@@ -57,6 +58,7 @@ public interface ITestEvents
         // Event used to broadcast a change in the selected
         // item, so that all presenters may be notified.
         event TestItemEventHandler SelectedItemChanged;
+        event TestSelectionEventHandler SelectedTestsChanged;
 
         event TestEventHandler CategorySelectionChanged;
     }

diff --git a/src/TestModel/model/TestEventArgs.cs b/src/TestModel/model/TestEventArgs.cs
@@ -61,6 +61,16 @@ public TestItemEventArgs(ITestItem testItem)
         public ITestItem TestItem { get; private set; }
     }
 
+    public class TestSelectionEventArgs : TestEventArgs
+    {
+        public TestSelectionEventArgs(TestSelection testSelection)
+        {
+            TestSelection = testSelection;
+        }
+
+        public TestSelection TestSelection { get; private set; }
+    }
+
     public class TestOutputEventArgs : TestEventArgs
     {
         public TestOutputEventArgs(string testName, string stream, string text)

diff --git a/src/TestModel/model/TestEventDispatcher.cs b/src/TestModel/model/TestEventDispatcher.cs
@@ -114,6 +114,11 @@ public void FireActiveItemChanged(ITestItem testItem)
             SelectedItemChanged?.Invoke(new TestItemEventArgs(testItem));
         }
 
+        public void FireSelectedTestsChanged(TestSelection testSelection)
+        {
+            SelectedTestsChanged?.Invoke(new TestSelectionEventArgs(testSelection));
+        }
+
         public void FireCategorySelectionChanged()
         {
             CategorySelectionChanged?.Invoke(new TestEventArgs());
@@ -156,6 +161,7 @@ public void FireCategorySelectionChanged()
 
         // Test Selection Event
         public event TestItemEventHandler SelectedItemChanged;
+        public event TestSelectionEventHandler SelectedTestsChanged;
 
         public event TestEventHandler CategorySelectionChanged;
 

diff --git a/src/TestModel/model/TestModel.cs b/src/TestModel/model/TestModel.cs
@@ -194,7 +194,12 @@ public ITestItem ActiveTestItem
         /// <summary>
         ///  Gets or sets the list of selected tests.
         /// </summary>
-        public TestSelection SelectedTests { get; set; }
+        public TestSelection SelectedTests 
+        { 
+            get {  return _selectedTests; }
+            set { _selectedTests = value; _events?.FireSelectedTestsChanged(_selectedTests); }
+        }
+        private TestSelection _selectedTests;
 
         public List<string> SelectedCategories { get; private set; }