Include Integration tests in code coverage (#147)

* use "Code Coverage" * "Code Coverage" for pr pipeline * update test sdk and remove coverlet * wait 30s for func host to start * increase wait time for queue trigger test * decrease queue trigger wait time * temp disable queue test * use .net core 3.1.0 * change task order * skip integration tests temporarily * update to .net 5 * use .net 3.1 for azure functions * add settings file * update pr pipeline * fix runsettings file * edit runsettings file * add code coverage package * add split coverage setting * reenable queue test * decrease func host wait time * add cobertura format + pr comment * publish code coverage results * revert back to split coverage
Azure · Nov 5, 2021 · 97d0a10 · 97d0a10
1 parent bb550e8
commit 97d0a10
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/builds/azure-pipelines/template-steps-build-test-linux.yml b/builds/azure-pipelines/template-steps-build-test-linux.yml
@@ -6,7 +6,12 @@ parameters:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Install .NET Core SDK 3.1.x for Build'
+  displayName: 'Install .NET Core SDK 5.0.x for Running Tests'
+  inputs:
+    version: '5.0.x'
+
+- task: UseDotNet@2
+  displayName: 'Install .NET Core 3.1 SDK for Azure Functions Build'
   inputs:
     version: '3.1.x'
 
@@ -121,13 +126,7 @@ steps:
   inputs:
     command: test
     projects: '${{ parameters.solution }}'
-    arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=$(Build.ArtifactStagingDirectory)\TestResults\coverage\ /p:Exclude="[*]Microsoft.Azure.WebJobs.Extensions.Sql.Samples.*"'
-
-- task: PublishCodeCoverageResults@1
-  displayName: 'Publish Code Coverage Results'
-  inputs:
-    codeCoverageTool: Cobertura
-    summaryFileLocation: '$(Build.ArtifactStagingDirectory)/TestResults/coverage/coverage.cobertura.xml'
+    arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings'
 
 - script: |
     docker stop sql1

diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
@@ -117,10 +117,4 @@ steps:
   inputs:
     command: test
     projects: '${{ parameters.solution }}'
-    arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=$(Build.ArtifactStagingDirectory)\TestResults\coverage\ /p:Exclude="[*]Microsoft.Azure.WebJobs.Extensions.Sql.Samples.*"'
-
-- task: PublishCodeCoverageResults@1
-  displayName: 'Publish Code Coverage Results'
-  inputs:
-    codeCoverageTool: Cobertura
-    summaryFileLocation: '$(Build.ArtifactStagingDirectory)\TestResults\coverage\coverage.cobertura.xml'
+    arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings'
diff --git a/test/Integration/IntegrationTestBase.cs b/test/Integration/IntegrationTestBase.cs
@@ -181,7 +181,7 @@ protected void StartFunctionHost(string functionName, bool useTestFolder = false
             this.FunctionHost.BeginOutputReadLine();
             this.FunctionHost.BeginErrorReadLine();
 
-            Thread.Sleep(5000);     // This is just to give some time to func host to start, maybe there's a better way to do this (check if port's open?)
+            Thread.Sleep(10000);     // This is just to give some time to func host to start, maybe there's a better way to do this (check if port's open?)
         }
 
         private string GetFunctionsCoreToolsPath()

diff --git a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
@@ -7,12 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.14.3" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.13" />
   </ItemGroup>
 

diff --git a/test/coverage.runsettings b/test/coverage.runsettings
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+    <DataCollectionRunSettings>
+        <DataCollectors>
+            <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+                <Configuration>
+                    <SplitCoverage>True</SplitCoverage>
+                    <CodeCoverage>
+                        <ModulePaths>
+                            <Include>
+                                <ModulePath>.*\Microsoft.Azure.WebJobs.Extensions.Sql.dll$</ModulePath>
+                            </Include>
+                        </ModulePaths>
+                    </CodeCoverage>
+                </Configuration>
+            </DataCollector>
+        </DataCollectors>
+    </DataCollectionRunSettings>
+</RunSettings>