Use block-scoped namespaces in the test suite
Converts all 73 test source files from file-scoped (namespace X;) to
block-scoped (namespace X { ... }) declarations, re-indenting their
contents accordingly. Matches the existing convention already used in
several production files (e.g. Musify.Infrastructure.Configuration,
Musify.Application.Contracts).
Mechanical change only, done with a script, verified with a full
rebuild (0 warnings, 0 errors) and test run (257/257 passing).
This commit is contained in:
+39
-38
@@ -7,55 +7,56 @@ using Musify.Application.YouTube;
|
||||
using NSubstitute;
|
||||
using Xunit;
|
||||
|
||||
namespace Musify.Application.Tests.YouTube;
|
||||
|
||||
public sealed class GetYouTubeAlbumQueryHandlerTests : HandlerTestBase
|
||||
namespace Musify.Application.Tests.YouTube
|
||||
{
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
private GetYouTubeAlbumQueryHandler CreateHandler()
|
||||
public sealed class GetYouTubeAlbumQueryHandlerTests : HandlerTestBase
|
||||
{
|
||||
var provisioner = new YouTubeTrackProvisioner(
|
||||
Database, youTubeMusicService, TestConfigurations.Track(), NoOpLogger<YouTubeTrackProvisioner>());
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
return new GetYouTubeAlbumQueryHandler(youTubeMusicService, provisioner, NoOpLogger<GetYouTubeAlbumQueryHandler>());
|
||||
}
|
||||
private GetYouTubeAlbumQueryHandler CreateHandler()
|
||||
{
|
||||
var provisioner = new YouTubeTrackProvisioner(
|
||||
Database, youTubeMusicService, TestConfigurations.Track(), NoOpLogger<YouTubeTrackProvisioner>());
|
||||
|
||||
private static YouTubeAlbumDetail BuildDetail() => new(
|
||||
new YouTubeAlbumResult("album-1", "Album Title", "Album Artist", "https://img/thumb.jpg", 2024, false, false, []),
|
||||
Description: "An album",
|
||||
TotalDurationSeconds: 600,
|
||||
Tracks: [new YouTubeAlbumTrack("track-1", "Track One", 200, 1, false)]);
|
||||
return new GetYouTubeAlbumQueryHandler(youTubeMusicService, provisioner, NoOpLogger<GetYouTubeAlbumQueryHandler>());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_EmptyAlbumId_ReturnsValidationError()
|
||||
{
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery(string.Empty), TestContext.Current.CancellationToken);
|
||||
private static YouTubeAlbumDetail BuildDetail() => new(
|
||||
new YouTubeAlbumResult("album-1", "Album Title", "Album Artist", "https://img/thumb.jpg", 2024, false, false, []),
|
||||
Description: "An album",
|
||||
TotalDurationSeconds: 600,
|
||||
Tracks: [new YouTubeAlbumTrack("track-1", "Track One", 200, 1, false)]);
|
||||
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
}
|
||||
[Fact]
|
||||
public async Task Handle_EmptyAlbumId_ReturnsValidationError()
|
||||
{
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery(string.Empty), TestContext.Current.CancellationToken);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_ServiceSucceeds_MaterializesAlbumAndReturnsDetail()
|
||||
{
|
||||
var detail = BuildDetail();
|
||||
youTubeMusicService.GetAlbumAsync("album-1", Arg.Any<CancellationToken>()).Returns(detail);
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
}
|
||||
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery("album-1"), TestContext.Current.CancellationToken);
|
||||
[Fact]
|
||||
public async Task Handle_ServiceSucceeds_MaterializesAlbumAndReturnsDetail()
|
||||
{
|
||||
var detail = BuildDetail();
|
||||
youTubeMusicService.GetAlbumAsync("album-1", Arg.Any<CancellationToken>()).Returns(detail);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(detail, result.Value);
|
||||
Assert.NotEmpty(await Database.ExternalAlbums.ToListAsync(TestContext.Current.CancellationToken));
|
||||
}
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery("album-1"), TestContext.Current.CancellationToken);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_ServiceFails_ReturnsError()
|
||||
{
|
||||
youTubeMusicService.GetAlbumAsync("missing", Arg.Any<CancellationToken>())
|
||||
.Returns(Error.NotFound(description: "Album not found"));
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(detail, result.Value);
|
||||
Assert.NotEmpty(await Database.ExternalAlbums.ToListAsync(TestContext.Current.CancellationToken));
|
||||
}
|
||||
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery("missing"), TestContext.Current.CancellationToken);
|
||||
[Fact]
|
||||
public async Task Handle_ServiceFails_ReturnsError()
|
||||
{
|
||||
youTubeMusicService.GetAlbumAsync("missing", Arg.Any<CancellationToken>())
|
||||
.Returns(Error.NotFound(description: "Album not found"));
|
||||
|
||||
Assert.True(result.IsError);
|
||||
var result = await CreateHandler().Handle(new GetYouTubeAlbumQuery("missing"), TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.True(result.IsError);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+44
-43
@@ -7,59 +7,60 @@ using Musify.Application.YouTube.Responses;
|
||||
using NSubstitute;
|
||||
using Xunit;
|
||||
|
||||
namespace Musify.Application.Tests.YouTube;
|
||||
|
||||
public sealed class ResolveYouTubeTrackStreamCommandHandlerTests : HandlerTestBase
|
||||
namespace Musify.Application.Tests.YouTube
|
||||
{
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
private readonly IStreamTicketService ticketService = Substitute.For<IStreamTicketService>();
|
||||
|
||||
private ResolveYouTubeTrackStreamCommandHandler CreateHandler()
|
||||
public sealed class ResolveYouTubeTrackStreamCommandHandlerTests : HandlerTestBase
|
||||
{
|
||||
var provisioner = new YouTubeTrackProvisioner(
|
||||
Database, youTubeMusicService, TestConfigurations.Track(), NoOpLogger<YouTubeTrackProvisioner>());
|
||||
var issuer = new TrackStreamIssuer(
|
||||
Database, ticketService, TestConfigurations.Track(), TestConfigurations.StreamGateway());
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
private readonly IStreamTicketService ticketService = Substitute.For<IStreamTicketService>();
|
||||
|
||||
return new ResolveYouTubeTrackStreamCommandHandler(
|
||||
Database, youTubeMusicService, provisioner, issuer, NoOpLogger<ResolveYouTubeTrackStreamCommandHandler>());
|
||||
}
|
||||
private ResolveYouTubeTrackStreamCommandHandler CreateHandler()
|
||||
{
|
||||
var provisioner = new YouTubeTrackProvisioner(
|
||||
Database, youTubeMusicService, TestConfigurations.Track(), NoOpLogger<YouTubeTrackProvisioner>());
|
||||
var issuer = new TrackStreamIssuer(
|
||||
Database, ticketService, TestConfigurations.Track(), TestConfigurations.StreamGateway());
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_AlreadyProcessedTrack_IssuesServerStreamWithoutCallingYouTubeForAudio()
|
||||
{
|
||||
ticketService.IssueTicket(Arg.Any<long>(), Arg.Any<string>()).Returns(new StreamTicket("token", 60));
|
||||
return new ResolveYouTubeTrackStreamCommandHandler(
|
||||
Database, youTubeMusicService, provisioner, issuer, NoOpLogger<ResolveYouTubeTrackStreamCommandHandler>());
|
||||
}
|
||||
|
||||
var user = TestEntities.User(1);
|
||||
var track = TestEntities.ExternalTrack(externalId: "abc123");
|
||||
await SeedAsync(user, track);
|
||||
[Fact]
|
||||
public async Task Handle_AlreadyProcessedTrack_IssuesServerStreamWithoutCallingYouTubeForAudio()
|
||||
{
|
||||
ticketService.IssueTicket(Arg.Any<long>(), Arg.Any<string>()).Returns(new StreamTicket("token", 60));
|
||||
|
||||
var result = await CreateHandler().Handle(new ResolveYouTubeTrackStreamCommand("abc123", 1), TestContext.Current.CancellationToken);
|
||||
var user = TestEntities.User(1);
|
||||
var track = TestEntities.ExternalTrack(externalId: "abc123");
|
||||
await SeedAsync(user, track);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal(YouTubeStreamMode.Server, result.Value.Mode);
|
||||
Assert.Equal("token", result.Value.Ticket);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs().GetAudioStreamAsync(default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
var result = await CreateHandler().Handle(new ResolveYouTubeTrackStreamCommand("abc123", 1), TestContext.Current.CancellationToken);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_UnknownTrack_ProvisionsItAndRecordsListeningHistory()
|
||||
{
|
||||
youTubeMusicService.GetAudioStreamAsync("new-video", Arg.Any<CancellationToken>())
|
||||
.Returns(new YouTubeStreamInfo("https://youtube.example/stream", 300));
|
||||
youTubeMusicService.GetSongAsync("new-video", Arg.Any<CancellationToken>())
|
||||
.Returns(new YouTubeSongResult("new-video", "Title", "Artist", "Album", 200, "https://img/thumb.jpg", false, []));
|
||||
youTubeMusicService.ResolveArtworkUrl(Arg.Any<string>()).Returns(callInfo => callInfo.Arg<string>());
|
||||
await SeedAsync(TestEntities.User(42));
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal(YouTubeStreamMode.Server, result.Value.Mode);
|
||||
Assert.Equal("token", result.Value.Ticket);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs().GetAudioStreamAsync(default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
|
||||
var result = await CreateHandler().Handle(new ResolveYouTubeTrackStreamCommand("new-video", 42), TestContext.Current.CancellationToken);
|
||||
[Fact]
|
||||
public async Task Handle_UnknownTrack_ProvisionsItAndRecordsListeningHistory()
|
||||
{
|
||||
youTubeMusicService.GetAudioStreamAsync("new-video", Arg.Any<CancellationToken>())
|
||||
.Returns(new YouTubeStreamInfo("https://youtube.example/stream", 300));
|
||||
youTubeMusicService.GetSongAsync("new-video", Arg.Any<CancellationToken>())
|
||||
.Returns(new YouTubeSongResult("new-video", "Title", "Artist", "Album", 200, "https://img/thumb.jpg", false, []));
|
||||
youTubeMusicService.ResolveArtworkUrl(Arg.Any<string>()).Returns(callInfo => callInfo.Arg<string>());
|
||||
await SeedAsync(TestEntities.User(42));
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal(YouTubeStreamMode.YouTube, result.Value.Mode);
|
||||
Assert.Equal("https://youtube.example/stream", result.Value.StreamUrl);
|
||||
Assert.NotNull(result.Value.TrackId);
|
||||
var result = await CreateHandler().Handle(new ResolveYouTubeTrackStreamCommand("new-video", 42), TestContext.Current.CancellationToken);
|
||||
|
||||
var history = Assert.Single(await Database.ListeningHistories.ToListAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Equal(42, history.UserId);
|
||||
Assert.False(result.IsError);
|
||||
Assert.Equal(YouTubeStreamMode.YouTube, result.Value.Mode);
|
||||
Assert.Equal("https://youtube.example/stream", result.Value.StreamUrl);
|
||||
Assert.NotNull(result.Value.TrackId);
|
||||
|
||||
var history = Assert.Single(await Database.ListeningHistories.ToListAsync(TestContext.Current.CancellationToken));
|
||||
Assert.Equal(42, history.UserId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+23
-22
@@ -4,33 +4,34 @@ using Musify.Application.YouTube;
|
||||
using NSubstitute;
|
||||
using Xunit;
|
||||
|
||||
namespace Musify.Application.Tests.YouTube;
|
||||
|
||||
public sealed class SearchYouTubeAlbumsQueryHandlerTests
|
||||
namespace Musify.Application.Tests.YouTube
|
||||
{
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
private SearchYouTubeAlbumsQueryHandler CreateHandler() => new(youTubeMusicService);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_EmptyQuery_ReturnsValidationErrorWithoutCallingTheService()
|
||||
public sealed class SearchYouTubeAlbumsQueryHandlerTests
|
||||
{
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeAlbumsQuery(string.Empty, string.Empty), TestContext.Current.CancellationToken);
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs()
|
||||
.SearchAlbumsAsync(default!, default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
private SearchYouTubeAlbumsQueryHandler CreateHandler() => new(youTubeMusicService);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_NonEmptyQuery_DelegatesToTheService()
|
||||
{
|
||||
var expected = new YouTubeAlbumSearchResult([], "next-token");
|
||||
youTubeMusicService.SearchAlbumsAsync("query", "token", Arg.Any<CancellationToken>()).Returns(expected);
|
||||
[Fact]
|
||||
public async Task Handle_EmptyQuery_ReturnsValidationErrorWithoutCallingTheService()
|
||||
{
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeAlbumsQuery(string.Empty, string.Empty), TestContext.Current.CancellationToken);
|
||||
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeAlbumsQuery("query", "token"), TestContext.Current.CancellationToken);
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs()
|
||||
.SearchAlbumsAsync(default!, default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(expected, result.Value);
|
||||
[Fact]
|
||||
public async Task Handle_NonEmptyQuery_DelegatesToTheService()
|
||||
{
|
||||
var expected = new YouTubeAlbumSearchResult([], "next-token");
|
||||
youTubeMusicService.SearchAlbumsAsync("query", "token", Arg.Any<CancellationToken>()).Returns(expected);
|
||||
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeAlbumsQuery("query", "token"), TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(expected, result.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+23
-22
@@ -4,33 +4,34 @@ using Musify.Application.YouTube;
|
||||
using NSubstitute;
|
||||
using Xunit;
|
||||
|
||||
namespace Musify.Application.Tests.YouTube;
|
||||
|
||||
public sealed class SearchYouTubeTracksQueryHandlerTests
|
||||
namespace Musify.Application.Tests.YouTube
|
||||
{
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
private SearchYouTubeTracksQueryHandler CreateHandler() => new(youTubeMusicService);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_EmptyQuery_ReturnsValidationErrorWithoutCallingTheService()
|
||||
public sealed class SearchYouTubeTracksQueryHandlerTests
|
||||
{
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeTracksQuery(string.Empty, string.Empty), TestContext.Current.CancellationToken);
|
||||
private readonly IYouTubeMusicService youTubeMusicService = Substitute.For<IYouTubeMusicService>();
|
||||
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs()
|
||||
.SearchSongsAsync(default!, default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
private SearchYouTubeTracksQueryHandler CreateHandler() => new(youTubeMusicService);
|
||||
|
||||
[Fact]
|
||||
public async Task Handle_NonEmptyQuery_DelegatesToTheService()
|
||||
{
|
||||
var expected = new YouTubeSearchResult([], "next-token");
|
||||
youTubeMusicService.SearchSongsAsync("query", "token", Arg.Any<CancellationToken>()).Returns(expected);
|
||||
[Fact]
|
||||
public async Task Handle_EmptyQuery_ReturnsValidationErrorWithoutCallingTheService()
|
||||
{
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeTracksQuery(string.Empty, string.Empty), TestContext.Current.CancellationToken);
|
||||
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeTracksQuery("query", "token"), TestContext.Current.CancellationToken);
|
||||
Assert.Equal(ErrorType.Validation, result.FirstError.Type);
|
||||
await youTubeMusicService.DidNotReceiveWithAnyArgs()
|
||||
.SearchSongsAsync(default!, default!, TestContext.Current.CancellationToken);
|
||||
}
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(expected, result.Value);
|
||||
[Fact]
|
||||
public async Task Handle_NonEmptyQuery_DelegatesToTheService()
|
||||
{
|
||||
var expected = new YouTubeSearchResult([], "next-token");
|
||||
youTubeMusicService.SearchSongsAsync("query", "token", Arg.Any<CancellationToken>()).Returns(expected);
|
||||
|
||||
var result = await CreateHandler().Handle(new SearchYouTubeTracksQuery("query", "token"), TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.False(result.IsError);
|
||||
Assert.Same(expected, result.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user