Moved TestRunner instance to TestRunnerWindow and update utPLSQL.API

simasch · simasch · commit 853630a39807 · 2021-01-04T15:26:45.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs
@@ -55,15 +55,9 @@ public class PlsqlDeveloperUtPlsqlPlugin
         internal static string database;
 
         private static PlsqlDeveloperUtPlsqlPlugin _plugin;
-        private static RealTimeTestRunner _testRunner;
 
         private static readonly List<TestRunnerWindow> Windows = new List<TestRunnerWindow>();
 
-        private PlsqlDeveloperUtPlsqlPlugin()
-        {
-            _testRunner = new RealTimeTestRunner();
-        }
-
         #region DLL exported API
 
         [DllExport("IdentifyPlugIn", CallingConvention = CallingConvention.Cdecl)]
@@ -206,7 +200,7 @@ public static void OnMenuClick(int index)
             {
                 if (connected())
                 {
-                    var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);
+                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
                     Windows.Add(testResultWindow);
                     testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
                 }
@@ -215,7 +209,7 @@ public static void OnMenuClick(int index)
             {
                 if (connected())
                 {
-                    var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);
+                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
                     Windows.Add(testResultWindow);
                     testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
                 }
@@ -226,7 +220,7 @@ public static void OnMenuClick(int index)
                 {
                     getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                    var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);
+                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
                     Windows.Add(testResultWindow);
                     testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
                         Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
@@ -238,7 +232,7 @@ public static void OnMenuClick(int index)
                 {
                     getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                    var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);
+                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
                     Windows.Add(testResultWindow);
                     testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
                         Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
@@ -265,17 +259,13 @@ private static void ConnectToDatabase()
         {
             try
             {
-                _testRunner.Close();
-
                 if (connected())
                 {
                     getConnectionInfo(out IntPtr ptrUsername, out IntPtr ptrPassword, out IntPtr ptrDatabase);
 
                     username = Marshal.PtrToStringAnsi(ptrUsername);
                     password = Marshal.PtrToStringAnsi(ptrPassword);
                     database = Marshal.PtrToStringAnsi(ptrDatabase);
-
-                    _testRunner.Connect(username, password, database);
                 }
             }
             catch (Exception e)
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj
@@ -105,8 +105,8 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.4.0\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.4.1\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config
@@ -6,5 +6,5 @@
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
   <package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
   <package id="UnmanagedExports.Repack" version="1.0.4" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.4.0" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.4.1" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs
@@ -12,19 +12,13 @@ public LoginForm()
 
         private void BtnRunTests_Click(object sender, EventArgs e)
         {
-            var realTimeTestRunner = new RealTimeTestRunner();
-            realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);
-
-            var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);
         }
 
         private void btnCodeCoverage_Click(object sender, EventArgs e)
         {
-            var realTimeTestRunner = new RealTimeTestRunner();
-            realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);
-
-            var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);
         }
     }
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.4.0" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.4.1" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj
@@ -45,8 +45,8 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.4.0\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.4.1\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs
@@ -20,17 +20,24 @@ public partial class TestRunnerWindow : Form
 
         private readonly RealTimeTestRunner testRunner;
         private readonly object pluginIntegration;
-
+        private readonly string username;
+        private readonly string password;
+        private readonly string database;
         private readonly List<TestResult> testResults = new List<TestResult>();
         BindingListView<TestResult> viewTestResults;
 
         private int totalNumberOfTests;
         private int rowIndexOnRightClick;
 
-        public TestRunnerWindow(RealTimeTestRunner testRunner, object pluginIntegration)
+        public TestRunnerWindow(object pluginIntegration, string username, string password, string database)
         {
-            this.testRunner = testRunner;
             this.pluginIntegration = pluginIntegration;
+            this.username = username;
+            this.password = password;
+            this.database = database;
+
+            this.testRunner = new RealTimeTestRunner();
+            this.testRunner.Connect(username, password, database);
 
             InitializeComponent();
 
@@ -491,6 +498,12 @@ private void TestResultWindow_FormClosing(object sender, FormClosingEventArgs e)
                     {
                         e.Cancel = true;
                     }
+                    else
+                    {
+                        txtStatus.Text = "Aborting...";
+                        testRunner.Close();
+                        Running = false;
+                    }
                 }
             }
         }
