Cancel running commands on close

Author: simasch

utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs

@@ -49,6 +49,18 @@ public void TestRunTestsWithCoverage()
             System.Diagnostics.Trace.WriteLine(report);
         }
 
+
+        [TestMethod]
+        public void TestRunTestsAndAbort()
+        {
+            var testRunner = new RealTimeTestRunner();
+            testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
+
+            testRunner.RunTests(paths: "toscamtest");
+
+            testRunner.Close();
+        }
+
         [TestMethod]
         public void TestGetVersion()
         {
@@ -60,11 +72,11 @@ public void TestGetVersion()
             Assert.AreEqual("v3.1.7.3096", version);
         }
 
-        [TestMethod]
+        // [TestMethod] Disabled
         public void TestGetVersionWhenNotInstalled()
         {
             var testRunner = new RealTimeTestRunner();
-            testRunner.Connect(username: "c##sakila", password: "sakila", database: "ORCLCDB");
+            testRunner.Connect(username: "sakila", password: "sakila", database: "ORCLPDB1");
 
             try
             {

utPLSQL.Api/utPLSQL.Api/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]

utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs

@@ -28,9 +28,12 @@ public override void RunTests(params string[] paths)
                              END;";
 
                 var cmd = new OracleCommand(proc, produceConnection);
+                runningCommands.Add(cmd);
+
                 cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = realtimeReporterId;
                 cmd.ExecuteNonQuery();
 
+                runningCommands.Remove(cmd);
                 cmd.Dispose();
             }
         }
@@ -73,11 +76,14 @@ public override void RunTestsWithCoverage(List<string> paths, List<string> cover
                           END;";
 
                 var cmd = new OracleCommand(proc, produceConnection);
+                runningCommands.Add(cmd);
+
                 cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = realtimeReporterId;
                 cmd.Parameters.Add("coverage_id", OracleDbType.Varchar2, ParameterDirection.Input).Value = coverageReporterId;
 
                 cmd.ExecuteNonQuery();
 
+                runningCommands.Remove(cmd);
                 cmd.Dispose();
             }
         }
@@ -97,6 +103,8 @@ public override void ConsumeResult(Action<@event> action)
                          END;";
 
             var cmd = new OracleCommand(proc, consumeConnection);
+            runningCommands.Add(cmd);
+
             cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = realtimeReporterId;
             cmd.Parameters.Add("lines_cursor", OracleDbType.RefCursor, ParameterDirection.Output);
 
@@ -115,6 +123,8 @@ public override void ConsumeResult(Action<@event> action)
             }
 
             reader.Close();
+
+            runningCommands.Remove(cmd);
             cmd.Dispose();
         }
     }

utPLSQL.Api/utPLSQL.Api/TestRunner.cs

@@ -18,6 +18,8 @@ public abstract class TestRunner<T>
         protected string realtimeReporterId;
         protected string coverageReporterId;
 
+        protected List<OracleCommand> runningCommands = new List<OracleCommand>();
+
         /// <summary>
         /// Connects to the database. 
         /// The TestRunner uses two connections. One for executing the tests and one for consuming the results
@@ -29,6 +31,11 @@ public void Connect(string username, string password, string database)
         {
             var connectionString = $"User Id={username};Password={password};Data Source={database}";
 
+            foreach(OracleCommand command in runningCommands)
+            {
+                command.Cancel();
+            }
+
             produceConnection = new OracleConnection(connectionString);
             produceConnection.Open();
 
@@ -51,12 +58,16 @@ public void Close()
         public String GetVersion()
         {
             var cmd = new OracleCommand("select ut.version() from dual", produceConnection);
+            runningCommands.Add(cmd);
+
             OracleDataReader reader = cmd.ExecuteReader();
             reader.Read();
 
             var version = reader.GetString(0);
 
             reader.Close();
+
+            runningCommands.Remove(cmd);
             cmd.Dispose();
 
             return version;
@@ -108,6 +119,8 @@ public string GetCoverageReport()
                          END;";
 
             var cmd = new OracleCommand(proc, consumeConnection);
+            runningCommands.Add(cmd);
+
             cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = coverageReporterId;
             cmd.Parameters.Add("lines_cursor", OracleDbType.RefCursor, ParameterDirection.Output);
 
@@ -123,6 +136,8 @@ public string GetCoverageReport()
             }
 
             reader.Close();
+
+            runningCommands.Remove(cmd);
             cmd.Dispose();
 
             return sb.ToString();

utPLSQL.Api/utPLSQL.Api/utPLSQL.Api.nuspec

@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>utPLSQL.Api</id>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <title>utPLSQL API</title>
     <authors>Simon Martinelli</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">Apache-2.0+</license>
     <projectUrl>https://github.com/utPLSQL/utPLSQL-dotnet-api</projectUrl>
 	<icon>images/blue-icon-transparent.png</icon>
     <description>.NET API for utPLSQL</description>
-    <releaseNotes>Changed from fields to paths as one parameter</releaseNotes>
+    <releaseNotes>Cancel running commands on close</releaseNotes>
     <copyright>Copyright © 2021</copyright>
     <tags>utPLSQL</tags>
   </metadata>