diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 0204894..d2d7541 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -47,8 +47,7 @@ jobs:
- name: Run Unit Tests
run: |
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
- dotnet test "SecurityService.UnitTests\SecurityService.UnitTests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=unit-test-results.trx"
-
+ dotnet test "SecurityService.UnitTests\SecurityService.UnitTests.csproj" --configuration Release --no-build --verbosity normal -- --report-trx
- name: Build Docker Images
run: |
@@ -56,30 +55,47 @@ jobs:
- name: Run Integration Tests (Non UI)
run: |
- dotnet test "SecurityService.IntegrationTests\SecurityService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=nonui-test-results.trx"
+ dotnet test "SecurityService.IntegrationTests\SecurityService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --results-directory "${{ github.workspace }}/TestResults" --settings "SecurityService.IntegrationTests/Integration.runsettings"
- uses: actions/upload-artifact@v4
with:
name: nonuilogs
path: /home/runner/trace/
- - name: Publish test results
+ - name: Publish unit test results
uses: dorny/test-reporter@v1
if: always()
with:
- name: Unit and NonUI Test Results
+ name: Unit Test Results
path: '**/TestResults/*.trx'
reporter: dotnet-trx
fail-on-error: true
-
+
+ - name: Publish integration test results
+ uses: dorny/test-reporter@v1
+ if: always()
+ with:
+ name: Non-UI Integration Test Results
+ path: 'TestResults/**/*.xml'
+ reporter: dotnet-nunit
+ fail-on-error: true
+
- name: Upload test results
uses: actions/upload-artifact@v4
if: always()
with:
- name: ui-nonui-test-results
+ name: unit-test-results
path: '**/TestResults/*.trx'
retention-days: 30
+ - name: Upload integration test results
+ uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: nonui-test-results
+ path: 'TestResults/**/*.xml'
+ retention-days: 30
+
buildfirefox:
name: "Build and Unit Test Pull Requests - Firefox UI"
env:
@@ -123,20 +139,20 @@ jobs:
env:
Browser: Firefox
run: |
- dotnet test "SecurityService.OpenIdConnect.IntegrationTests\SecurityService.OpenIdConnect.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=firefoxui-test-results.trx"
+ dotnet test "SecurityService.OpenIdConnect.IntegrationTests\SecurityService.OpenIdConnect.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --results-directory "${{ github.workspace }}/TestResults" --settings "SecurityService.OpenIdConnect.IntegrationTests/Integration.runsettings"
- uses: actions/upload-artifact@v4
with:
name: firefoxlogs
path: /home/runner/trace/
- - name: Publish test results
+ - name: Publish integration test results
uses: dorny/test-reporter@v1
if: always()
with:
name: Integration Test Results
- path: '**/TestResults/*.trx'
- reporter: dotnet-trx
+ path: 'TestResults/**/*.xml'
+ reporter: dotnet-nunit
fail-on-error: true
- name: Upload test results
@@ -144,7 +160,7 @@ jobs:
if: always()
with:
name: integration-test-results
- path: '**/TestResults/*.trx'
+ path: 'TestResults/**/*.xml'
retention-days: 30
buildchromeui:
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4973e8e..97156cb 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,56 +1,57 @@
- true
+ true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SecurityService.IntegrationTests/Integration.runsettings b/SecurityService.IntegrationTests/Integration.runsettings
new file mode 100644
index 0000000..baf0194
--- /dev/null
+++ b/SecurityService.IntegrationTests/Integration.runsettings
@@ -0,0 +1,6 @@
+
+
+ Integration
+ UseResultDirectory
+
+
diff --git a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
index 2489cd7..634c08f 100644
--- a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
+++ b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
@@ -4,6 +4,8 @@
net10.0
false
+ true
+ Exe
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Integration.runsettings b/SecurityService.OpenIdConnect.IntegrationTests/Integration.runsettings
new file mode 100644
index 0000000..baf0194
--- /dev/null
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Integration.runsettings
@@ -0,0 +1,6 @@
+
+
+ Integration
+ UseResultDirectory
+
+
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
index dd8ef58..8a06978 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
+++ b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
@@ -4,6 +4,8 @@
net10.0
false
+ true
+ Exe
diff --git a/SecurityService.UnitTests/SecurityService.UnitTests.csproj b/SecurityService.UnitTests/SecurityService.UnitTests.csproj
index a742452..b758f62 100644
--- a/SecurityService.UnitTests/SecurityService.UnitTests.csproj
+++ b/SecurityService.UnitTests/SecurityService.UnitTests.csproj
@@ -4,6 +4,7 @@
enable
enable
false
+ Exe
@@ -12,6 +13,7 @@
+
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..3140116
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+ "test": {
+ "runner": "Microsoft.Testing.Platform"
+ }
+}