@@ -557,15 +570,15 @@ private void menuItemRunTests_Click(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database);
             testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, false);
         }
 
         private void menuItemCoverage_Click(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database);
             testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, true);
         }
 
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/packages.config b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/packages.config
@@ -3,5 +3,5 @@
   <package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net40" />
   <package id="Geomatics.IO.BindingListView" version="1.3.2" targetFramework="net40" />
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.4.0" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.4.1" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/utPLSQL.UI.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/utPLSQL.UI.csproj
@@ -49,8 +49,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.4.0\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.4.1\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,9 @@ public class PlsqlDeveloperUtPlsqlPlugin`
`55`	`55`	`internal static string database;`
`56`	`56`
`57`	`57`	`private static PlsqlDeveloperUtPlsqlPlugin _plugin;`
`58`		`- private static RealTimeTestRunner _testRunner;`
`59`	`58`
`60`	`59`	`private static readonly List<TestRunnerWindow> Windows = new List<TestRunnerWindow>();`
`61`	`60`
`62`		`- private PlsqlDeveloperUtPlsqlPlugin()`
`63`		`- {`
`64`		`- _testRunner = new RealTimeTestRunner();`
`65`		`- }`
`66`		`-`
`67`	`61`	`#region DLL exported API`
`68`	`62`
`69`	`63`	`[DllExport("IdentifyPlugIn", CallingConvention = CallingConvention.Cdecl)]`
`@@ -206,7 +200,7 @@ public static void OnMenuClick(int index)`
`206`	`200`	`{`
`207`	`201`	`if (connected())`
`208`	`202`	`{`
`209`		`- var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);`
	`203`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);`
`210`	`204`	`Windows.Add(testResultWindow);`
`211`	`205`	`testResultWindow.RunTestsAsync("_ALL", username, null, null, false);`
`212`	`206`	`}`
`@@ -215,7 +209,7 @@ public static void OnMenuClick(int index)`
`215`	`209`	`{`
`216`	`210`	`if (connected())`
`217`	`211`	`{`
`218`		`- var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);`
	`212`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);`
`219`	`213`	`Windows.Add(testResultWindow);`
`220`	`214`	`testResultWindow.RunTestsAsync("_ALL", username, null, null, true);`
`221`	`215`	`}`
`@@ -226,7 +220,7 @@ public static void OnMenuClick(int index)`
`226`	`220`	`{`
`227`	`221`	`getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);`
`228`	`222`
`229`		`- var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);`
	`223`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);`
`230`	`224`	`Windows.Add(testResultWindow);`
`231`	`225`	`testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),`
`232`	`226`	`Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);`
`@@ -238,7 +232,7 @@ public static void OnMenuClick(int index)`
`238`	`232`	`{`
`239`	`233`	`getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);`
`240`	`234`
`241`		`- var testResultWindow = new TestRunnerWindow(_testRunner, _plugin);`
	`235`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);`
