Migrate backend test suite from xUnit v2 to v3
- Directory.Packages.props: xunit 2.9.3 -> xunit.v3 4.0.0, bump xunit.runner.visualstudio to the matching 4.0.0 - All 5 test csproj: xunit -> xunit.v3 package reference, add <OutputType>Exe</OutputType> (v3 test projects are standalone executables) - backend/global.json: opt dotnet test into the new MTP-native mode (.NET 10 SDK removed the old VSTest bridge for MTP-based test projects like xunit v3) - IAsyncLifetime implementations (HandlerTestBase, ApiTestFixture, InfrastructureTestFixture, StorageServiceTests): v3's IAsyncLifetime now IS IAsyncDisposable, so InitializeAsync/DisposeAsync return ValueTask instead of Task. ApiTestFixture specifically now overrides WebApplicationFactory.DisposeAsync instead of implementing IAsyncLifetime.DisposeAsync explicitly, since v3 collapses both to the same single DisposeAsync slot - Replaced CancellationToken.None with TestContext.Current.CancellationToken across the suite (a v3-only API) and added it to every call that was silently omitting a CancellationToken argument, per the new xUnit1051 analyzer warnings that came with the v3 package Verified: dotnet build (0 warnings, 0 errors) and dotnet test, 250/250 passing under the new MTP runner.
This commit is contained in:
@@ -17,7 +17,7 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
[Fact]
|
||||
public async Task FindAsync_UnknownVideo_ReturnsNull()
|
||||
{
|
||||
var track = await CreateProvisioner().FindAsync("missing-video", CancellationToken.None);
|
||||
var track = await CreateProvisioner().FindAsync("missing-video", TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.Null(track);
|
||||
}
|
||||
@@ -28,11 +28,11 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
var existing = TestEntities.ExternalTrack(externalId: "known-video");
|
||||
await SeedAsync(existing);
|
||||
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("known-video", CancellationToken.None);
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("known-video", TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal(existing.Id, result.Value.Track.Id);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs().GetSongAsync(default!, default);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs().GetSongAsync(default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -43,12 +43,12 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
"new-video", "New Song", "New Artist", "Album", 210, "https://img/thumb.jpg", false,
|
||||
[new YouTubeArtistRef(null, "New Artist"), new YouTubeArtistRef(null, "new artist")]));
|
||||
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("new-video", CancellationToken.None);
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("new-video", TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal("New Song", result.Value.Track.Title);
|
||||
Assert.Single(await Database.Artists.ToListAsync());
|
||||
Assert.Single(await Database.TrackArtists.ToListAsync());
|
||||
Assert.Single(await Database.Artists.ToListAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Single(await Database.TrackArtists.ToListAsync(TestContext.Current.CancellationToken));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -57,7 +57,7 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
youTubeMusicService.GetSongAsync("bad-video", Arg.Any<CancellationToken>())
|
||||
.Returns(ErrorOr.Error.NotFound(description: "Video not found"));
|
||||
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("bad-video", CancellationToken.None);
|
||||
var result = await CreateProvisioner().GetOrCreateAsync("bad-video", TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.True(result.IsError);
|
||||
}
|
||||
@@ -76,11 +76,11 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
new YouTubeAlbumTrack("track-2", "Track Two", 200, 2, false)
|
||||
]);
|
||||
|
||||
await CreateProvisioner().MaterializeAlbumAsync("album-1", detail, CancellationToken.None);
|
||||
await CreateProvisioner().MaterializeAlbumAsync("album-1", detail, TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.Equal(2, await Database.ExternalTracks.CountAsync());
|
||||
Assert.Equal(2, await Database.AlbumHasTracks.CountAsync());
|
||||
Assert.Single(await Database.ExternalAlbums.ToListAsync());
|
||||
Assert.Equal(2, await Database.ExternalTracks.CountAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Equal(2, await Database.AlbumHasTracks.CountAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Single(await Database.ExternalAlbums.ToListAsync(TestContext.Current.CancellationToken));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -93,11 +93,11 @@ public sealed class YouTubeTrackProvisionerTests : HandlerTestBase
|
||||
Tracks: [new YouTubeAlbumTrack("track-1", "Track One", 200, 1, false)]);
|
||||
|
||||
var provisioner = CreateProvisioner();
|
||||
await provisioner.MaterializeAlbumAsync("album-1", detail, CancellationToken.None);
|
||||
await provisioner.MaterializeAlbumAsync("album-1", detail, CancellationToken.None);
|
||||
await provisioner.MaterializeAlbumAsync("album-1", detail, TestContext.Current.CancellationToken);
|
||||
await provisioner.MaterializeAlbumAsync("album-1", detail, TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.Single(await Database.ExternalTracks.ToListAsync());
|
||||
Assert.Single(await Database.AlbumHasTracks.ToListAsync());
|
||||
Assert.Single(await Database.ExternalAlbums.ToListAsync());
|
||||
Assert.Single(await Database.ExternalTracks.ToListAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Single(await Database.AlbumHasTracks.ToListAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Single(await Database.ExternalAlbums.ToListAsync(TestContext.Current.CancellationToken));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user