From 36f5b3b1eb5066e428b4cf8a5d0a5de48b63fbf0 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 13:52:05 +0100 Subject: [PATCH 01/14] update shared nugets and fix persistent subscription connection issue --- Directory.Packages.props | 72 +++++++++---------- .../Bootstrapper/SerialiserRegistry.cs | 10 ++- 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0f76735..a288a32 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,61 +3,61 @@ true - - - - - - - + + + + + + + - - + + - - + + - - - - - - + + + + + + - - - + + + - - + + - - + + - - - + + + - - + + - - - - - + + + + + - - + + \ No newline at end of file diff --git a/MessagingService/Bootstrapper/SerialiserRegistry.cs b/MessagingService/Bootstrapper/SerialiserRegistry.cs index 315f07d..e82def1 100644 --- a/MessagingService/Bootstrapper/SerialiserRegistry.cs +++ b/MessagingService/Bootstrapper/SerialiserRegistry.cs @@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Lamar; using Microsoft.Extensions.DependencyInjection; +using Shared.EventStore.SubscriptionWorker; using Shared.Serialisation; namespace MessagingService.Bootstrapper; @@ -14,6 +15,13 @@ public SerialiserRegistry() this.AddSingleton(); this.AddSingleton>(_ => obj => StringSerialiser.Serialise(obj)); this.AddSingleton>(_ => (str, type) => StringSerialiser.DeserializeObject(str, type)); - this.AddSingleton(SystemTextJsonSerializer.GetDefaultJsonSerializerOptions()); + var serialiserSettings = SystemTextJsonSerializer.GetDefaultJsonSerializerOptions().AddModifier(JsonTypeInfoModifierExtensions.ForType(typeInfo => { + typeInfo.RenameProperty(x => x.StreamName, "eventStreamId"); + })); + + this.AddSingleton(serialiserSettings); + + + } } \ No newline at end of file From 02d17a5535d7b9fcef3416310d4066d349083902 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 14:58:08 +0100 Subject: [PATCH 02/14] fix test failures --- global.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 global.json 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" + } +} From 93d4ce7d9443b02b363a212e6b34cf5625fbc8b5 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 15:09:51 +0100 Subject: [PATCH 03/14] another test fix --- .../MessagingService.IntegrationTests.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index 5de79ba..76f726b 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -3,6 +3,8 @@ net10.0 false + true + Exe From 8e17cb911701173fefdf6ed8361152f309890b9c Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 15:50:33 +0100 Subject: [PATCH 04/14] :| --- .github/workflows/pullrequest.yml | 10 +++++----- Directory.Packages.props | 3 ++- .../MessagingService.BusinessLogic.Tests.csproj | 2 ++ .../MessagingService.EmailAggregate.Tests.csproj | 2 ++ .../MessagingService.SMSAggregate.Tests.csproj | 2 ++ MessagingService.Tests/MessagingService.Tests.csproj | 2 ++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 7d43d58..45d0cf4 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -25,10 +25,10 @@ jobs: - name: Run Unit Tests run: | echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" - dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=businesslogic-test-results.trx" - dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=email-aggregate-test-results.trx" - dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=sms-aggregate-test-results.trx" - #dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=service-test-results.trx" + dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --no-build --verbosity normal + dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal + dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal + #dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" --configuration Release --no-build --verbosity normal - name: Build Docker Image env: @@ -36,7 +36,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=integration-test-results.trx" + run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal - uses: actions/upload-artifact@v4.4.0 with: diff --git a/Directory.Packages.props b/Directory.Packages.props index a288a32..21ecfcb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,6 +13,7 @@ + @@ -60,4 +61,4 @@ - \ No newline at end of file + diff --git a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj index 5263111..6e68a9b 100644 --- a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj +++ b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj @@ -4,12 +4,14 @@ net10.0 None false + $(TestingPlatformCommandLineArguments) --report-trx + diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index 093dd98..942b8ec 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -4,10 +4,12 @@ net10.0 None false + $(TestingPlatformCommandLineArguments) --report-trx + diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj index 6a64d96..e59b747 100644 --- a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj +++ b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj @@ -4,10 +4,12 @@ net10.0 None false + $(TestingPlatformCommandLineArguments) --report-trx + diff --git a/MessagingService.Tests/MessagingService.Tests.csproj b/MessagingService.Tests/MessagingService.Tests.csproj index 4adcaee..0b14176 100644 --- a/MessagingService.Tests/MessagingService.Tests.csproj +++ b/MessagingService.Tests/MessagingService.Tests.csproj @@ -4,6 +4,7 @@ net10.0 None false + $(TestingPlatformCommandLineArguments) --report-trx @@ -11,6 +12,7 @@ + From a95b4c3b9793d15367f627cc3e54b0cfcd3c5640 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 16:07:51 +0100 Subject: [PATCH 05/14] :| --- .github/workflows/pullrequest.yml | 10 +++++----- .../MessagingService.IntegrationTests.csproj | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 45d0cf4..0c2663d 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -25,10 +25,10 @@ jobs: - name: Run Unit Tests run: | echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" - dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --no-build --verbosity normal - dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal - dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal - #dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" --configuration Release --no-build --verbosity normal + dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal + #dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" --configuration Release --verbosity normal - name: Build Docker Image env: @@ -36,7 +36,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal + run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal - uses: actions/upload-artifact@v4.4.0 with: diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index 76f726b..2ae8914 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -5,6 +5,7 @@ false true Exe + $(TestingPlatformCommandLineArguments) --report-trx From 695d59aabf797bab13a0f47e0aa0013b71a48559 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 16:15:50 +0100 Subject: [PATCH 06/14] trigger CI --- .github/workflows/pullrequest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 0c2663d..3cc2dde 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -27,8 +27,7 @@ jobs: echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal - dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal - #dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal - name: Build Docker Image env: From 3db38ff20d4694d4599f8a69bd912b4f81d6d740 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 16:32:41 +0100 Subject: [PATCH 07/14] another update :| --- .../MessagingService.BusinessLogic.Tests.csproj | 1 + .../MessagingService.EmailAggregate.Tests.csproj | 1 + .../MessagingService.IntegrationTests.csproj | 1 - .../MessagingService.SMSAggregate.Tests.csproj | 1 + MessagingService.Tests/MessagingService.Tests.csproj | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj index 6e68a9b..f4d222f 100644 --- a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj +++ b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj @@ -4,6 +4,7 @@ net10.0 None false + Exe $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index 942b8ec..cf5ec11 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -4,6 +4,7 @@ net10.0 None false + Exe $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index 2ae8914..76f726b 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -5,7 +5,6 @@ false true Exe - $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj index e59b747..371c316 100644 --- a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj +++ b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj @@ -4,6 +4,7 @@ net10.0 None false + Exe $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.Tests/MessagingService.Tests.csproj b/MessagingService.Tests/MessagingService.Tests.csproj index 0b14176..e11b079 100644 --- a/MessagingService.Tests/MessagingService.Tests.csproj +++ b/MessagingService.Tests/MessagingService.Tests.csproj @@ -4,6 +4,7 @@ net10.0 None false + Exe $(TestingPlatformCommandLineArguments) --report-trx From 48dab88237c568a3c3eb7db6312eff3eba721598 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 16:43:08 +0100 Subject: [PATCH 08/14] Fix MTP test project runner settings --- .../MessagingService.BusinessLogic.Tests.csproj | 1 - .../MessagingService.EmailAggregate.Tests.csproj | 1 - .../MessagingService.SMSAggregate.Tests.csproj | 1 - MessagingService.Tests/MessagingService.Tests.csproj | 1 - 4 files changed, 4 deletions(-) diff --git a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj index f4d222f..e1aeab2 100644 --- a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj +++ b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj @@ -5,7 +5,6 @@ None false Exe - $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index cf5ec11..8aefbf0 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -5,7 +5,6 @@ None false Exe - $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj index 371c316..0dbd025 100644 --- a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj +++ b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj @@ -5,7 +5,6 @@ None false Exe - $(TestingPlatformCommandLineArguments) --report-trx diff --git a/MessagingService.Tests/MessagingService.Tests.csproj b/MessagingService.Tests/MessagingService.Tests.csproj index e11b079..9f0c969 100644 --- a/MessagingService.Tests/MessagingService.Tests.csproj +++ b/MessagingService.Tests/MessagingService.Tests.csproj @@ -5,7 +5,6 @@ None false Exe - $(TestingPlatformCommandLineArguments) --report-trx From 9d0e42d37ec04ce0bb28c3d320d030e4cdff0971 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 17:08:45 +0100 Subject: [PATCH 09/14] Fix Linux test project paths in CI workflow --- .github/workflows/pullrequest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 3cc2dde..f2122aa 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -25,9 +25,9 @@ jobs: - name: Run Unit Tests run: | echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" - dotnet test "MessagingService.BusinessLogic.Tests\MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal - dotnet test "MessagingService.EmailAggregate.Tests\MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal - dotnet test "MessagingService.SMSAggregate.Tests\MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal - name: Build Docker Image env: @@ -35,7 +35,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal + run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal - uses: actions/upload-artifact@v4.4.0 with: From 0770c381835687d31387882c4e3842d66631ea35 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 17:17:00 +0100 Subject: [PATCH 10/14] Restore TRX output in CI tests --- .github/workflows/pullrequest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index f2122aa..6900390 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -25,9 +25,9 @@ jobs: - name: Run Unit Tests run: | echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" - dotnet test "MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal - dotnet test "MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal - dotnet test "MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal + dotnet test "MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj" --configuration Release --verbosity normal -- --report-trx + dotnet test "MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj" --configuration Release --verbosity normal -- --report-trx + dotnet test "MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj" --configuration Release --verbosity normal -- --report-trx - name: Build Docker Image env: @@ -35,7 +35,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal + run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal -- --report-trx - uses: actions/upload-artifact@v4.4.0 with: From e60df5a6a5e71d5314657e2a3dfe13940524e477 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 17:28:21 +0100 Subject: [PATCH 11/14] Stop passing TRX flag to NUnit integration tests --- .github/workflows/pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 6900390..5bd09e3 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -35,7 +35,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal -- --report-trx + run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal - uses: actions/upload-artifact@v4.4.0 with: From d0d93eedf03b5b56feb47de47a37c4d2c57f6c0a Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 17:37:32 +0100 Subject: [PATCH 12/14] Add NUnit XML reporting for integration tests --- .github/workflows/pullrequest.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 5bd09e3..a0318b4 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -42,7 +42,7 @@ jobs: name: tracelogs path: /home/runner/trace/ - - name: Publish test results + - name: Publish unit test results uses: dorny/test-reporter@v1 if: always() with: @@ -50,7 +50,16 @@ jobs: path: '**/TestResults/*.trx' reporter: dotnet-trx fail-on-error: true - + + - name: Publish integration test results + uses: dorny/test-reporter@v1 + if: always() + with: + name: Integration Test Results + path: '**/TestResult.xml' + reporter: dotnet-nunit + fail-on-error: true + - name: Upload test results uses: actions/upload-artifact@v4 if: always() @@ -58,3 +67,11 @@ jobs: name: test-results path: '**/TestResults/*.trx' retention-days: 30 + + - name: Upload integration test results + uses: actions/upload-artifact@v4 + if: always() + with: + name: integration-test-results + path: '**/TestResult.xml' + retention-days: 30 From 1ea31d58acd5b099ec3453d08cdc0025ceeca0c9 Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 18:10:19 +0100 Subject: [PATCH 13/14] Fix NUnit integration test reporting --- .github/workflows/pullrequest.yml | 6 +++--- MessagingService.IntegrationTests/Integration.runsettings | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 MessagingService.IntegrationTests/Integration.runsettings diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index a0318b4..1256c6e 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -35,7 +35,7 @@ jobs: run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }} - name: Run Integration Tests - run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal + run: dotnet test "MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --verbosity normal --results-directory "${{ github.workspace }}/TestResults" --settings "MessagingService.IntegrationTests/Integration.runsettings" - uses: actions/upload-artifact@v4.4.0 with: @@ -56,7 +56,7 @@ jobs: if: always() with: name: Integration Test Results - path: '**/TestResult.xml' + path: 'TestResults/Integration/TestResult.xml' reporter: dotnet-nunit fail-on-error: true @@ -73,5 +73,5 @@ jobs: if: always() with: name: integration-test-results - path: '**/TestResult.xml' + path: 'TestResults/Integration/TestResult.xml' retention-days: 30 diff --git a/MessagingService.IntegrationTests/Integration.runsettings b/MessagingService.IntegrationTests/Integration.runsettings new file mode 100644 index 0000000..baf0194 --- /dev/null +++ b/MessagingService.IntegrationTests/Integration.runsettings @@ -0,0 +1,6 @@ + + + Integration + UseResultDirectory + + From 808eb1974a1ab1f3f4a15e7a550b25915e3beffa Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Mon, 17 Aug 2026 18:26:42 +0100 Subject: [PATCH 14/14] Fix integration test report path --- .github/workflows/pullrequest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 1256c6e..8411bd2 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -56,7 +56,7 @@ jobs: if: always() with: name: Integration Test Results - path: 'TestResults/Integration/TestResult.xml' + path: 'TestResults/MessagingService.IntegrationTests.xml' reporter: dotnet-nunit fail-on-error: true @@ -73,5 +73,5 @@ jobs: if: always() with: name: integration-test-results - path: 'TestResults/Integration/TestResult.xml' + path: 'TestResults/MessagingService.IntegrationTests.xml' retention-days: 30