Skip to content

Commit f1242e5

Browse files
committed
Fix tests
1 parent 274166a commit f1242e5

3 files changed

Lines changed: 9 additions & 14 deletions

File tree

backend/FwLite/FwLiteProjectSync/MiniLcmImport.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public async Task<IProjectIdentifier> Import(IProjectIdentifier project)
3131
FwProjectId: fwDataApi.ProjectId,
3232
AfterCreate: async (provider, _) =>
3333
{
34+
var currentProjectService = provider.GetRequiredService<CurrentProjectService>();
35+
// force-trigger "data migrations"
36+
await currentProjectService.SetupProjectContext(currentProjectService.Project);
3437
var crdtApi = provider.GetRequiredService<IMiniLcmApi>();
3538
await ImportProject(crdtApi, fwDataApi, fwDataApi.EntryCount);
3639
}));

backend/FwLite/LcmCrdt.Tests/Data/MigrationTests.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
namespace LcmCrdt.Tests.Data;
1111

1212
[Collection("MigrationTests")]
13-
public class MigrationTests : IAsyncLifetime
13+
public class MigrationTests
1414
{
15-
private readonly RegressionTestHelper _helper = new("MigrationTest");
1615
private static readonly JsonSerializerOptions IndentedHarmonyJsonOptions = new(TestJsonOptions.Harmony())
1716
{
1817
WriteIndented = true
@@ -25,21 +24,12 @@ internal static void Init()
2524
VerifierSettings.OmitContentFromException();
2625
}
2726

28-
public Task InitializeAsync()
29-
{
30-
return Task.CompletedTask;
31-
}
32-
33-
public async Task DisposeAsync()
34-
{
35-
await _helper.DisposeAsync();
36-
}
37-
3827
[Theory]
3928
[InlineData(RegressionTestHelper.RegressionVersion.v1)]
4029
[InlineData(RegressionTestHelper.RegressionVersion.v2)]
4130
public async Task GetEntries_WorksAfterMigrationFromScriptedDb(RegressionTestHelper.RegressionVersion regressionVersion)
4231
{
32+
await using RegressionTestHelper _helper = new($"{nameof(GetEntries_WorksAfterMigrationFromScriptedDb)}-{regressionVersion}");
4333
await _helper.InitializeAsync(regressionVersion);
4434
var api = _helper.Services.GetRequiredService<IMiniLcmApi>();
4535
var hasEntries = false;
@@ -58,6 +48,7 @@ public async Task GetEntries_WorksAfterMigrationFromScriptedDb(RegressionTestHel
5848
[Trait("Category", "Verified")]
5949
public async Task VerifyAfterMigrationFromScriptedDb(RegressionTestHelper.RegressionVersion regressionVersion)
6050
{
51+
await using RegressionTestHelper _helper = new($"{nameof(VerifyAfterMigrationFromScriptedDb)}-{regressionVersion}");
6152
await _helper.InitializeAsync(regressionVersion);
6253
var api = _helper.Services.GetRequiredService<IMiniLcmApi>();
6354
var crdtConfig = _helper.Services.GetRequiredService<IOptions<CrdtConfig>>().Value;
@@ -110,6 +101,7 @@ await Task.WhenAll(
110101
[Trait("Category", "Verified")]
111102
public async Task VerifyRegeneratedSnapshotsAfterMigrationFromScriptedDb(RegressionTestHelper.RegressionVersion regressionVersion)
112103
{
104+
await using RegressionTestHelper _helper = new($"{nameof(VerifyRegeneratedSnapshotsAfterMigrationFromScriptedDb)}-{regressionVersion}");
113105
await _helper.InitializeAsync(regressionVersion);
114106
var api = _helper.Services.GetRequiredService<IMiniLcmApi>();
115107
var crdtConfig = _helper.Services.GetRequiredService<IOptions<CrdtConfig>>().Value;

backend/FwLite/LcmCrdt.Tests/Data/RegressionTestHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace LcmCrdt.Tests.Data;
88

9-
public class RegressionTestHelper(string dbName): IAsyncLifetime
9+
public class RegressionTestHelper(string dbName): IAsyncDisposable
1010
{
1111
private IHost _host = null!;
1212
private AsyncServiceScope _asyncScope;
@@ -57,7 +57,7 @@ public async Task InitializeAsync(RegressionVersion version)
5757
await InitDbFromScripts(version);
5858
}
5959

60-
public async Task DisposeAsync()
60+
public async ValueTask DisposeAsync()
6161
{
6262
await _asyncScope.DisposeAsync();
6363
if (_host is IAsyncDisposable asyncDisposable) await asyncDisposable.DisposeAsync();

0 commit comments

Comments
 (0)