Added constants for status. Switch tab depending on status

simasch · simasch · commit 1c787d817352 · 2021-01-07T15:40:39.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestResult.cs b/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; }
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.Designer.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.Designer.cs
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.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;
+                    }
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal class Expectation`
`30`	`30`	`internal Expectation(string message, string caller)`
`31`	`31`	`{`
`32`	`32`	`this.Message = message;`
`33`		`- this.Caller = caller;`
	`33`	`+ this.Caller = caller.Replace("s*", "\n");`
`34`	`34`	`}`
`35`	`35`	`public string Message { get; set; }`
`36`	`36`	`public string Caller { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,24 @@ public partial class TestRunnerWindow : Form`
`17`	`17`
`18`	`18`	`private const int IconSize = 24;`
`19`	`19`	`private const int Steps = 1000;`
	`20`	`+ private const string StatusSuccess = "Success";`
	`21`	`+ private const string StatusFailure = "Failure";`
	`22`	`+ private const string StatusError = "Error";`
	`23`	`+ private const string StatusDisabled = "Disabled";`
	`24`	`+ private const string StatusWarning = "Warning";`
`20`	`25`
`21`		`- private readonly RealTimeTestRunner testRunner;`
`22`	`26`	`private readonly object pluginIntegration;`
`23`	`27`	`private readonly string username;`
`24`	`28`	`private readonly string password;`
`25`	`29`	`private readonly string database;`
`26`	`30`	`private readonly string connectAs;`
`27`	`31`
`28`	`32`	`private readonly List<TestResult> testResults = new List<TestResult>();`
	`33`	`+`
`29`	`34`	`private BindingListView<TestResult> viewTestResults;`
`30`	`35`
	`36`	`+ private RealTimeTestRunner testRunner;`
	`37`	`+`
`31`	`38`	`private int totalNumberOfTests;`
`32`	`39`	`private int rowIndexOnRightClick;`
`33`	`40`	`private int completedTests;`
`@@ -40,9 +47,6 @@ public TestRunnerWindow(object pluginIntegration, string username, string passwo`
`40`	`47`	`this.database = database;`
`41`	`48`	`this.connectAs = connectAs;`
`42`	`49`
`43`		`- testRunner = new RealTimeTestRunner();`
`44`		`- testRunner.Connect(username, password, database);`
`45`		`-`
`46`	`50`	`InitializeComponent();`
`47`	`51`	`}`
`48`	`52`
`@@ -67,6 +71,9 @@ public async Task RunTestsAsync(string type, string owner, string name, string p`
`67`	`71`
`68`	`72`	`SetWindowTitle(type, owner, name, procedure);`
`69`	`73`
	`74`	`+ testRunner = new RealTimeTestRunner();`
	`75`	`+ testRunner.Connect(username, password, database);`
	`76`	`+`
`70`	`77`	`try`
`71`	`78`	`{`
`72`	`79`	`testRunner.GetVersion();`
`@@ -339,27 +346,27 @@ private void UpdateTestResult(@event @event)`
`339`	`346`	`if (counter.disabled > 0)`
`340`	`347`	`{`
`341`	`348`	`testResult.Icon = IconChar.Ban.ToBitmap(Color.Gray, IconSize);`
`342`		`- testResult.Status = "Disabled";`
	`349`	`+ testResult.Status = StatusDisabled;`
`343`	`350`	`}`
`344`	`351`	`else if (counter.success > 0)`
`345`	`352`	`{`
`346`	`353`	`testResult.Icon = IconChar.Check.ToBitmap(Color.Green, IconSize);`
`347`		`- testResult.Status = "Success";`
	`354`	`+ testResult.Status = StatusSuccess;`
`348`	`355`	`}`
`349`	`356`	`else if (counter.failure > 0)`
`350`	`357`	`{`
`351`	`358`	`testResult.Icon = IconChar.TimesCircle.ToBitmap(IconFont.Solid, IconSize, Color.Orange);`
`352`		`- testResult.Status = "Failure";`
	`359`	`+ testResult.Status = StatusFailure;`
`353`	`360`	`}`
`354`	`361`	`else if (counter.error > 0)`
`355`	`362`	`{`
`356`	`363`	`testResult.Icon = IconChar.ExclamationCircle.ToBitmap(Color.Red, IconSize);`
`357`		`- testResult.Status = "Error";`
	`364`	`+ testResult.Status = StatusError;`
`358`	`365`	`}`
`359`	`366`	`else if (counter.warning > 0)`
`360`	`367`	`{`
`361`	`368`	`testResult.Icon = IconChar.ExclamationTriangle.ToBitmap(Color.Orange, IconSize);`
`362`		`- testResult.Status = "Warning";`
	`369`	`+ testResult.Status = StatusWarning;`
`363`	`370`	`}`
`364`	`371`
`365`	`372`	`if (@event.test.errorStack != null)`
`@@ -458,19 +465,19 @@ private void FilterTestResults()`
`458`	`465`	`{`
`459`	`466`	`if (testResult.Status != null)`
`460`	`467`	`{`
`461`		`- if (!cbSuccess.Checked && testResult.Status.Equals("Success"))`
	`468`	`+ if (!cbSuccess.Checked && testResult.Status.Equals(StatusSuccess))`
`462`	`469`	`{`
`463`	`470`	`return false;`
`464`	`471`	`}`
`465`		`- if (!cbFailure.Checked && testResult.Status.Equals("Failure"))`
	`472`	`+ if (!cbFailure.Checked && testResult.Status.Equals(StatusFailure))`
`466`	`473`	`{`
`467`	`474`	`return false;`
`468`	`475`	`}`
`469`		`- if (!cbError.Checked && testResult.Status.Equals("Error"))`
	`476`	`+ if (!cbError.Checked && testResult.Status.Equals(StatusError))`
`470`	`477`	`{`
`471`	`478`	`return false;`
`472`	`479`	`}`
`473`		`- if (!cbDisabled.Checked && testResult.Status.Equals("Disabled"))`
	`480`	`+ if (!cbDisabled.Checked && testResult.Status.Equals(StatusDisabled))`
`474`	`481`	`{`
`475`	`482`	`return false;`
`476`	`483`	`}`
`@@ -536,6 +543,26 @@ private void gridResults_SelectionChanged(object sender, EventArgs e)`
`536`	`543`
`537`	`544`	`gridTestFailures.Columns[0].MinimumWidth = 480;`
`538`	`545`	`gridTestFailures.Columns[1].MinimumWidth = 480;`
	`546`	`+`
	`547`	`+ if (!Running)`
	`548`	`+ {`
	`549`	`+ if (testResult.Status == null)`
	`550`	`+ {`
	`551`	`+ tabs.SelectedTab = tabTest;`
	`552`	`+ }`
	`553`	`+ else if (testResult.Status.Equals(StatusFailure))`
	`554`	`+ {`
	`555`	`+ tabs.SelectedTab = tabFailures;`
	`556`	`+ }`
	`557`	`+ else if (testResult.Status.Equals(StatusError))`
	`558`	`+ {`
	`559`	`+ tabs.SelectedTab = tabErrors;`
	`560`	`+ }`
	`561`	`+ else`
	`562`	`+ {`
	`563`	`+ tabs.SelectedTab = tabTest;`
	`564`	`+ }`
	`565`	`+ }`
`539`	`566`	`}`
`540`	`567`	`}`
`541`	`568`