Merge pull request #352 from MihaZupan/master

Add code coverage
xoofx · Jul 3, 2019 · 3106a49 · 3106a49
2 parents ea6592b + a47a689
commit 3106a49
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 53 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,8 @@ install:
 - ps: >-
     cd src
 
+    dotnet tool install -g coveralls.net --version 1.0.0
+
     nuget restore Markdig.sln
 
     $env:MARKDIG_BUILD_NUMBER = ([int]$env:APPVEYOR_BUILD_NUMBER).ToString("000")
@@ -31,11 +33,24 @@ build:
   project: src/Markdig.sln
   verbosity: minimal
 
-after_build:
+after_build: >
+  dotnet SpecFileGen/bin/Release/netcoreapp2.2/SpecFileGen.dll
+
+test_script:
 - cmd: >-
-    dotnet run --project SpecFileGen/SpecFileGen.csproj -c Release
+    dotnet test Markdig.Tests -c Release --no-build
+
+    dotnet test Markdig.Tests -c Debug
 
-    dotnet test -v n Markdig.Tests
+    dotnet test Markdig.Tests -c Release -f netcoreapp2.1 /p:CollectCoverage=true /p:Include=\"[Markdig]*\" /p:CoverletOutputFormat=opencover /p:CoverletOutput=../../coverage.xml
+
+after_test:
+- ps: >-
+    if($env:APPVEYOR_REPO_BRANCH -eq "master") {
+      cd ..
+      csmacnz.Coveralls --opencover -i coverage.xml
+      cd src
+    }
 
 before_package:
 - cmd: >-

diff --git a/src/Markdig.Tests/Markdig.Tests.csproj b/src/Markdig.Tests/Markdig.Tests.csproj
@@ -6,8 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
   </ItemGroup>
 

diff --git a/src/Markdig/Helpers/CharacterMap.cs b/src/Markdig/Helpers/CharacterMap.cs
@@ -118,20 +118,11 @@ public CharacterMap(IEnumerable<KeyValuePair<char, T>> maps)
         public int IndexOfOpeningCharacter(string text, int start, int end)
         {
             var maxChar = isOpeningCharacter.Length;
-#if SUPPORT_UNSAFE
+
             unsafe
-#endif
             {
-#if SUPPORT_FIXED_STRING
-            fixed (char* pText = text)
-#else
-                var pText = text;
-#endif
-#if SUPPORT_UNSAFE
+                fixed (char* pText = text)
                 fixed (bool* openingChars = isOpeningCharacter)
-#else
-                var openingChars = isOpeningCharacter;
-#endif
                 {
                     if (nonAsciiMap == null)
                     {

diff --git a/src/Markdig/Markdig.targets b/src/Markdig/Markdig.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Description>A fast, powerful, CommonMark compliant, extensible Markdown processor for .NET with 20+ builtin extensions (pipetables, footnotes, definition lists... etc.)</Description>
@@ -12,51 +12,19 @@
     <PackageLicenseExpression>BSD-2-Clause</PackageLicenseExpression>
     <PackageIconUrl>https://raw.githubusercontent.com/lunet-io/markdig/master/img/markdig.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/lunet-io/markdig</PackageProjectUrl>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.0</NetStandardImplicitPackageVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'portable40-net40+sl5+win8+wp8+wpa81' ">
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
-    <DefineConstants>$(DefineConstants);SUPPORT_FIXED_STRING;SUPPORT_UNSAFE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);SUPPORT_FIXED_STRING;SUPPORT_UNSAFE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);SUPPORT_FIXED_STRING;SUPPORT_UNSAFE</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);SUPPORT_FIXED_STRING;SUPPORT_UNSAFE;NETCORE</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == ''">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)' == ''">10.0.10240.0</TargetPlatformMinVersion>
-    <DefineConstants>$(DefineConstants);NETSTANDARD_11;SUPPORT_UNSAFE</DefineConstants>
+    <DefineConstants>$(DefineConstants);UAP</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/Markdig/Markdown.cs b/src/Markdig/Markdown.cs
@@ -17,7 +17,7 @@ namespace Markdig
     /// </summary>
     public static partial class Markdown
     {
-#if NETSTANDARD_11
+#if UAP
         public static readonly string Version = typeof(Markdown).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
 #else
         public static readonly string Version = ((AssemblyFileVersionAttribute) typeof(Markdown).Assembly.GetCustomAttributes(typeof(AssemblyFileVersionAttribute), false)[0]).Version;

diff --git a/src/SpecFileGen/Program.cs b/src/SpecFileGen/Program.cs
@@ -103,12 +103,12 @@ static void Main()
                     continue;
                 }
 
-                string source = ParseSpecification(spec, File.ReadAllText(spec.Path));
+                string source = ParseSpecification(spec, File.ReadAllText(spec.Path)).Replace("\r\n", "\n", StringComparison.Ordinal);
                 totalTests += spec.TestCount;
 
                 if (File.Exists(spec.OutputPath))  // If the source hasn't changed, don't bump the generated tag
                 {
-                    string previousSource = File.ReadAllText(spec.OutputPath);
+                    string previousSource = File.ReadAllText(spec.OutputPath).Replace("\r\n", "\n", StringComparison.Ordinal);
                     int start = previousSource.IndexOf('\n', StringComparison.Ordinal) + 1;
                     int previousLength = previousSource.Length - start;
                     if (start != 0 && previousLength == source.Length)