Clean up

Author: simasch

PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs

@@ -43,21 +43,21 @@ public class PlsqlDeveloperUtPlsqlPlugin
         private const int PluginPopupIndex = 1;
         private const int PluginPopupIndexWithCoverage = 2;
 
-        internal static IdeConnected connected;
-        internal static IdeGetConnectionInfo getConnectionInfo;
-
-        internal static IdeCreateWindow createWindow;
-        internal static IdeCreatePopupItem createPopupItem;
-        internal static IdeGetPopupObject getPopupObject;
-        internal static IdeGetObjectSource getObjectSource;
-        internal static IdeGetConnectAs getConnectAs;
-        internal static IdeCreateToolButton createToolButton;
-
-        internal static int pluginId;
-        internal static string username;
-        internal static string password;
-        internal static string database;
-        internal static string connectAs;
+        private static IdeConnected connected;
+        private static IdeGetConnectionInfo getConnectionInfo;
+
+        private static IdeCreateWindow createWindow;
+        private static IdeCreatePopupItem createPopupItem;
+        private static IdeGetPopupObject getPopupObject;
+        private static IdeGetObjectSource getObjectSource;
+        private static IdeGetConnectAs getConnectAs;
+        private static IdeCreateToolButton createToolButton;
+
+        private static int pluginId;
+        private static string username;
+        private static string password;
+        private static string database;
+        private static string connectAs;
 
         private static PlsqlDeveloperUtPlsqlPlugin _plugin;
 

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs

@@ -85,7 +85,7 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
 
                         completedTests = 0;
 
-                        string htmlReport = await testRunner.RunTestsWithCoverageAsync(GetPath(type, owner, name, procedure), CollectResults(coverage), schemas, includes, excludes);
+                        var htmlReport = await testRunner.RunTestsWithCoverageAsync(GetPath(type, owner, name, procedure), CollectResults(coverage), schemas, includes, excludes);
 
                         var filePath = $"{Path.GetTempPath()}\\utPLSQL_Coverage_Report_{Guid.NewGuid()}.html";
                         using (var sw = new StreamWriter(filePath))
@@ -95,14 +95,7 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
 
                         txtStatus.BeginInvoke((MethodInvoker)delegate
                         {
-                            if (totalNumberOfTests > 0)
-                            {
-                                txtStatus.Text = "Finished";
-                            }
-                            else
-                            {
-                                txtStatus.Text = "No tests found";
-                            }
+                            txtStatus.Text = totalNumberOfTests > 0 ? "Finished" : "No tests found";
                         });
 
                         Running = false;
@@ -159,7 +152,7 @@ private Action<@event> CollectResults(bool coverage)
 
                         txtTests.Text = (completedTests > totalNumberOfTests ? totalNumberOfTests : completedTests) + "/" + totalNumberOfTests;
 
-                        UpdateProgressBar(completedTests);
+                        UpdateProgressBar();
 
                         UpdateTestResult(@event);
                     });
@@ -185,14 +178,7 @@ private Action<@event> CollectResults(bool coverage)
 
                         if (!coverage)
                         {
-                            if (totalNumberOfTests > 0)
-                            {
-                                txtStatus.Text = "Finished";
-                            }
-                            else
-                            {
-                                txtStatus.Text = "No tests found";
-                            }
+                            txtStatus.Text = totalNumberOfTests > 0 ? "Finished" : "No tests found";
                             Running = false;
                         }
                     });
@@ -226,7 +212,7 @@ private List<string> ConvertToList(string listValue)
                 }
                 else
                 {
-                    return new List<string>() { listValue };
+                    return new List<string> { listValue };
                 }
             }
         }
@@ -235,9 +221,9 @@ private List<string> ConvertToList(string listValue)
         * Workaround for the progressbar animation that produces lagging
         * https://stackoverflow.com/questions/5332616/disabling-net-progressbar-animation-when-changing-value
         */
-        private void UpdateProgressBar(int completedTests)
+        private void UpdateProgressBar()
         {
-            int newValue = completedTests * Steps + 1;
+            var newValue = completedTests * Steps + 1;
             if (newValue > progressBar.Maximum)
             {
                 progressBar.Value = progressBar.Maximum;
@@ -257,21 +243,21 @@ private void SetWindowTitle(string type, string owner, string name, string proce
             txtStart.Text = startTime;
             var path = GetPath(type, owner, name, procedure);
             txtPath.Text = path[0];
-            this.Text = $"{path[0]} {startTime}";
+            Text = $"{path[0]} {startTime}";
         }
 
         private List<string> GetPath(string type, string owner, string name, string procedure)
         {
             switch (type)
             {
                 case "USER":
-                    return new List<string>() { name };
+                    return new List<string> { name };
                 case "PACKAGE":
-                    return new List<string>() { $"{owner}.{name}" };
+                    return new List<string> { $"{owner}.{name}" };
                 case "PROCEDURE":
-                    return new List<string>() { $"{owner}.{name}.{procedure}" };
+                    return new List<string> { $"{owner}.{name}.{procedure}" };
                 default:
-                    return new List<string>() { owner };
+                    return new List<string> { owner };
             }
         }
 
@@ -374,7 +360,7 @@ private void UpdateTestResult(@event @event)
                         }
                         catch
                         {
-                            // ingore exception that could raise if results are filtered
+                            // ignore exception that could raise if results are filtered
                         }
                     }
                 }
@@ -469,7 +455,7 @@ private void FilterTestResults()
             }
         }
 
-        private void btnClose_Click(object sender, System.EventArgs e)
+        private void btnClose_Click(object sender, EventArgs e)
         {
             Close();
         }
@@ -502,7 +488,7 @@ private void gridResults_SelectionChanged(object sender, EventArgs e)
             if (gridResults.SelectedRows.Count > 0)
             {
                 var row = gridResults.SelectedRows[0];
-                ObjectView<TestResult> dataBoundItem = (ObjectView<TestResult>)row.DataBoundItem;
+                var dataBoundItem = (ObjectView<TestResult>)row.DataBoundItem;
                 var testResult = dataBoundItem.Object;
 
                 txtTestOwner.Text = testResult.Owner;