Merge pull request #426 from tmenier/feature/add_coverage

Feature/add coverage

.gitignore

@@ -13,3 +13,4 @@ publish
 TestResult.xml
 *.bak
 .idea
+lcov.info

Build/build.cmd

@@ -3,10 +3,10 @@
 @call dotnet restore -v m ../
 
 @if ERRORLEVEL 1 (
-echo Error! Restoring dependicies failed.
+echo Error! Restoring dependencies failed.
 exit /b 1
 ) else (
-echo Restoring dependicies was successful.
+echo Restoring dependencies was successful.
 )
 
 @set project=..\src\Flurl.Http.CodeGen\Flurl.Http.CodeGen.csproj

Build/test.cmd

@@ -1,3 +1,5 @@
-@cd ..\test\Flurl.Test\
+@call dotnet test -c Release /p:CollectCoverage=true /p:Threshold=75 /p:Exclude="[NUnit3.*]*" ..\test\Flurl.Test\
-@call dotnet test -c Release
+@if ERRORLEVEL 1 (
-@cd ..\..\Build\
+echo Error! Tests for Flurl failed.
+exit /b 1
+)

Build/test.coverage.cmd

@@ -0,0 +1 @@
+dotnet test -c Release /p:CollectCoverage=true /p:Threshold=75 /p:Exclude="[NUnit3.*]*" /p:CoverletOutputFormat=lcov /p:CoverletOutput=../../lcov ../test/Flurl.Test/

Build/test.coverage.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo "!!WARNING!! This script generates test coverage file and runs tests for netstandard and netcoreapp targets"
+
+dotnet test -c Release /p:CollectCoverage=true /p:Threshold=75 \
+/p:Exclude="[NUnit3.*]*" \
+/p:CoverletOutputFormat=lcov /p:CoverletOutput="${SCRIPT_ROOT}/../../lcov" \
+"${SCRIPT_ROOT}/../test/Flurl.Test/"

Build/test.sh

@@ -3,4 +3,8 @@ set -euo pipefail
 
 SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-dotnet test -c Release "${SCRIPT_ROOT}/../Test/Flurl.Test/"
+echo "!!WARNING!! This script for pipeline test running and checking code coverage for netstandard and netcoreapp targets"
+
+dotnet test -c Release /p:CollectCoverage=true /p:Threshold=75 \
+/p:Exclude="[NUnit3.*]*" \
+"${SCRIPT_ROOT}/../test/Flurl.Test/"

Test/Flurl.Test/Flurl.Test.csproj

@@ -6,6 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.5.1">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />

src/Flurl.Http/Flurl.Http.csproj

@@ -10,7 +10,6 @@
     <Description>A fluent, portable, testable HTTP client library.</Description>
     <PackageProjectUrl>https://flurl.io</PackageProjectUrl>
     <PackageIconUrl>https://pbs.twimg.com/profile_images/534024476296376320/IuPGZ_bX_400x400.png</PackageIconUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/tmenier/Flurl/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/tmenier/Flurl.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>httpclient rest json http fluent url uri tdd assert async</PackageTags>

src/Flurl/Flurl.csproj

@@ -10,7 +10,6 @@
     <Description>A fluent, portable URL builder. To make HTTP calls off the fluent chain, check out Flurl.Http.</Description>
     <PackageProjectUrl>https://flurl.io</PackageProjectUrl>
     <PackageIconUrl>https://pbs.twimg.com/profile_images/534024476296376320/IuPGZ_bX_400x400.png</PackageIconUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/tmenier/Flurl/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/tmenier/Flurl.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>fluent url uri querystring builder</PackageTags>