Merge pull request #7 from kysect/feat/code-cover

Enable code cover analyze
kysect · Feb 19, 2024 · fa1ed2f · fa1ed2f
2 parents 2a8c965 + 3183d90
commit fa1ed2f
Show file tree

Hide file tree

Showing 26 changed files with 102 additions and 112 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -0,0 +1,52 @@
+name: Build and test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ '*' ]
+
+
+env:
+  working-directory: Sources
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+  DOTNET_NOLOGO: true
+  dotnet-version: 8.0.x
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - run: git config --global core.autocrlf input
+    - uses: actions/checkout@v3
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ env.dotnet-version }}
+
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ${{ env.working-directory }}
+
+    - name: Build
+      run: dotnet build -c Release --no-restore --verbosity normal
+      working-directory: ${{ env.working-directory }}
+
+    - name: Test
+      run: dotnet test -c Release --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+      working-directory: ${{ env.working-directory }}
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+    # - name: Run mutation tests
+    #   run: |
+    #     dotnet tool restore
+    #     dotnet stryker --reporter dashboard
+    #   working-directory: ${{ env.working-directory }}
+    #   env:
+    #       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
diff --git a/.github/workflows/nuget-publish.yml → .github/workflows/nuget-publish.yaml b/.github/workflows/nuget-publish.yml → .github/workflows/nuget-publish.yaml
@@ -13,11 +13,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        working-directory: ${{ env.working-directory }}
-
     steps:
+    - run: git config --global core.autocrlf input
     - uses: actions/checkout@v3
 
     - name: Setup .NET
@@ -27,15 +24,24 @@ jobs:
 
     - name: Restore dependencies
       run: dotnet restore
+      working-directory: ${{ env.working-directory }}
 
     - name: Build
       run: dotnet build -c Release /p:ContinuousIntegrationBuild=true --no-restore --verbosity normal
+      working-directory: ${{ env.working-directory }}
 
     - name: Test
       run: dotnet test -c Release --no-build --verbosity normal
+      working-directory: ${{ env.working-directory }}
+
+    - name: Pack
+      run: dotnet pack --no-build
+      working-directory: ${{ env.working-directory }}
 
     - name: Publish to Nuget
       run: dotnet nuget push ${{ env.release-directory }}/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      working-directory: ${{ env.working-directory }}
 
     - name: Publish to Nuget symbols
