Code clean up and Test restructuring

Author: simasch

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

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 using Oracle.ManagedDataAccess.Client;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,10 +10,23 @@ namespace utPLSQL
     [TestClass]
     public class RealTimeTestRunnerTest
     {
+        private RealTimeTestRunner testRunner;
+
+        [TestInitialize]
+        public void Before()
+        {
+            testRunner = new RealTimeTestRunner();
+        }
+
+        [TestCleanup]
+        public void After()
+        {
+            testRunner.Close();
+        }
+
         [TestMethod]
         public async Task TestRunTests()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
             var events = new List<@event>();
@@ -26,9 +40,8 @@ await testRunner.RunTestsAsync("toscamtest", @event =>
         }
 
         [TestMethod]
-        public async Task TestConnectAsAsync()
+        public async Task TestConnectAs()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "sys", password: "Oradoc_db1", database: "ORCLPDB1", connectAs: "SYSDBA");
 
             try
@@ -44,9 +57,8 @@ public async Task TestConnectAsAsync()
         }
 
         [TestMethod]
-        public async Task TestRunTestsWithCoverageAsync()
+        public async Task TestRunTestsWithCoverage()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
             var events = new List<@event>();
@@ -57,25 +69,21 @@ public async Task TestRunTestsWithCoverageAsync()
             Assert.AreEqual("pre-run", events[0].type);
             Assert.AreEqual("post-run", events.Last().type);
 
-            System.Diagnostics.Trace.WriteLine(report);
+            Logger.LogMessage(report);
         }
 
 
         [TestMethod]
         public void TestRunTestsAndAbort()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
             testRunner.RunTestsAsync("toscamtest", @event => { });
-
-            testRunner.Close();
         }
 
         [TestMethod]
-        public async Task TestRunTestsTwoTimesAsync()
+        public async Task TestRunTestsTwoTimes()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
             testRunner.RunTestsAsync("toscamtest", @event => { });
@@ -86,7 +94,6 @@ public async Task TestRunTestsTwoTimesAsync()
         [TestMethod]
         public void TestGetVersion()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "toscamtest", password: "toscamtest", database: "CA40");
 
             string version = testRunner.GetVersion();
@@ -97,7 +104,6 @@ public void TestGetVersion()
         // [TestMethod] Disabled
         public void TestGetVersionWhenNotInstalled()
         {
-            var testRunner = new RealTimeTestRunner();
             testRunner.Connect(username: "sakila", password: "sakila", database: "ORCLPDB1");
 
             try

utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs

@@ -43,16 +43,23 @@ public override async Task<string> RunTestsWithCoverageAsync(List<string> paths,
 
                 Task taskConsume = ConsumeResultAsync(realtimeReporterId, consumer);
 
-                await Task.WhenAll(taskRun, taskConsume);
+                Task<string> taskCoverateReport = GetCoverageReportAsync(coverageReporterId);
+
+                await Task.WhenAll(taskRun, taskConsume, taskCoverateReport);
 
-                return await GetCoverageReportAsync(coverageReporterId);
+                return taskCoverateReport.Result;
             }
             else
             {
                 return null;
             }
         }
 
+        public override async Task<string> RunTestsWithCoverageAsync(string path, Action<@event> consumer, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null)
+        {
+            return await RunTestsWithCoverageAsync(new List<string>() { path }, consumer, new List<string>() { coverageSchema }, includeObjects, excludeObjects);
+        }
+
         private async Task UtRunWithCoverageAsync(string realtimeReporterId, string coverageReporterId, List<string> paths, List<string> coverageSchemas, List<string> includeObjects, List<string> excludeObjects)
         {
             await Task.Run(() =>
@@ -100,11 +107,6 @@ await Task.Run(() =>
             });
         }
 
-        public override async Task<string> RunTestsWithCoverageAsync(string path, Action<@event> consumer, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null)
-        {
-            return await RunTestsWithCoverageAsync(new List<string>() { path }, consumer, new List<string>() { coverageSchema }, includeObjects, excludeObjects);
-        }
-
         private async Task UtRunAsync(string id, List<string> paths)
         {
             await Task.Run(() =>

utPLSQL.Api/utPLSQL.Api/TestRunner.cs

@@ -116,10 +116,6 @@ public String GetVersion()
         /// <returns>Report as HTML</returns>
         public abstract Task<string> RunTestsWithCoverageAsync(string path, Action<T> consumer, string coverageSchema = null, List<string> includeObjects = null, List<string> excludeObjects = null);
 
-        /// <summary>
-        /// Consumes the results and calls the callback action on each result
-        /// </summary>
-
         protected async Task<string> GetCoverageReportAsync(string id)
         {
             return await Task.Run(() =>