Skip to content

fix for nightly build #1963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 4 commits into from
Oct 8, 2026
Merged

fix for nightly build #1963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0308d7c
fix for nightly build
StuartFerguson Oct 8, 2026
4a2ccd2
fix tests for authenticated user creation
StuartFerguson Oct 8, 2026
f61850c
fix integration security token initialization
StuartFerguson Oct 8, 2026
d9c0240
:|
StuartFerguson Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="CallbackHandler.DataTransferObjects" Version="2026.9.2.163" />
<PackageVersion Include="ClientProxyBase" Version="2026.9.7" />
<PackageVersion Include="CallbackHandler.DataTransferObjects" Version="2026.9.3.165" />
<PackageVersion Include="ClientProxyBase" Version="2026.10.1" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="EntityFrameworkCore.Exceptions.Common" Version="10.0.1" />
<PackageVersion Include="EntityFrameworkCore.Exceptions.SqlServer" Version="10.0.1" />
<PackageVersion Include="EventStoreProjections" Version="2023.12.3" />
<PackageVersion Include="FileProcessor.File.DomainEvents" Version="2026.9.4.160" />
<PackageVersion Include="FileProcessor.FileImportLog.DomainEvents" Version="2026.9.4.160" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.3.34" />
<PackageVersion Include="FileProcessor.File.DomainEvents" Version="2026.9.4.162" />
<PackageVersion Include="FileProcessor.FileImportLog.DomainEvents" Version="2026.9.4.162" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.4.48" />
<PackageVersion Include="Lamar" Version="16.0.0" />
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
<PackageVersion Include="MediatR" Version="14.2.0" />
<PackageVersion Include="MessagingService.Client" Version="2026.9.3.152" />
<PackageVersion Include="MessagingService.IntegrationTesting.Helpers" Version="2026.9.3.152" />
<PackageVersion Include="MessagingService.Client" Version="2026.9.3.153" />
<PackageVersion Include="MessagingService.IntegrationTesting.Helpers" Version="2026.9.3.153" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
Expand All @@ -38,39 +38,39 @@
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.12" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.1" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.23.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.23.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.22.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.22.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
<PackageVersion Include="Imposter" Version="0.1.11" />
<PackageVersion Include="NetBarcode" Version="1.8.3" />
<PackageVersion Include="NLog.Extensions.Logging" Version="6.2.1" />
<PackageVersion Include="NLog.Extensions.Logging" Version="6.2.0" />
<PackageVersion Include="NuGet.Packaging" Version="7.9.0" />
<PackageVersion Include="NuGet.Protocol" Version="7.9.0" />
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.3.0" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.7.1" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.7.1" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.19.1" />
<PackageVersion Include="Polly" Version="8.8.0" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.7.0" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.7.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.18.0" />
<PackageVersion Include="Polly" Version="8.7.0" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageVersion Include="prometheus-net" Version="8.2.1" />
<PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageVersion Include="Reqnroll" Version="3.3.4" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
<PackageVersion Include="Reqnroll.Tools.MsBuild.Generation" Version="3.3.4" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.1.0" />
<PackageVersion Include="SecurityService.Client" Version="2026.9.3.183" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.9.3.183" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.1" />
<PackageVersion Include="Shared" Version="2026.9.7" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.9.7" />
<PackageVersion Include="Shared.EventStore" Version="2026.9.7" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.9.7" />
<PackageVersion Include="Shared.Results" Version="2026.9.7" />
<PackageVersion Include="Shared.Results.Web" Version="2026.9.7" />
<PackageVersion Include="SecurityService.Client" Version="2026.9.3.196" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.9.3.196" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.0" />
<PackageVersion Include="Shared" Version="2026.10.1" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.10.1" />
<PackageVersion Include="Shared.EventStore" Version="2026.10.1" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.10.1" />
<PackageVersion Include="Shared.Results" Version="2026.10.1" />
<PackageVersion Include="Shared.Results.Web" Version="2026.10.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
Expand All @@ -88,7 +88,7 @@
<PackageVersion Include="System.ServiceModel.Security" Version="6.0.0" />
<PackageVersion Include="TestHosts.Clients" Version="2026.9.3.92" />
<PackageVersion Include="xunit.v3" Version="4.0.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0" />
<PackageVersion Include="xunit.v3.extensibility.core" Version="4.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
</ItemGroup>
Expand Down
46 changes: 28 additions & 18 deletions TransactionProcessor.BusinessLogic.Tests/Services/EstateDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using Microsoft.Extensions.Configuration;
using Imposter.Abstractions;
using SecurityService.Client;
using SecurityService.DataTransferObjects;
using Shared.DomainDrivenDesign.EventSourcing;
using Shared.EventStore.Aggregate;
using Shared.General;
using Shared.Logger;
using Shared.Serialisation;
using Shouldly;
using SimpleResults;
Expand All @@ -26,8 +29,15 @@ public class EstateDomainServiceTests {
private ISecurityServiceClientImposter SecurityServiceClient;
public EstateDomainServiceTests() {
StringSerialiser.Initialise(new SystemTextJsonSerializer(new JsonSerializerOptions()));
IConfigurationRoot configurationRoot = new ConfigurationBuilder().AddInMemoryCollection(TestData.DefaultAppSettings).Build();
ConfigurationReader.Initialise(configurationRoot);
Logger.Initialise(NullLogger.Instance);

this.AggregateService= new IAggregateServiceImposter();
this.SecurityServiceClient = new ISecurityServiceClientImposter();
this.SecurityServiceClient
.GetToken(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(TestData.GetTokenResponse()));
IAggregateService AggregateServiceResolver() => this.AggregateService.Instance();
this.DomainService = new EstateDomainService(AggregateServiceResolver, this.SecurityServiceClient.Instance());
}
Expand Down Expand Up @@ -77,10 +87,10 @@ public async Task EstateDomainService_CreateEstateUser_EstateUserIsCreated() {
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(),Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(),Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand All @@ -105,11 +115,11 @@ public async Task EstateDomainService_CreateEstateUser_EstateRoleOverrideIsUsedI
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success())
.Callback((request, _) => { capturedRequest = request; return Task.CompletedTask; });
.Callback((token, request, _) => { capturedRequest = request; return Task.CompletedTask; });
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand Down Expand Up @@ -137,10 +147,10 @@ public async Task EstateDomainService_CreateEstateUser_UserCreateFailed_ResultIs
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Failure());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand All @@ -160,10 +170,10 @@ public async Task EstateDomainService_CreateEstateUser_GetUsersFailed_ResultIsFa
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Failure());

