Merge branch 'release/1.5.1' into main

simasch · simasch · commit 83712f72e9ca · 2021-01-05T12:35:46.000+01:00
diff --git a/README.md b/README.md
@@ -24,9 +24,9 @@
     var events = new List<@event>();
 
     string htmlReport = await testRunner.RunTestsWithCoverageAsync(path: "toscamtest", 
-                                                                  @event => { events.Add(@event); },
-                                                                  coverageSchema: "toscam", 
-                                                                  includeObjects: new List<string>() { "pa_m720", "pa_m770" });
+                                             consumer: @event => { events.Add(@event); },
+                                             coverageSchema: "toscam", 
+                                             includeObjects: new List<string>() { "pa_m720", "pa_m770" });
 
 ## Releases
 
diff --git a/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs b/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Oracle.ManagedDataAccess.Client;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -52,7 +51,7 @@ public async Task TestRunTestsWithCoverageAsync()
 
             var events = new List<@event>();
 
-            string report = await testRunner.RunTestsWithCoverageAsync(path: "toscamtest", @event => { events.Add(@event); },
+            string report = await testRunner.RunTestsWithCoverageAsync(path: "toscamtest", consumer: @event => { events.Add(@event); },
                                                                        coverageSchema: "toscam", includeObjects: new List<string>() { "pa_m720", "pa_m770" });
 
             Assert.AreEqual("pre-run", events[0].type);
diff --git a/utPLSQL.Api/utPLSQL.Api/Properties/AssemblyInfo.cs b/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.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
diff --git a/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs b/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs
@@ -19,9 +19,11 @@ public override async Task RunTestsAsync(List<string> paths, Action<@event> cons
             {
                 string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
 
-                await UtRunAsync(realtimeReporterId, paths);
+                Task taskRun = UtRunAsync(realtimeReporterId, paths);
 
-                await ConsumeResultAsync(realtimeReporterId, consumer);
+                Task taskConsume = ConsumeResultAsync(realtimeReporterId, consumer);
+
+                await Task.WhenAll(taskRun, taskConsume);
             }
         }
 
@@ -37,9 +39,11 @@ public override async Task<string> RunTestsWithCoverageAsync(List<string> paths,
                 string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
                 string coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");
 
-                await UtRunWithCoverageAsync(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects);
+                Task taskRun = UtRunWithCoverageAsync(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects);
+
+                Task taskConsume = ConsumeResultAsync(realtimeReporterId, consumer);
 
-                await ConsumeResultAsync(realtimeReporterId, consumer);
+                await Task.WhenAll(taskRun, taskConsume);
 
                 return await GetCoverageReportAsync(coverageReporterId);
             }
diff --git a/utPLSQL.Api/utPLSQL.Api/utPLSQL.Api.nuspec b/utPLSQL.Api/utPLSQL.Api/utPLSQL.Api.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>utPLSQL.Api</id>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <title>utPLSQL API</title>
     <authors>Simon Martinelli</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,11 @@ public override async Task RunTestsAsync(List<string> paths, Action<@event> cons`
`19`	`19`	`{`
`20`	`20`	`string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`21`	`21`
`22`		`- await UtRunAsync(realtimeReporterId, paths);`
	`22`	`+ Task taskRun = UtRunAsync(realtimeReporterId, paths);`
`23`	`23`
`24`		`- await ConsumeResultAsync(realtimeReporterId, consumer);`
	`24`	`+ Task taskConsume = ConsumeResultAsync(realtimeReporterId, consumer);`
	`25`	`+`
	`26`	`+ await Task.WhenAll(taskRun, taskConsume);`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`
`@@ -37,9 +39,11 @@ public override async Task<string> RunTestsWithCoverageAsync(List<string> paths,`
`37`	`39`	`string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`38`	`40`	`string coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`39`	`41`
`40`		`- await UtRunWithCoverageAsync(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects);`
	`42`	`+ Task taskRun = UtRunWithCoverageAsync(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects);`
	`43`	`+`
	`44`	`+ Task taskConsume = ConsumeResultAsync(realtimeReporterId, consumer);`
`41`	`45`
`42`		`- await ConsumeResultAsync(realtimeReporterId, consumer);`
	`46`	`+ await Task.WhenAll(taskRun, taskConsume);`
`43`	`47`
`44`	`48`	`return await GetCoverageReportAsync(coverageReporterId);`
`45`	`49`	`}`