Skip to content

More test cleanup #284

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
TraGicCode merged 1 commit into from
Apr 14, 2026
Merged

More test cleanup #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -59,7 +59,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
4 changes: 2 additions & 2 deletions ...uslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -58,7 +58,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
4 changes: 2 additions & 2 deletions ...I.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -55,7 +55,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
17 changes: 4 additions & 13 deletions tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
using System.Text;
using System.Text.Json;
using BuslyCLI.Infrastructure;
using BuslyCLI.Console.Tests.Commands;
using BuslyCLI.Console.Tests.TestHelpers;
using BuslyCLI.Infrastructure.Endpoints;
using BuslyCLI.Infrastructure.Factories;
using Microsoft.Extensions.DependencyInjection;
using NServiceBus.Transport;
using Spectre.Console.Cli.Extensions.DependencyInjection;
using Spectre.Console.Cli.Testing;
using TransportConfig = BuslyCLI.Config.TransportConfig;

namespace BuslyCLI.Console.Tests.EndToEnd;

public abstract class EndToEndTestBase
public abstract class EndToEndTestBase : CommandTestBase
{
protected CommandAppTester _sut;

protected readonly JsonSerializerOptions _jsonObjectOptions =
new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, WriteIndented = true };

Expand All @@ -23,13 +19,8 @@ public abstract class EndToEndTestBase
protected abstract TransportConfig CreateTransportConfig();

[SetUp]
public async Task Setup()
public async Task SetupEndpoint()
{
var registrations = new ServiceCollection();
registrations.AddBuslyCLIServices();
using var registrar = new DependencyInjectionRegistrar(registrations);
_sut = new CommandAppTester(registrar);
_sut.Configure(AppConfiguration.GetSpectreCommandConfiguration());
TestEndpoint = await new RawEndpointFactory()
.CreateRawEndpoint(TestEndpointNameGenerator.GenerateUniqueEndpointName(), CreateTransportConfig());
await TestEndpoint.StartEndpoint();
Expand Down
4 changes: 2 additions & 2 deletions tests/BuslyCLI.Console.Tests/EndToEnd/Learning/SendCommandEndToEndLearningTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -55,7 +55,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
4 changes: 2 additions & 2 deletions tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/SendCommandPostgreSqlEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -56,7 +56,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
4 changes: 2 additions & 2 deletions tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/SendCommandRabbitMqEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -59,7 +59,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
4 changes: 2 additions & 2 deletions tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SendCommandSqlServerEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task ShouldSendCommand()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"command",
"send",
"--content-type", "application/json",
Expand Down Expand Up @@ -55,7 +55,7 @@ public async Task ShouldPublishEvent()
using var configFile = new TestableNServiceBusConfigurationFile(yamlFile);

// Act
var result = _sut.Run(
var result = Sut.Run(
"event",
"publish",
"--content-type", "application/json",
Expand Down
2 changes: 1 addition & 1 deletion ...onsole.Tests/TestEndpointNameGenerator.cs → .../TestHelpers/TestEndpointNameGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace BuslyCLI.Console.Tests;
namespace BuslyCLI.Console.Tests.TestHelpers;

public static class TestEndpointNameGenerator
{
Expand Down