Skip to content

Commit dc69d25

Browse files
tonyhalletttonyhallett
authored
Merge pull request #382 from tonyhallett/opencover-custom-arguments
Opencover custom arguments
2 parents baf3bcc + 4ff7e15 commit dc69d25

28 files changed

+809
-222
lines changed

‎FineCodeCoverageTests/AppOptionsProvider_Tests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,10 @@ internal void Should_Use_Deseralized_String_From_Store_For_AppOption_Property(Fu
317317
{ nameof(IAppOptions.ShowToolWindowToolbar),true},
318318
{nameof(IAppOptions.ExcludeAssemblies),new string[]{ "Exclude"} },
319319
{nameof(IAppOptions.IncludeAssemblies),new string[]{ "Include"} },
320-
{nameof(IAppOptions.NamespaceQualification),NamespaceQualification.AlwaysUnqualified }
320+
{nameof(IAppOptions.NamespaceQualification),NamespaceQualification.AlwaysUnqualified },
321+
{nameof(IAppOptions.OpenCoverRegister),OpenCoverRegister.Default },
322+
{nameof(IAppOptions.OpenCoverTarget),"" },
323+
{nameof(IAppOptions.OpenCoverTargetArgs),"" }
321324
};
322325
var mockJsonConvertService = autoMocker.GetMock<IJsonConvertService>();
323326
mockJsonConvertService.Setup(

‎FineCodeCoverageTests/CoverletDataCollectorUtil_Initialize_Tests.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ public void SetUp()
2424
public void Should_Ensure_Unzipped_And_Sets_The_Quoted_TestAdapterPathArg()
2525
{
2626
var ct = CancellationToken.None;
27-
var zipDetails = new ZipDetails { Path = "path", Version = "version" };
28-
var mockToolZipProvider = mocker.GetMock<IToolZipProvider>();
29-
mockToolZipProvider.Setup(zp => zp.ProvideZip(CoverletDataCollectorUtil.zipPrefix)).Returns(zipDetails);
3027

31-
var mockToolFolder = mocker.GetMock<IToolFolder>();
32-
mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", CoverletDataCollectorUtil.zipDirectoryName, zipDetails,ct)).Returns("zipdestination");
28+
var mockToolFolder = mocker.GetMock<IToolUnzipper>();
29+
mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", "coverletCollector", "coverlet.collector",ct)).Returns("zipdestination");
3330

3431
coverletDataCollector.Initialize("appdatafolder",ct);
3532
Assert.AreEqual($@"""{Path.Combine("zipdestination", "build", "netstandard1.0")}""", coverletDataCollector.TestAdapterPathArg);

‎FineCodeCoverageTests/FineCodeCoverageTests.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,15 @@
131131
<Compile Include="MsCodeCoverage\UserRunSettingsService_AddFCCSettings_Tests.cs" />
132132
<Compile Include="MsCodeCoverage\UserRunSettingsService_Analysis_Tests.cs" />
133133
<Compile Include="MsCodeCoverage\RunSettingsTemplateReplacementsFactory_Tests.cs" />
134+
<Compile Include="OpenCoverExeArgumentsProvider_Tests.cs" />
135+
<Compile Include="OpenCoverUtil_Tests.cs" />
134136
<Compile Include="PackageLoader_Tests.cs" />
135137
<Compile Include="ShownToolWindowHistory_Tests.cs" />
136138
<Compile Include="Test helpers\MefOrderAssertions.cs" />
137139
<Compile Include="Test helpers\TestThreadHelper.cs" />
138140
<Compile Include="Test helpers\XmlAssert.cs" />
139141
<Compile Include="ToolFolder_Tests.cs" />
142+
<Compile Include="ToolUnzipper_Tests.cs" />
140143
<Compile Include="ToolZipProvider_Tests.cs" />
141144
<Compile Include="CoverletDataCollectorGeneratedCobertura_Tests.cs" />
142145
<Compile Include="CoverletDataCollectorUtil_CanUseDataCollector_Tests.cs" />

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Collect_Tests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ public async Task Should_Clean_Up_RunSettings_Coverage_Projects_From_IsCollectin
144144
private async Task RunAndProcessReportAsync(IEnumerable<Uri> resultsUris,string[] expectedCoberturaFiles)
145145
{
146146
autoMocker = new AutoMoqer();
147-
var mockToolFolder = autoMocker.GetMock<IToolFolder>();
148-
mockToolFolder.Setup(tf => tf.EnsureUnzipped(
147+
var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
148+
mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(
149+
It.IsAny<string>(),
149150
It.IsAny<string>(),
150151
It.IsAny<string>(),
151-
It.IsAny<ZipDetails>(),
152152
It.IsAny<CancellationToken>()
153153
)).Returns("ZipDestination");
154154

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ public void Should_Delegate_To_UserRunSettingsService_With_UserRunSettingsProjec
123123

124124
private string GetFCCMsTestAdapterPath()
125125
{
126-
autoMocker.GetMock<IToolFolder>()
126+
autoMocker.GetMock<IToolUnzipper>()
127127
.Setup(
128128
toolFolder => toolFolder.EnsureUnzipped(
129129
It.IsAny<string>(),
130130
It.IsAny<string>(),
131-
It.IsAny<ZipDetails>(),
131+
It.IsAny<string>(),
132132
It.IsAny<CancellationToken>())
133133
)
134134
.Returns("ZipDestination");

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Initialize_Tests.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ public void Should_Ensure_Microsoft_CodeCoverage_Is_Unzipped_To_The_Tool_Folder(
1616

1717
var cancellationToken = CancellationToken.None;
1818

19-
var zipDetails = new ZipDetails();
20-
var mockToolZipProvider = autoMocker.GetMock<IToolZipProvider>();
21-
mockToolZipProvider.Setup(toolZipProvider => toolZipProvider.ProvideZip("microsoft.codecoverage")).Returns(zipDetails);
22-
23-
var mockToolFolder = autoMocker.GetMock<IToolFolder>();
24-
mockToolFolder.Setup(toolFolder =>
25-
toolFolder.EnsureUnzipped("AppDataFolder", "msCodeCoverage", zipDetails, cancellationToken)).Returns("ZipDestination");
19+
var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
20+
mockToolUnzipper.Setup(toolFolder =>
21+
toolFolder.EnsureUnzipped("AppDataFolder", "msCodeCoverage", "microsoft.codecoverage", cancellationToken)).Returns("ZipDestination");
2622

2723
msCodeCoverageRunSettingsService.Initialize("AppDataFolder", null, cancellationToken);
28-
mockToolFolder.VerifyAll();
24+
mockToolUnzipper.VerifyAll();
2925
}
3026
}
3127
}

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public void Should_StopCoverage_On_FCCEngine()
2525
{
2626
var autoMocker = new AutoMoqer();
2727

28-
var mockToolFolder = autoMocker.GetMock<IToolFolder>();
29-
mockToolFolder.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<ZipDetails>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
28+
var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
29+
mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
3030

3131
var msCodeCoverageRunSettingsService = autoMocker.Create<MsCodeCoverageRunSettingsService>();
3232
var mockFccEngine = new Mock<IFCCEngine>();
@@ -521,8 +521,8 @@ private string InitializeShimPath()
521521

522522
private void InitializeZipDestination()
523523
{
524-
var mockToolFolder = autoMocker.GetMock<IToolFolder>();
525-
mockToolFolder.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<ZipDetails>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
524+
var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
525+
mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
526526
msCodeCoverageRunSettingsService.Initialize(null, null, CancellationToken.None);
527527
}
528528

‎FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplateReplacementsFactory_Tests.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,5 +702,8 @@ internal class TestCoverageProjectOptions : IAppOptions
702702
public string[] IncludeAssemblies { get; set; }
703703
public bool DisabledNoCoverage { get; set; }
704704
public NamespaceQualification NamespaceQualification { get; set; }
705+
public OpenCoverRegister OpenCoverRegister { get; set; }
706+
public string OpenCoverTarget { get; set; }
707+
public string OpenCoverTargetArgs { get; set; }
705708
}
706709
}

0 commit comments

Comments
 (0)