-      run: dotnet nuget push ${{ env.release-directory }}/*.snupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      run: dotnet nuget push ${{ env.release-directory }}/*.snupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      working-directory: ${{ env.working-directory }}
diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props
@@ -1,14 +1,18 @@
 <Project>
-	<ItemGroup>
-		<PackageReference Include="Kysect.Editorconfig" />
-	</ItemGroup>
-	<PropertyGroup>
-		<UseArtifactsOutput>true</UseArtifactsOutput>
-		<Authors>Kysect</Authors>
-		<Company>Kysect</Company>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<DebugType>portable</DebugType>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-	</PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Kysect.Editorconfig" />
+  </ItemGroup>
+  <PropertyGroup>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <Authors>Kysect</Authors>
+    <Company>Kysect</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <DebugType>portable</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Copyright>Copyright (c) Kysect 2024</Copyright>
+    <RepositoryType>git</RepositoryType>
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
 </Project>
diff --git a/Sources/Directory.Packages.props b/Sources/Directory.Packages.props
@@ -3,17 +3,21 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Kysect.CommonLib" Version="0.1.14" />
-    <PackageVersion Include="Kysect.CommonLib.DependencyInjection" Version="0.1.14" />
-    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.6" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+    <PackageVersion Include="Kysect.CommonLib" Version="0.1.18" />
+    <PackageVersion Include="Kysect.CommonLib.DependencyInjection" Version="0.1.18" />
+    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.8" />
     <PackageVersion Include="Spectre.Console" Version="0.48.0" />
     <PackageVersion Include="Lunet.Extensions.Logging.SpectreConsole" Version="1.1.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.11.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
   </ItemGroup>
 </Project>
diff --git a/Sources/Kysect.TerminalUserInterface.Tests/GlobalUsings.cs b/Sources/Kysect.TerminalUserInterface.Tests/GlobalUsings.cs
@@ -0,0 +1,3 @@
+// Global using directives
+
+global using Xunit;
diff --git a/Sources/Kysect.TerminalUserInterface.Tests/Kysect.TerminalUserInterface.Tests.csproj b/Sources/Kysect.TerminalUserInterface.Tests/Kysect.TerminalUserInterface.Tests.csproj
@@ -7,26 +7,19 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>$(NoWarn);CS1591;CA1707</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <NoWarn>$(NoWarn);CS1591;CA1707</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NUnit.Analyzers" >
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" >
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.analyzers" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Sources/Kysect.TerminalUserInterface.Tests/TuiMenuNavigationBuilderTests.cs b/Sources/Kysect.TerminalUserInterface.Tests/TuiMenuNavigationBuilderTests.cs
@@ -1,21 +1,20 @@
 using FluentAssertions;
 using Kysect.TerminalUserInterface.Navigation;
 using Kysect.TerminalUserInterface.Tests.Mocks;
-using NUnit.Framework;
 
 namespace Kysect.TerminalUserInterface.Tests;
 
 public class TuiMenuNavigationBuilderTests
 {
-    private TuiMenuNavigationBuilder _builder;
+    private readonly TuiMenuNavigationBuilder _builder;
 
-    [SetUp]
-    public void Setup()
+    public TuiMenuNavigationBuilderTests()
     {
         _builder = new TuiMenuNavigationBuilder(new TestTuiMenuProvider());
+
     }
 
-    [Test]
+    [Fact]
     public void Build_WithMenuAndSubMenu_ReturnMenuWithCorrectElements()
     {
         TuiMenuNavigationItem menu = _builder

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Grids/IObjectGridViewDecomposer.cs b/Sources/Kysect.TerminalUserInterface/Controls/Grids/IObjectGridViewDecomposer.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Kysect.TerminalUserInterface.Controls.Grids;
+namespace Kysect.TerminalUserInterface.Controls.Grids;
 
 public interface IObjectGridViewDecomposer<T>
 {

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Grids/ObjectGridView.cs b/Sources/Kysect.TerminalUserInterface/Controls/Grids/ObjectGridView.cs
@@ -2,8 +2,6 @@
 using Kysect.TerminalUserInterface.Tools;
 using Spectre.Console;
 using Spectre.Console.Rendering;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Kysect.TerminalUserInterface.Controls.Grids;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Grids/ObjectGridViewAutoDecomposer.cs b/Sources/Kysect.TerminalUserInterface/Controls/Grids/ObjectGridViewAutoDecomposer.cs
@@ -1,6 +1,4 @@
 using Kysect.CommonLib.Reflection.TypeCache;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 namespace Kysect.TerminalUserInterface.Controls.Grids;

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Selection/CheckboxListControl.cs b/Sources/Kysect.TerminalUserInterface/Controls/Selection/CheckboxListControl.cs
@@ -2,7 +2,6 @@
 using Kysect.CommonLib.Reflection.TypeCache;
 using Kysect.TerminalUserInterface.Tools;
 using Spectre.Console;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace Kysect.TerminalUserInterface.Controls.Selection;

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Selection/DefaultSelectionPromptFactory.cs b/Sources/Kysect.TerminalUserInterface/Controls/Selection/DefaultSelectionPromptFactory.cs
@@ -1,6 +1,4 @@
 using Spectre.Console;
-using System;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.Controls.Selection;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Selection/SelectFileFromDirectoryControl.cs b/Sources/Kysect.TerminalUserInterface/Controls/Selection/SelectFileFromDirectoryControl.cs
@@ -1,7 +1,4 @@
-using System.IO;
-using System.Linq;
-
-namespace Kysect.TerminalUserInterface.Controls.Selection;
+namespace Kysect.TerminalUserInterface.Controls.Selection;
 
 public static class SelectFileFromDirectoryControl
 {

diff --git a/Sources/Kysect.TerminalUserInterface/Controls/Selection/SelectionPromptExtensions.cs b/Sources/Kysect.TerminalUserInterface/Controls/Selection/SelectionPromptExtensions.cs
@@ -1,6 +1,5 @@
 using Kysect.CommonLib.BaseTypes.Extensions;
 using Spectre.Console;
-using System;
 
 namespace Kysect.TerminalUserInterface.Controls.Selection;
 

diff --git a/Sources/Kysect.TerminalUserInterface/DependencyInjection/TuiMenuProvider.cs b/Sources/Kysect.TerminalUserInterface/DependencyInjection/TuiMenuProvider.cs
@@ -1,6 +1,5 @@
 using Kysect.TerminalUserInterface.Menu;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace Kysect.TerminalUserInterface.DependencyInjection;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Menu/ITuiMenu.cs b/Sources/Kysect.TerminalUserInterface/Menu/ITuiMenu.cs
@@ -1,5 +1,4 @@
 using Kysect.TerminalUserInterface.Commands;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.Menu;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Menu/TuiMainMenu.cs b/Sources/Kysect.TerminalUserInterface/Menu/TuiMainMenu.cs
@@ -1,6 +1,4 @@
 using Kysect.TerminalUserInterface.Commands;
-using System;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.Menu;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigationBuilder.cs b/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigationBuilder.cs
@@ -1,7 +1,5 @@
 using Kysect.CommonLib.BaseTypes.Extensions;
 using Kysect.TerminalUserInterface.Menu;
-using System;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.Navigation;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigationItem.cs b/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigationItem.cs
@@ -1,5 +1,4 @@
 using Kysect.TerminalUserInterface.Menu;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.Navigation;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigator.cs b/Sources/Kysect.TerminalUserInterface/Navigation/TuiMenuNavigator.cs
@@ -4,9 +4,6 @@
 using Kysect.TerminalUserInterface.Navigation.Commands;
 using Microsoft.Extensions.Logging;
 using Spectre.Console;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Kysect.TerminalUserInterface.Navigation;
 

diff --git a/Sources/Kysect.TerminalUserInterface/ProgressTracking/ItemProcessedColumn.cs b/Sources/Kysect.TerminalUserInterface/ProgressTracking/ItemProcessedColumn.cs
@@ -1,7 +1,6 @@
 using Kysect.CommonLib.BaseTypes.Extensions;
 using Spectre.Console;
 using Spectre.Console.Rendering;
-using System;
 
 namespace Kysect.TerminalUserInterface.ProgressTracking;
 

diff --git a/Sources/Kysect.TerminalUserInterface/ProgressTracking/SpectreConsoleProgressTracker.cs b/Sources/Kysect.TerminalUserInterface/ProgressTracking/SpectreConsoleProgressTracker.cs
@@ -1,8 +1,5 @@
 using Kysect.CommonLib.ProgressTracking;
 using Spectre.Console;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Kysect.TerminalUserInterface.ProgressTracking;
 

diff --git a/...ces/Kysect.TerminalUserInterface/ProgressTracking/SpectreConsoleProgressTrackerFactory.cs b/...ces/Kysect.TerminalUserInterface/ProgressTracking/SpectreConsoleProgressTrackerFactory.cs
@@ -1,6 +1,4 @@
 using Kysect.CommonLib.ProgressTracking;
-using System;
-using System.Collections.Generic;
 
 namespace Kysect.TerminalUserInterface.ProgressTracking;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Tools/TerminalGlobalConfigurator.cs b/Sources/Kysect.TerminalUserInterface/Tools/TerminalGlobalConfigurator.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 
 namespace Kysect.TerminalUserInterface.Tools;
 

diff --git a/Sources/Kysect.TerminalUserInterface/Tools/TerminalInterfaceFrameworkException.cs b/Sources/Kysect.TerminalUserInterface/Tools/TerminalInterfaceFrameworkException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Kysect.TerminalUserInterface.Tools;
+namespace Kysect.TerminalUserInterface.Tools;
 
 public class TerminalInterfaceFrameworkException : Exception
 {