Skip to content

Commit b7f5f32

Browse files
matthiasschnelteABBmatthiasschnelteABB
committed
merge upstream master . no success on build
2 parents 0e05965 + 89ff040 commit b7f5f32

File tree

91 files changed

+3617
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3617
-977
lines changed

‎FineCodeCoverage/FineCodeCoverage.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
<Link>Resources\LICENSE</Link>
7474
<IncludeInVSIX>true</IncludeInVSIX>
7575
</Content>
76+
<Content Include="..\Shared Files\Resources\dummyReportToProcess.html">
77+
<Link>Resources\dummyReportToProcess.html</Link>
78+
<IncludeInVSIX>true</IncludeInVSIX>
79+
</Content>
7680
<Content Include="..\Shared Files\Resources\reportparts.xml">
7781
<Link>Resources\reportparts.xml</Link>
7882
<IncludeInVSIX>true</IncludeInVSIX>
@@ -125,6 +129,9 @@
125129
<PackageReference Include="CliWrap">
126130
<Version>3.2.2</Version>
127131
</PackageReference>
132+
<PackageReference Include="EventAggregator.Net">
133+
<Version>1.2.0</Version>
134+
</PackageReference>
128135
<PackageReference Include="ExCSS">
129136
<Version>4.1.1</Version>
130137
</PackageReference>

‎FineCodeCoverage2022/FineCodeCoverage2022.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@
6565
<Link>OutputToolWindowPackage.vsct</Link>
6666
<ResourceName>Menus.ctmenu</ResourceName>
6767
</VSCTCompile>
68+
<Content Include="..\Shared Files\Resources\dummyReportToProcess.html">
69+
<Link>Resources\dummyReportToProcess.html</Link>
70+
<IncludeInVSIX>true</IncludeInVSIX>
71+
</Content>
6872
<Content Include="..\Shared Files\Resources\reportparts.xml">
6973
<Link>Resources\reportparts.xml</Link>
7074
<IncludeInVSIX>true</IncludeInVSIX>
@@ -115,6 +119,9 @@
115119
<PackageReference Include="CliWrap">
116120
<Version>3.2.2</Version>
117121
</PackageReference>
122+
<PackageReference Include="EventAggregator.Net">
123+
<Version>1.2.0</Version>
124+
</PackageReference>
118125
<PackageReference Include="ExCSS">
119126
<Version>4.1.1</Version>
120127
</PackageReference>

‎FineCodeCoverageTests/CoverageProject_Tests.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
using System.IO;
2-
using FineCodeCoverage.Core.Model;
3-
using NUnit.Framework;
4-
51
namespace Test
62
{
73
public class CoverageProject_Tests

‎FineCodeCoverageTests/CoverageUtilManager_Tests.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text;
5+
using System.Threading;
56
using System.Threading.Tasks;
67
using AutoMoq;
78
using FineCodeCoverage.Engine;
@@ -26,31 +27,31 @@ public void SetUp()
2627
public void Initialize_Should_Initialize_The_Coverage_Utils()
2728
{
2829
var coverageUtilManager = mocker.Create<CoverageUtilManager>();
29-
coverageUtilManager.Initialize("AppDataFolder");
30-
mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder"));
31-
mocker.Verify<IOpenCoverUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder"));
30+
var ct = CancellationToken.None;
31+
coverageUtilManager.Initialize("AppDataFolder", ct);
32+
mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder", ct));
33+
mocker.Verify<IOpenCoverUtil>(coverletUtil => coverletUtil.Initialize("AppDataFolder", ct));
3234
}
3335

34-
[TestCase(true, true)]
35-
[TestCase(true, false)]
36-
[TestCase(false, true)]
37-
[TestCase(false, false)]
38-
public void Should_Run_The_Appropriate_Cover_Tool_Based_On_IsDotNetSdkStyle(bool isDotNetSdkStyle, bool throwError)
36+
[TestCase(true)]
37+
[TestCase(false)]
38+
public async Task Should_Run_The_Appropriate_Cover_Tool_Based_On_IsDotNetSdkStyle(bool isDotNetSdkStyle)
3939
{
4040
var mockProject = new Mock<ICoverageProject>();
4141
mockProject.Setup(cp => cp.IsDotNetSdkStyle()).Returns(isDotNetSdkStyle);
4242
var mockedProject = mockProject.Object;
4343

4444
var coverageUtilManager = mocker.Create<CoverageUtilManager>();
45-
coverageUtilManager.RunCoverageAsync(mockedProject, throwError);
45+
var ct = CancellationToken.None;
46+
await coverageUtilManager.RunCoverageAsync(mockedProject, ct);
4647

4748
if (isDotNetSdkStyle)
4849
{
49-
mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.RunCoverletAsync(mockedProject, throwError));
50+
mocker.Verify<ICoverletUtil>(coverletUtil => coverletUtil.RunCoverletAsync(mockedProject, ct));
5051
}
5152
else
5253
{
53-
mocker.Verify<IOpenCoverUtil>(openCoverUtil => openCoverUtil.RunOpenCoverAsync(mockedProject, throwError));
54+
mocker.Verify<IOpenCoverUtil>(openCoverUtil => openCoverUtil.RunOpenCoverAsync(mockedProject, ct));
5455
}
5556
}
5657
}

