#43 - рассчёт покрытия через интеграционники

Author: Stepami

.github/workflows/develop.yml

@@ -52,15 +52,16 @@ jobs:
       - name: Build
         run: dotnet build /p:Version=${{ steps.version_step.outputs.fullSemVer }} --no-restore -c Release -v n
       - name: Unit Tests
+        run: dotnet test -c Release --no-build -v n --filter="Category=Unit"
+      - name: Integration Tests
         run: |
-          dotnet test -c Release ./tests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests.csproj --no-build -v n
-          dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --no-build -v n --filter="Category=Unit"
+          dotnet test -c Release /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --no-build -v n --filter="Category=Integration"
           mkdir coverage-report
       - name: Code Coverage Summary Report For Merge Request
         if: github.event_name == 'pull_request_target'
         uses: 5monkeys/cobertura-action@master
         with:
-          path: ./tests/HydraScript.UnitTests/coverage.cobertura.xml
+          path: ./tests/HydraScript.IntegrationTests/coverage.cobertura.xml
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           minimum_coverage: 20
           fail_below_threshold: true
@@ -72,16 +73,14 @@ jobs:
       - name: ReportGenerator
         uses: danielpalme/ReportGenerator-GitHub-Action@5.2.1
         with:
-          reports: './tests/HydraScript.UnitTests/coverage.cobertura.xml' 
+          reports: './tests/HydraScript.IntegrationTests/coverage.cobertura.xml' 
           targetdir: './coverage-report' 
       - name: Upload coverage report artifact
         if: github.event_name == 'push'
         uses: actions/upload-artifact@v4
         with:
           name: CoverageReport   
           path: coverage-report
-      - name: Integration Tests
-        run: dotnet test -c Release --no-build -v n --filter="Category=Integration"
       - name: Upload Windows Build
         if: github.ref != 'refs/heads/master' && github.event_name == 'push'
         uses: actions/upload-artifact@v4

tests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests/PatternGeneratorTests.cs

@@ -10,7 +10,7 @@ namespace HydraScript.Infrastructure.LexerRegexGenerator.UnitTests;
 
 public class PatternGeneratorTests(ITestOutputHelper output)
 {
-    [Fact]
+    [Fact, Trait("Category", "Unit")]
     public void Initialize_PatternContainerMarked_CorrectlyGenerated()
     {
         var provider = Substitute.For<ITokenTypesStreamProvider>();

tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj

@@ -9,6 +9,14 @@
         <PackageReference Include="MartinCostello.Logging.XUnit" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
         <PackageReference Include="Xunit.DependencyInjection" />
+        <PackageReference Include="coverlet.collector">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.msbuild">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

tests/HydraScript.UnitTests/HydraScript.UnitTests.csproj

@@ -2,14 +2,6 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" />
-        <PackageReference Include="coverlet.collector">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="coverlet.msbuild">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>