`242`	`236`	`Windows.Add(testResultWindow);`
`243`	`237`	`testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),`
`244`	`238`	`Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);`
`@@ -265,17 +259,13 @@ private static void ConnectToDatabase()`
`265`	`259`	`{`
`266`	`260`	`try`
`267`	`261`	`{`
`268`		`- _testRunner.Close();`
`269`		`-`
`270`	`262`	`if (connected())`
`271`	`263`	`{`
`272`	`264`	`getConnectionInfo(out IntPtr ptrUsername, out IntPtr ptrPassword, out IntPtr ptrDatabase);`
`273`	`265`
`274`	`266`	`username = Marshal.PtrToStringAnsi(ptrUsername);`
`275`	`267`	`password = Marshal.PtrToStringAnsi(ptrPassword);`
`276`	`268`	`database = Marshal.PtrToStringAnsi(ptrDatabase);`
`277`		`-`
`278`		`- _testRunner.Connect(username, password, database);`
`279`	`269`	`}`
`280`	`270`	`}`
`281`	`271`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,13 @@ public LoginForm()`
`12`	`12`
`13`	`13`	`private void BtnRunTests_Click(object sender, EventArgs e)`
`14`	`14`	`{`
`15`		`- var realTimeTestRunner = new RealTimeTestRunner();`
`16`		`- realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);`
`17`		`-`
`18`		`- var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);`
	`15`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);`
`19`	`16`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);`
`20`	`17`	`}`
`21`	`18`
`22`	`19`	`private void btnCodeCoverage_Click(object sender, EventArgs e)`
`23`	`20`	`{`
`24`		`- var realTimeTestRunner = new RealTimeTestRunner();`
`25`		`- realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);`
`26`		`-`
`27`		`- var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);`
	`21`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);`
`28`	`22`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);`
`29`	`23`	`}`
`30`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,24 @@ public partial class TestRunnerWindow : Form`
`20`	`20`
`21`	`21`	`private readonly RealTimeTestRunner testRunner;`
`22`	`22`	`private readonly object pluginIntegration;`
`23`		`-`
	`23`	`+ private readonly string username;`
	`24`	`+ private readonly string password;`
	`25`	`+ private readonly string database;`
`24`	`26`	`private readonly List<TestResult> testResults = new List<TestResult>();`
`25`	`27`	`BindingListView<TestResult> viewTestResults;`
`26`	`28`
`27`	`29`	`private int totalNumberOfTests;`
`28`	`30`	`private int rowIndexOnRightClick;`
`29`	`31`
`30`		`- public TestRunnerWindow(RealTimeTestRunner testRunner, object pluginIntegration)`
	`32`	`+ public TestRunnerWindow(object pluginIntegration, string username, string password, string database)`
`31`	`33`	`{`
`32`		`- this.testRunner = testRunner;`
`33`	`34`	`this.pluginIntegration = pluginIntegration;`
	`35`	`+ this.username = username;`
	`36`	`+ this.password = password;`
	`37`	`+ this.database = database;`
	`38`	`+`
	`39`	`+ this.testRunner = new RealTimeTestRunner();`
	`40`	`+ this.testRunner.Connect(username, password, database);`
`34`	`41`
`35`	`42`	`InitializeComponent();`
`36`	`43`
`@@ -491,6 +498,12 @@ private void TestResultWindow_FormClosing(object sender, FormClosingEventArgs e)`
`491`	`498`	`{`
`492`	`499`	`e.Cancel = true;`
`493`	`500`	`}`
	`501`	`+ else`
	`502`	`+ {`
	`503`	`+ txtStatus.Text = "Aborting...";`
	`504`	`+ testRunner.Close();`
	`505`	`+ Running = false;`
	`506`	`+ }`
`494`	`507`	`}`
`495`	`508`	`}`
`496`	`509`	`}`
`@@ -557,15 +570,15 @@ private void menuItemRunTests_Click(object sender, EventArgs e)`
`557`	`570`	`{`
`558`	`571`	`var testResult = testResults[rowIndexOnRightClick];`
`559`	`572`
`560`		`- var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);`
	`573`	`+ var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database);`
`561`	`574`	`testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, false);`
`562`	`575`	`}`
`563`	`576`
`564`	`577`	`private void menuItemCoverage_Click(object sender, EventArgs e)`
`565`	`578`	`{`
`566`	`579`	`var testResult = testResults[rowIndexOnRightClick];`
`567`	`580`
`568`		`- var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);`
	`581`	`+ var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database);`
`569`	`582`	`testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, true);`
`570`	`583`	`}`
`571`	`584`