Improved status handling

simasch · simasch · commit bd91e3fea9a5 · 2020-12-30T13:23:44.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/TestRunnerWindow.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using utPLSQL;
 
 namespace utPLSQL
 {
@@ -39,22 +38,24 @@ public TestRunnerWindow(RealTimeTestRunner testRunner)
             gridResults.Columns[3].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
         }
 
-        internal async Task RunTestsAsync(string type, string owner, string name, string procedure, bool coverage)
+        internal void RunTestsAsync(string type, string owner, string name, string procedure, bool coverage)
         {
-            Running = true;
-
             ResetComponents();
 
             testResults.Clear();
 
             setWindowTitle(type, owner, name, procedure);
 
+            Running = true;
+
             if (coverage)
             {
                 var codeCoverateReportDialog = new CodeCoverateReportDialog(getPath(type, owner, name, procedure));
                 DialogResult dialogResult = codeCoverateReportDialog.ShowDialog();
                 if (dialogResult == DialogResult.OK)
                 {
+                    txtStatus.Text = "Running tests with coverage...";
+
                     RunWithCoverage(type, owner, name, procedure, codeCoverateReportDialog);
 
                     Show();
@@ -65,6 +66,8 @@ internal async Task RunTestsAsync(string type, string owner, string name, string
             }
             else
             {
+                txtStatus.Text = "Running tests...";
+
                 RunTests(type, owner, name, procedure);
 
                 Show();
@@ -93,30 +96,35 @@ private void CollectResults(bool coverage)
 
             Task.Factory.StartNew(() => testRunner.ConsumeResult(@event =>
             {
-                gridResults.BeginInvoke((MethodInvoker)delegate ()
+                if (@event.type.Equals("pre-run"))
                 {
-                    if (@event.type.Equals("pre-run"))
+                    gridResults.BeginInvoke((MethodInvoker)delegate ()
                     {
                         totalNumberOfTests = @event.totalNumberOfTests;
 
                         progressBar.Minimum = 0;
                         progressBar.Maximum = totalNumberOfTests * STEPS;
                         progressBar.Step = STEPS;
-
                         CreateTestResults(@event);
 
                         gridResults.Rows[0].Selected = false;
-                    }
-                    else if (@event.type.Equals("post-test"))
+                    });
+                }
+                else if (@event.type.Equals("post-test"))
+                {
+                    gridResults.BeginInvoke((MethodInvoker)delegate ()
                     {
                         completetedTests++;
-                        txtTests.Text = (completetedTests > totalNumberOfTests ? totalNumberOfTests : completetedTests) + "/" + totalNumberOfTests;
 
+                        txtTests.Text = (completetedTests > totalNumberOfTests ? totalNumberOfTests : completetedTests) + "/" + totalNumberOfTests;
                         UpdateProgressBar(completetedTests);
 
                         UpdateTestResult(@event);
-                    }
-                    else if (@event.type.Equals("post-run"))
+                    });
+                }
+                else if (@event.type.Equals("post-run"))
+                {
+                    gridResults.BeginInvoke((MethodInvoker)delegate ()
                     {
                         txtStart.Text = @event.run.startTime.ToString();
                         txtEnd.Text = @event.run.endTime.ToString();
@@ -135,20 +143,18 @@ private void CollectResults(bool coverage)
                         if (!coverage)
                         {
                             txtStatus.Text = "Finished";
+
                             Running = false;
                         }
-                    }
-                });
+                    });
+                }
             }));
         }
 
         private void CollectReport()
         {
             Task.Factory.StartNew(() =>
             {
-                var start = DateTime.Now;
-                txtStatus.Text = "Running with Coverage...";
-
                 string report = testRunner.GetCoverageReport();
 
                 string filePath = $"{Path.GetTempPath()}\\utPLSQL_Coverage_Report_{Guid.NewGuid()}.html";
@@ -157,7 +163,11 @@ private void CollectReport()
                     sw.WriteLine(report);
                 }
 
-                txtStatus.Text = $"Finished in {(DateTime.Now - start)}";
+                txtStatus.BeginInvoke((MethodInvoker)delegate ()
+                {
+                    txtStatus.Text = "Finished";
+                });
+
                 Running = false;
 
                 System.Diagnostics.Process.Start(filePath);
@@ -293,7 +303,7 @@ private void ResetComponents()
             txtErrors.Text = "";
             txtDisabled.Text = "";
             txtStatus.Text = "";
-            txtStatus.Text = "Running...";
+            txtStatus.Text = "";
 
             txtTestOwner.Text = "";
             txtTestPackage.Text = "";
