Skip to content

Commit 7f9cf8b

Browse files
committed
fix: fix ci failed for tests
1 parent 23d4bab commit 7f9cf8b

File tree

3 files changed

+13
-31
lines changed

3 files changed

+13
-31
lines changed

src/BuildingBlocks/TestBase/TestBase.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Net;
22
using System.Security.Claims;
3-
using Ardalis.GuardClauses;
43
using BuildingBlocks.Core.Event;
54
using BuildingBlocks.Core.Model;
65
using BuildingBlocks.EFCore;
@@ -13,7 +12,6 @@
1312
using MassTransit;
1413
using MassTransit.Testing;
1514
using MediatR;
16-
using Microsoft.AspNetCore.Authorization;
1715
using Microsoft.AspNetCore.Hosting;
1816
using Microsoft.AspNetCore.Http;
1917
using Microsoft.AspNetCore.Mvc.Testing;
@@ -24,7 +22,6 @@
2422
using MongoDB.Driver;
2523
using NSubstitute;
2624
using Respawn;
27-
using Respawn.Graph;
2825
using WebMotions.Fake.Authentication.JwtBearer;
2926
using Xunit;
3027
using Xunit.Abstractions;
@@ -346,32 +343,32 @@ public class TestWriteFixture<TEntryPoint, TWContext> : TestFixture<TEntryPoint>
346343
{
347344
public Task ExecuteDbContextAsync(Func<TWContext, Task> action)
348345
{
349-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>()));
346+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>()));
350347
}
351348

352349
public Task ExecuteDbContextAsync(Func<TWContext, ValueTask> action)
353350
{
354-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>()).AsTask());
351+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>()).AsTask());
355352
}
356353

357354
public Task ExecuteDbContextAsync(Func<TWContext, IMediator, Task> action)
358355
{
359-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>(), sp.GetService<IMediator>()));
356+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>(), sp.GetRequiredService<IMediator>()));
360357
}
361358

362359
public Task<T> ExecuteDbContextAsync<T>(Func<TWContext, Task<T>> action)
363360
{
364-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>()));
361+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>()));
365362
}
366363

367364
public Task<T> ExecuteDbContextAsync<T>(Func<TWContext, ValueTask<T>> action)
368365
{
369-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>()).AsTask());
366+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>()).AsTask());
370367
}
371368

372369
public Task<T> ExecuteDbContextAsync<T>(Func<TWContext, IMediator, Task<T>> action)
373370
{
374-
return ExecuteScopeAsync(sp => action(sp.GetService<TWContext>(), sp.GetService<IMediator>()));
371+
return ExecuteScopeAsync(sp => action(sp.GetRequiredService<TWContext>(), sp.GetRequiredService<IMediator>()));
375372
}
376373

377374
public Task InsertAsync<T>(params T[] entities)

src/Services/Passenger/tests/IntegrationTest/Fakes/FakePassenger.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using FluentAssertions;
33
using Integration.Test.Fakes;
44
using Passenger.Data;
5+
using Passenger.Passengers.ValueObjects;
56
using Xunit;
67

78
namespace Integration.Test.Passenger.Features;
@@ -17,13 +18,13 @@ TestFixture<Program, PassengerDbContext, PassengerReadDbContext> integrationTest
1718
public async Task should_complete_register_passenger_and_update_to_db()
1819
{
1920
// Arrange
20-
var passenger = new FakePassenger().Generate();
21+
var passenger = global::Passenger.Passengers.Models.Passenger.Create(
22+
PassengerId.Of(Guid.CreateVersion7()),
23+
Name.Of("Sam"),
24+
PassportNumber.Of("123456789")
25+
);
2126

22-
await Fixture.ExecuteDbContextAsync(db =>
23-
{
24-
db.Passengers.Add(passenger);
25-
return db.SaveChangesAsync();
26-
});
27+
await Fixture.InsertAsync(passenger);
2728

2829
var command = new FakeCompleteRegisterPassengerCommand(passenger.PassportNumber, passenger.Id).Generate();
2930

0 commit comments

Comments
 (0)