‎FineCodeCoverageTests/CoverletConsole_Tests.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Threading;
45
using AutoMoq;
56
using FineCodeCoverage.Core.Utilities;
67
using FineCodeCoverage.Engine.Coverlet;
@@ -25,8 +26,9 @@ public void SetUp()
2526
[Test]
2627
public void Should_Initilize_IFCCCoverletConsoleExeProvider()
2728
{
28-
coverletConsoleUtil.Initialize("appDataFolder");
29-
mocker.Verify<IFCCCoverletConsoleExecutor>(fccExeProvider => fccExeProvider.Initialize("appDataFolder"));
29+
var ct = CancellationToken.None;
30+
coverletConsoleUtil.Initialize("appDataFolder", ct);
31+
mocker.Verify<IFCCCoverletConsoleExecutor>(fccExeProvider => fccExeProvider.Initialize("appDataFolder", ct));
3032
}
3133

3234
[TestCase(0)]

‎FineCodeCoverageTests/CoverletDataCollectorUtil_Initialize_Tests.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.IO;
2+
using System.Threading;
23
using AutoMoq;
34
using FineCodeCoverage.Core.Utilities;
45
using FineCodeCoverage.Engine.Coverlet;
@@ -22,14 +23,15 @@ public void SetUp()
2223
[Test]
2324
public void Should_Ensure_Unzipped_And_Sets_The_Quoted_TestAdapterPathArg()
2425
{
26+
var ct = CancellationToken.None;
2527
var zipDetails = new ZipDetails { Path = "path", Version = "version" };
2628
var mockToolZipProvider = mocker.GetMock<IToolZipProvider>();
2729
mockToolZipProvider.Setup(zp => zp.ProvideZip(CoverletDataCollectorUtil.zipPrefix)).Returns(zipDetails);
2830

2931
var mockToolFolder = mocker.GetMock<IToolFolder>();
30-
mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", CoverletDataCollectorUtil.zipDirectoryName, zipDetails)).Returns("zipdestination");
32+
mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", CoverletDataCollectorUtil.zipDirectoryName, zipDetails,ct)).Returns("zipdestination");
3133

32-
coverletDataCollector.Initialize("appdatafolder");
34+
coverletDataCollector.Initialize("appdatafolder",ct);
3335
Assert.AreEqual($@"""{Path.Combine("zipdestination", "build", "netstandard1.0")}""", coverletDataCollector.TestAdapterPathArg);
3436

3537
}

0 commit comments

Comments
 (0)