Update to create separate test coverage script and incorporate into pipeline

Author: LeeGathercole

.github/actions/perform-static-analysis/action.yaml

@@ -48,10 +48,7 @@ runs:
     - name: Build and analyze
       shell: bash
       run: |
-        echo "${{ inputs.sonar_project_key }}"
-        echo "${{ inputs.sonar_organisation_key }}"
-        echo "${{ inputs.sonar_token }}"
-        ./.sonar/scanner/dotnet-sonarscanner begin /k:"${{ inputs.sonar_project_key }}" /o:"${{ inputs.sonar_organisation_key }}" /d:sonar.token="${{ inputs.sonar_token }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="coverage.xml" /d:sonar.typescript.lcov.reportsPaths="src/web/coverage/lcov.info" /d:sonar.lang.patterns.ts=**/*.ts,**/*.tsx,**/*.cts,**/*.mts /d:sonar.lang.patterns.js=**/*.js,**/*.jsx,**/*.cjs,**/*.mjs,**/*.vue /d:sonar.javascript.enabled=false
-        dotnet build src/ServiceLayer.sln
-        ./.sonar/scanner/dotnet-coverage collect -f xml -o coverage.xml dotnet test src/ServiceLayer.sln
-        ./.sonar/scanner/dotnet-sonarscanner end /d:sonar.token="${{ inputs.sonar_token }}"
+        export SONAR_PROJECT_KEY="${{ inputs.sonar_project_key }}"
+        export SONAR_ORGANISATION_KEY="${{ inputs.sonar_organisation_key }}"
+        export SONAR_TOKEN="${{ inputs.sonar_token }}"
+        make test-coverage

scripts/tests/coverage.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+: "${SONAR_TOKEN:?SONAR_TOKEN is required}"
+: "${SONAR_PROJECT_KEY:?SONAR_PROJECT_KEY is required}"
+: "${SONAR_ORGANISATION_KEY:?SONAR_ORGANISATION_KEY is required}"
+
+SONAR_SCANNER="./.sonar/scanner/dotnet-sonarscanner"
+COVERAGE_FILES=$(find coverage -name '*.coverage.xml' | paste -sd "," -)
+
+$SONAR_SCANNER begin /k:"$SONAR_PROJECT_KEY" /o:"$SONAR_ORGANISATION_KEY" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="$COVERAGE_FILES"
+
+dotnet build src/ServiceLayer.sln
+
+make test-unit
+
+$SONAR_SCANNER end /d:sonar.token="$SONAR_TOKEN"

scripts/tests/unit.sh

@@ -4,11 +4,12 @@ set -euo pipefail
 COVERAGE_DIR="coverage"
 TEST_PROJECTS=$(find tests -name '*.csproj')
 
+rm -rf "$COVERAGE_DIR"
+mkdir -p "$COVERAGE_DIR"
+
 for proj in $TEST_PROJECTS; do
-  echo "🧪 Running tests for $proj..."
-  dotnet test "$proj" \
-    --collect:"XPlat Code Coverage" \
-    --results-directory "$COVERAGE_DIR/$(basename "$proj" .csproj)"
+  proj_name=$(basename "$proj" .csproj)
+  out_file="$COVERAGE_DIR/$proj_name.coverage.xml"
+  echo "🧪 Running coverage for $proj -> $out_file"
+  dotnet-coverage collect -f xml -o "$out_file" dotnet test "$proj"
 done
-
-echo "✅ All tests completed. Coverage reports in $COVERAGE_DIR/"