Added constants for status. Switch tab depending on status

Author: simasch

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestResult.cs

@@ -30,7 +30,7 @@ internal class Expectation
         internal Expectation(string message, string caller)
         {
             this.Message = message;
-            this.Caller = caller;
+            this.Caller = caller.Replace("s*", "\n");
         }
         public string Message { get; set; }
         public string Caller { get; set; }

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.Designer.cs

@@ -17,17 +17,24 @@ public partial class TestRunnerWindow : Form
 
         private const int IconSize = 24;
         private const int Steps = 1000;
+        private const string StatusSuccess = "Success";
+        private const string StatusFailure = "Failure";
+        private const string StatusError = "Error";
+        private const string StatusDisabled = "Disabled";
+        private const string StatusWarning = "Warning";
 
-        private readonly RealTimeTestRunner testRunner;
         private readonly object pluginIntegration;
         private readonly string username;
         private readonly string password;
         private readonly string database;
         private readonly string connectAs;
 
         private readonly List<TestResult> testResults = new List<TestResult>();
+
         private BindingListView<TestResult> viewTestResults;
 
+        private RealTimeTestRunner testRunner;
+
         private int totalNumberOfTests;
         private int rowIndexOnRightClick;
         private int completedTests;
@@ -40,9 +47,6 @@ public TestRunnerWindow(object pluginIntegration, string username, string passwo
             this.database = database;
             this.connectAs = connectAs;
 
-            testRunner = new RealTimeTestRunner();
-            testRunner.Connect(username, password, database);
-
             InitializeComponent();
         }
 
@@ -67,6 +71,9 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
 
             SetWindowTitle(type, owner, name, procedure);
 
+            testRunner = new RealTimeTestRunner();
+            testRunner.Connect(username, password, database);
+
             try
             {
                 testRunner.GetVersion();
@@ -339,27 +346,27 @@ private void UpdateTestResult(@event @event)
                         if (counter.disabled > 0)
                         {
                             testResult.Icon = IconChar.Ban.ToBitmap(Color.Gray, IconSize);
-                            testResult.Status = "Disabled";
+                            testResult.Status = StatusDisabled;
                         }
                         else if (counter.success > 0)
                         {
                             testResult.Icon = IconChar.Check.ToBitmap(Color.Green, IconSize);
-                            testResult.Status = "Success";
+                            testResult.Status = StatusSuccess;
                         }
                         else if (counter.failure > 0)
                         {
                             testResult.Icon = IconChar.TimesCircle.ToBitmap(IconFont.Solid, IconSize, Color.Orange);
-                            testResult.Status = "Failure";
+                            testResult.Status = StatusFailure;
                         }
                         else if (counter.error > 0)
                         {
                             testResult.Icon = IconChar.ExclamationCircle.ToBitmap(Color.Red, IconSize);
-                            testResult.Status = "Error";
+                            testResult.Status = StatusError;
                         }
                         else if (counter.warning > 0)
                         {
                             testResult.Icon = IconChar.ExclamationTriangle.ToBitmap(Color.Orange, IconSize);
-                            testResult.Status = "Warning";
+                            testResult.Status = StatusWarning;
                         }
 
                         if (@event.test.errorStack != null)
@@ -458,19 +465,19 @@ private void FilterTestResults()
                 {
                     if (testResult.Status != null)
                     {
-                        if (!cbSuccess.Checked && testResult.Status.Equals("Success"))
+                        if (!cbSuccess.Checked && testResult.Status.Equals(StatusSuccess))
                         {
                             return false;
                         }
-                        if (!cbFailure.Checked && testResult.Status.Equals("Failure"))
+                        if (!cbFailure.Checked && testResult.Status.Equals(StatusFailure))
                         {
                             return false;
                         }
-                        if (!cbError.Checked && testResult.Status.Equals("Error"))
+                        if (!cbError.Checked && testResult.Status.Equals(StatusError))
                         {
                             return false;
                         }
-                        if (!cbDisabled.Checked && testResult.Status.Equals("Disabled"))
+                        if (!cbDisabled.Checked && testResult.Status.Equals(StatusDisabled))
                         {
                             return false;
                         }
@@ -536,6 +543,26 @@ private void gridResults_SelectionChanged(object sender, EventArgs e)
 
                 gridTestFailures.Columns[0].MinimumWidth = 480;
                 gridTestFailures.Columns[1].MinimumWidth = 480;
+
+                if (!Running)
+                {
+                    if (testResult.Status == null)
+                    {
+                        tabs.SelectedTab = tabTest;
+                    }
+                    else if (testResult.Status.Equals(StatusFailure))
+                    {
+                        tabs.SelectedTab = tabFailures;
+                    }
+                    else if (testResult.Status.Equals(StatusError))
+                    {
+                        tabs.SelectedTab = tabErrors;
+                    }
+                    else
+                    {
+                        tabs.SelectedTab = tabTest;
+                    }
+                }
             }
         }