diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndTests.cs index 152527dd..24682e3b 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs index 1c2fcb34..fe8b5f88 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs index bcbffc1e..2129fd27 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs index adee9f40..2a12ccbd 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs @@ -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 }; @@ -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(); diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/SendCommandEndToEndLearningTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/SendCommandEndToEndLearningTests.cs index 37578610..342bfd96 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/SendCommandEndToEndLearningTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/SendCommandEndToEndLearningTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/SendCommandPostgreSqlEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/SendCommandPostgreSqlEndToEndTests.cs index 876c909f..a4475578 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/SendCommandPostgreSqlEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/SendCommandPostgreSqlEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/SendCommandRabbitMqEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/SendCommandRabbitMqEndToEndTests.cs index 0bcc0318..c80bc8e8 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/SendCommandRabbitMqEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/SendCommandRabbitMqEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SendCommandSqlServerEndToEndTests.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SendCommandSqlServerEndToEndTests.cs index 2dac8de7..d9dd784e 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SendCommandSqlServerEndToEndTests.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SendCommandSqlServerEndToEndTests.cs @@ -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", @@ -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", diff --git a/tests/BuslyCLI.Console.Tests/TestEndpointNameGenerator.cs b/tests/BuslyCLI.Console.Tests/TestHelpers/TestEndpointNameGenerator.cs similarity index 80% rename from tests/BuslyCLI.Console.Tests/TestEndpointNameGenerator.cs rename to tests/BuslyCLI.Console.Tests/TestHelpers/TestEndpointNameGenerator.cs index ad42c842..9f610b5c 100644 --- a/tests/BuslyCLI.Console.Tests/TestEndpointNameGenerator.cs +++ b/tests/BuslyCLI.Console.Tests/TestHelpers/TestEndpointNameGenerator.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Console.Tests; +namespace BuslyCLI.Console.Tests.TestHelpers; public static class TestEndpointNameGenerator {