Result result = await this.DomainService.CreateEstateUser(TestData.Commands.CreateEstateUserCommand, TestContext.Current.CancellationToken);
Expand All @@ -179,10 +189,10 @@ public async Task EstateDomainService_CreateEstateUser_NullUserReturned_ResultIs
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
null
}));
Expand All @@ -198,10 +208,10 @@ public async Task EstateDomainService_CreateEstateUser_GetEstateFailed_ResultIsF
.ReturnsAsync(Result.Failure());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand All @@ -221,10 +231,10 @@ public async Task EstateDomainService_CreateEstateUser_EstateNotCreated_ResultIs
.ReturnsAsync(SimpleResults.Result.Success());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand All @@ -244,10 +254,10 @@ public async Task EstateDomainService_CreateEstateUser_SaveFailed_ResultIsFailed
.ReturnsAsync(Result.Failure());

this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success());
this.SecurityServiceClient
.GetUsers(Arg<String>.Any(), Arg<CancellationToken>.Any())
.GetUsers(Arg<String>.Any(), Arg<String>.Any(), Arg<CancellationToken>.Any())
.ReturnsAsync(Result.Success(new List<UserResponse>() {
new UserResponse {
UserId = "FA077CE3-B915-4048-88E3-9B500699317F"
Expand Down Expand Up @@ -410,7 +420,7 @@ public async Task EstateDomainService_AddOperatorToEstate_ExceptionThrown_Result
public async Task EstateDomainService_CreateEstateUser_ExceptionThrown_ResultIsFailed()
{
this.SecurityServiceClient
.CreateUser(Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.CreateUser(Arg<String>.Any(), Arg<CreateUserRequest>.Any(), Arg<CancellationToken>.Any())
.ThrowsAsync(new Exception());

Result result = await this.DomainService.CreateEstateUser(TestData.Commands.CreateEstateUserCommand, TestContext.Current.CancellationToken);
Expand Down
Loading
Loading