Added convenience methods

simasch · simasch · commit c16cce921516 · 2021-01-03T11:28:13.000+01:00
diff --git a/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs b/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs
@@ -32,8 +32,7 @@ public void TestRunTestsWithCoverage()
             var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
-            testRunner.RunTestsWithCoverage(paths: new List<string>() { "toscamtest" },
-                                            coverageSchemas: new List<string>() { "toscam" },
+            testRunner.RunTestsWithCoverage(path: "toscamtest", coverageSchema: "toscam",
                                             includeObjects: new List<string>() { "pa_m720", "pa_m770" });
 
             var events = new List<@event>();
diff --git a/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs b/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs
@@ -30,6 +30,8 @@ public override void RunTests(params string[] paths)
                 var cmd = new OracleCommand(proc, produceConnection);
                 cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = realtimeReporterId;
                 cmd.ExecuteNonQuery();
+
+                cmd.Dispose();
             }
         }
 
@@ -75,9 +77,16 @@ public override void RunTestsWithCoverage(List<string> paths, List<string> cover
                 cmd.Parameters.Add("coverage_id", OracleDbType.Varchar2, ParameterDirection.Input).Value = coverageReporterId;
 
                 cmd.ExecuteNonQuery();
+
+                cmd.Dispose();
             }
         }
 
+        public override void RunTestsWithCoverage(string path, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null)
+        {
+            this.RunTestsWithCoverage(new List<string>() { path }, new List<string>() { coverageSchema }, includeObjects, excludeObjects);
+        }
+
         public override void ConsumeResult(Action<@event> action)
         {
             var proc = @"DECLARE
@@ -106,6 +115,7 @@ public override void ConsumeResult(Action<@event> action)
             }
 
             reader.Close();
+            cmd.Dispose();
         }
     }
 }
diff --git a/utPLSQL.Api/utPLSQL.Api/TestRunner.cs b/utPLSQL.Api/utPLSQL.Api/TestRunner.cs
@@ -20,7 +20,7 @@ public abstract class TestRunner<T>
 
         /// <summary>
         /// Connects to the database. 
-        /// The TestRunner uses two connections. One for executing the tests and one for consuming the reuslts
+        /// The TestRunner uses two connections. One for executing the tests and one for consuming the results
         /// </summary>
         /// <param name="username">Database username</param>
         /// <param name="password">Database password</param>
@@ -53,8 +53,12 @@ public String GetVersion()
             var cmd = new OracleCommand("select ut.version() from dual", produceConnection);
             OracleDataReader reader = cmd.ExecuteReader();
             reader.Read();
+            
             var version = reader.GetString(0);
+            
             reader.Close();
+            cmd.Dispose();
+            
             return version;
         }
 
@@ -73,6 +77,15 @@ public String GetVersion()
         /// <param name="excludeObjects">List of objects to exclude</param>
         public abstract void RunTestsWithCoverage(List<string> paths, List<string> coverageSchemas = null, List<string> includeObjects = null, List<string> excludeObjects = null);
 
+        /// <summary>
+        /// Run tests with coveage
+        /// </summary>
+        /// <param name="paths">The path</param>
+        /// <param name="coverageSchema">The schemas to cover</param>
+        /// <param name="includeObjects">List of objects to include</param>
+        /// <param name="excludeObjects">List of objects to exclude</param>
+        public abstract void RunTestsWithCoverage(string path, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null);
+
         /// <summary>
         /// Consumes the results and calls the callback action on each result
         /// </summary>
@@ -110,6 +123,7 @@ public string GetCoverageReport()
             }
 
             reader.Close();
+            cmd.Dispose();
 
             return sb.ToString();
         }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public override void RunTests(params string[] paths)`
`30`	`30`	`var cmd = new OracleCommand(proc, produceConnection);`
`31`	`31`	`cmd.Parameters.Add("id", OracleDbType.Varchar2, ParameterDirection.Input).Value = realtimeReporterId;`
`32`	`32`	`cmd.ExecuteNonQuery();`
	`33`	`+`
	`34`	`+ cmd.Dispose();`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`
`@@ -75,9 +77,16 @@ public override void RunTestsWithCoverage(List<string> paths, List<string> cover`
`75`	`77`	`cmd.Parameters.Add("coverage_id", OracleDbType.Varchar2, ParameterDirection.Input).Value = coverageReporterId;`
`76`	`78`
`77`	`79`	`cmd.ExecuteNonQuery();`
	`80`	`+`
	`81`	`+ cmd.Dispose();`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`
	`85`	`+ public override void RunTestsWithCoverage(string path, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null)`
	`86`	`+ {`
	`87`	`+ this.RunTestsWithCoverage(new List<string>() { path }, new List<string>() { coverageSchema }, includeObjects, excludeObjects);`
	`88`	`+ }`
	`89`	`+`
`81`	`90`	`public override void ConsumeResult(Action<@event> action)`
`82`	`91`	`{`
`83`	`92`	`var proc = @"DECLARE`
`@@ -106,6 +115,7 @@ public override void ConsumeResult(Action<@event> action)`
`106`	`115`	`}`
`107`	`116`
`108`	`117`	`reader.Close();`
	`118`	`+ cmd.Dispose();`
`109`	`119`	`}`
`110`	`120`	`}`
`111`	`121`	`}`