Merge pull request #382 from tonyhallett/opencover-custom-arguments

Opencover custom arguments
FortuneN · Jan 17, 2024 · dc69d25 · dc69d25
2 parents baf3bcc + 4ff7e15
commit dc69d25
Show file tree

Hide file tree

Showing 28 changed files with 809 additions and 222 deletions.
diff --git a/FineCodeCoverageTests/AppOptionsProvider_Tests.cs b/FineCodeCoverageTests/AppOptionsProvider_Tests.cs
@@ -317,7 +317,10 @@ internal void Should_Use_Deseralized_String_From_Store_For_AppOption_Property(Fu
  { nameof(IAppOptions.ShowToolWindowToolbar),true},
  {nameof(IAppOptions.ExcludeAssemblies),new string[]{ "Exclude"} },
  {nameof(IAppOptions.IncludeAssemblies),new string[]{ "Include"} },
- {nameof(IAppOptions.NamespaceQualification),NamespaceQualification.AlwaysUnqualified }
+ {nameof(IAppOptions.NamespaceQualification),NamespaceQualification.AlwaysUnqualified },
+ {nameof(IAppOptions.OpenCoverRegister),OpenCoverRegister.Default },
+ {nameof(IAppOptions.OpenCoverTarget),"" },
+ {nameof(IAppOptions.OpenCoverTargetArgs),"" }
  };
  var mockJsonConvertService = autoMocker.GetMock<IJsonConvertService>();
  mockJsonConvertService.Setup(

diff --git a/FineCodeCoverageTests/CoverletDataCollectorUtil_Initialize_Tests.cs b/FineCodeCoverageTests/CoverletDataCollectorUtil_Initialize_Tests.cs
@@ -24,12 +24,9 @@ public void SetUp()
  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,ct)).Returns("zipdestination");
+ var mockToolFolder = mocker.GetMock<IToolUnzipper>();
+ mockToolFolder.Setup(cf => cf.EnsureUnzipped("appdatafolder", "coverletCollector", "coverlet.collector",ct)).Returns("zipdestination");
 
  coverletDataCollector.Initialize("appdatafolder",ct);
  Assert.AreEqual($@"""{Path.Combine("zipdestination", "build", "netstandard1.0")}""", coverletDataCollector.TestAdapterPathArg);

diff --git a/FineCodeCoverageTests/FineCodeCoverageTests.csproj b/FineCodeCoverageTests/FineCodeCoverageTests.csproj
@@ -131,12 +131,15 @@
  <Compile Include="MsCodeCoverage\UserRunSettingsService_AddFCCSettings_Tests.cs" />
  <Compile Include="MsCodeCoverage\UserRunSettingsService_Analysis_Tests.cs" />
  <Compile Include="MsCodeCoverage\RunSettingsTemplateReplacementsFactory_Tests.cs" />
+ <Compile Include="OpenCoverExeArgumentsProvider_Tests.cs" />
+ <Compile Include="OpenCoverUtil_Tests.cs" />
  <Compile Include="PackageLoader_Tests.cs" />
  <Compile Include="ShownToolWindowHistory_Tests.cs" />
  <Compile Include="Test helpers\MefOrderAssertions.cs" />
  <Compile Include="Test helpers\TestThreadHelper.cs" />
  <Compile Include="Test helpers\XmlAssert.cs" />
  <Compile Include="ToolFolder_Tests.cs" />
+ <Compile Include="ToolUnzipper_Tests.cs" />
  <Compile Include="ToolZipProvider_Tests.cs" />
  <Compile Include="CoverletDataCollectorGeneratedCobertura_Tests.cs" />
  <Compile Include="CoverletDataCollectorUtil_CanUseDataCollector_Tests.cs" />

diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Collect_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Collect_Tests.cs
@@ -144,11 +144,11 @@ public async Task Should_Clean_Up_RunSettings_Coverage_Projects_From_IsCollectin
  private async Task RunAndProcessReportAsync(IEnumerable<Uri> resultsUris,string[] expectedCoberturaFiles)
  {
  autoMocker = new AutoMoqer();
- var mockToolFolder = autoMocker.GetMock<IToolFolder>();
- mockToolFolder.Setup(tf => tf.EnsureUnzipped(
+ var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
+ mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(
+ It.IsAny<string>(), 
  It.IsAny<string>(), 
  It.IsAny<string>(), 
- It.IsAny<ZipDetails>(), 
  It.IsAny<CancellationToken>()
  )).Returns("ZipDestination");
 

diff --git a/...overageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs b/...overageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs
@@ -123,12 +123,12 @@ public void Should_Delegate_To_UserRunSettingsService_With_UserRunSettingsProjec
 
  private string GetFCCMsTestAdapterPath()
  {
- autoMocker.GetMock<IToolFolder>()
+ autoMocker.GetMock<IToolUnzipper>()
  .Setup(
  toolFolder => toolFolder.EnsureUnzipped(
  It.IsAny<string>(),
  It.IsAny<string>(),
- It.IsAny<ZipDetails>(),
+ It.IsAny<string>(),
  It.IsAny<CancellationToken>())
  )
  .Returns("ZipDestination");

diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Initialize_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Initialize_Tests.cs
@@ -16,16 +16,12 @@ public void Should_Ensure_Microsoft_CodeCoverage_Is_Unzipped_To_The_Tool_Folder(
 
  var cancellationToken = CancellationToken.None;
 
- var zipDetails = new ZipDetails();
- var mockToolZipProvider = autoMocker.GetMock<IToolZipProvider>();
- mockToolZipProvider.Setup(toolZipProvider => toolZipProvider.ProvideZip("microsoft.codecoverage")).Returns(zipDetails);
-
- var mockToolFolder = autoMocker.GetMock<IToolFolder>();
- mockToolFolder.Setup(toolFolder => 
- toolFolder.EnsureUnzipped("AppDataFolder", "msCodeCoverage", zipDetails, cancellationToken)).Returns("ZipDestination");
+ var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
+ mockToolUnzipper.Setup(toolFolder => 
+ toolFolder.EnsureUnzipped("AppDataFolder", "msCodeCoverage", "microsoft.codecoverage", cancellationToken)).Returns("ZipDestination");
 
  msCodeCoverageRunSettingsService.Initialize("AppDataFolder", null, cancellationToken);
- mockToolFolder.VerifyAll();
+ mockToolUnzipper.VerifyAll();
  }
  }
 }
diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs
@@ -25,8 +25,8 @@ public void Should_StopCoverage_On_FCCEngine()
  {
  var autoMocker = new AutoMoqer();
 
- var mockToolFolder = autoMocker.GetMock<IToolFolder>();
- mockToolFolder.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<ZipDetails>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
+ var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
+ mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
 
  var msCodeCoverageRunSettingsService = autoMocker.Create<MsCodeCoverageRunSettingsService>();
  var mockFccEngine = new Mock<IFCCEngine>();
@@ -521,8 +521,8 @@ private string InitializeShimPath()
 
  private void InitializeZipDestination()
  {
- var mockToolFolder = autoMocker.GetMock<IToolFolder>();
- mockToolFolder.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<ZipDetails>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
+ var mockToolUnzipper = autoMocker.GetMock<IToolUnzipper>();
+ mockToolUnzipper.Setup(tf => tf.EnsureUnzipped(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns("ZipDestination");
  msCodeCoverageRunSettingsService.Initialize(null, null, CancellationToken.None);
  }
 

diff --git a/FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplateReplacementsFactory_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplateReplacementsFactory_Tests.cs
@@ -702,5 +702,8 @@ internal class TestCoverageProjectOptions : IAppOptions
  public string[] IncludeAssemblies { get; set; }
  public bool DisabledNoCoverage { get; set; }
  public NamespaceQualification NamespaceQualification { get; set; }
+ public OpenCoverRegister OpenCoverRegister { get; set; }
+ public string OpenCoverTarget { get; set; }
+ public string OpenCoverTargetArgs { get; set; }
  }
 }