Merge pull request #243 from tonyhallett/threading-3

Threading 3

Author: tonyhallett

FineCodeCoverageTests/CoverageProject_Tests.cs

@@ -1,7 +1,3 @@
-using System.IO;
-using FineCodeCoverage.Core.Model;
-using NUnit.Framework;
-
 namespace Test
 {
     public class CoverageProject_Tests

FineCodeCoverageTests/CoverageUtilManager_Tests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using AutoMoq;
 using FineCodeCoverage.Engine;
@@ -26,31 +27,31 @@ public void SetUp()
         public void Initialize_Should_Initialize_The_Coverage_Utils()
         {
             var coverageUtilManager = mocker.Create<CoverageUtilManager>();
-            coverageUtilManager.Initialize("AppDataFolder");
-            mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder"));
-            mocker.Verify<IOpenCoverUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder"));
+            var ct = CancellationToken.None;
+            coverageUtilManager.Initialize("AppDataFolder", ct);
+            mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder", ct));
+            mocker.Verify<IOpenCoverUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder", ct));
         }
 
-        [TestCase(true, true)]
-        [TestCase(true, false)]
-        [TestCase(false, true)]
-        [TestCase(false, false)]
-        public void Should_Run_The_Appropriate_Cover_Tool_Based_On_IsDotNetSdkStyle(bool isDotNetSdkStyle, bool throwError)
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task Should_Run_The_Appropriate_Cover_Tool_Based_On_IsDotNetSdkStyle(bool isDotNetSdkStyle)
         {
             var mockProject = new Mock<ICoverageProject>();
             mockProject.Setup(cp => cp.IsDotNetSdkStyle()).Returns(isDotNetSdkStyle);
             var mockedProject = mockProject.Object;
 
             var coverageUtilManager = mocker.Create<CoverageUtilManager>();
-            coverageUtilManager.RunCoverageAsync(mockedProject, throwError);
+            var ct = CancellationToken.None;
+            await coverageUtilManager.RunCoverageAsync(mockedProject, ct);
 
             if (isDotNetSdkStyle)
             {
-                mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.RunCoverletAsync(mockedProject, throwError));
+                mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.RunCoverletAsync(mockedProject, ct));
             }
             else
             {
-                mocker.Verify<IOpenCoverUtil>(openCoverUtil => openCoverUtil.RunOpenCoverAsync(mockedProject, throwError));
+                mocker.Verify<IOpenCoverUtil>(openCoverUtil => openCoverUtil.RunOpenCoverAsync(mockedProject, ct));
             }
         }
     }

FineCodeCoverageTests/CoverletConsole_Tests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using AutoMoq;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Coverlet;
@@ -25,8 +26,9 @@ public void SetUp()
         [Test]
         public void Should_Initilize_IFCCCoverletConsoleExeProvider()
         {
-            coverletConsoleUtil.Initialize("appDataFolder");
-            mocker.Verify<IFCCCoverletConsoleExecutor>(fccExeProvider => fccExeProvider.Initialize("appDataFolder"));
+            var ct = CancellationToken.None;
+            coverletConsoleUtil.Initialize("appDataFolder", ct);
+            mocker.Verify<IFCCCoverletConsoleExecutor>(fccExeProvider => fccExeProvider.Initialize("appDataFolder", ct));
         }
 
         [TestCase(0)]

FineCodeCoverageTests/CoverletDataCollectorUtil_Initialize_Tests.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading;
 using AutoMoq;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Coverlet;
@@ -22,14 +23,15 @@ public void SetUp()
         [Test]
         public void Should_Ensure_Unzipped_And_Sets_The_Quoted_TestAdapterPathArg()
         {
+            var ct = CancellationToken.None;
             var zipDetails = new ZipDetails { Path = "path", Version = "version" };
             var mockToolZipProvider = mocker.GetMock<IToolZipProvider>();
             mockToolZipProvider.Setup(zp => zp.ProvideZip(CoverletDataCollectorUtil.zipPrefix)).Returns(zipDetails);
 
             var mockToolFolder = mocker.GetMock<IToolFolder>();
-            mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", CoverletDataCollectorUtil.zipDirectoryName, zipDetails)).Returns("zipdestination");
+            mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", CoverletDataCollectorUtil.zipDirectoryName, zipDetails,ct)).Returns("zipdestination");
 
-            coverletDataCollector.Initialize("appdatafolder");
+            coverletDataCollector.Initialize("appdatafolder",ct);
             Assert.AreEqual($@"""{Path.Combine("zipdestination", "build", "netstandard1.0")}""", coverletDataCollector.TestAdapterPathArg);
 
         }