Merge pull request #148 from TraGicCode/chore/dog-food-off-raw-endpoint-factory-inside-of-integration-tests

Update integration tests to dogfood off of rawendpoint factory from busly

Author: TraGicCode

src/BuslyCLI.Console/Factories/IRawEndpointFactory.cs

@@ -4,7 +4,7 @@ namespace BuslyCLI.Factories;
 
 public interface IRawEndpointFactory
 {
-    Task<RawEndpoint> CreateRawEndpoint(string endpointName, TransportConfig transportConfig);
+    Task<RawEndpoint> CreateRawEndpoint(string endpointName, TransportConfig transportConfig, bool setupInfrastructure = true);
 
     Task<RawSendOnlyEndpoint> CreateRawSendOnlyEndpoint(string endpointName, TransportConfig transportConfig);
 }

src/BuslyCLI.Console/Factories/RawEndpoint.cs

@@ -7,7 +7,7 @@
 
 namespace BuslyCLI.Factories;
 
-public class RawEndpoint(TransportInfrastructure infrastructure) : RawSendOnlyEndpoint(infrastructure)
+public class RawEndpoint(TransportInfrastructure infrastructure, string endpointName) : RawSendOnlyEndpoint(infrastructure, endpointName)
 {
     private static readonly TimeSpan IncomingMessageTimeout = TimeSpan.FromSeconds(5);
     private readonly BlockingCollection<IncomingMessage> _receivedMessages = new();

src/BuslyCLI.Console/Factories/RawEndpointFactory.cs

@@ -10,10 +10,10 @@ namespace BuslyCLI.Factories;
 
 public class RawEndpointFactory : IRawEndpointFactory
 {
-    public async Task<RawEndpoint> CreateRawEndpoint(string endpointName, TransportConfig transportConfig)
+    public async Task<RawEndpoint> CreateRawEndpoint(string endpointName, TransportConfig transportConfig, bool setupInfrastructure = true)
     {
         var transport = CreateTransport(transportConfig);
-        return await InternalCreateEndpoint(endpointName, transport);
+        return await InternalCreateEndpoint(endpointName, transport, setupInfrastructure);
     }
 
     public async Task<RawSendOnlyEndpoint> CreateRawSendOnlyEndpoint(string endpointName, TransportConfig transportConfig)
@@ -148,14 +148,16 @@ private AzureServiceBusTransport CreateAzureServiceBusTransport(string transport
 
     private static async Task<RawEndpoint> InternalCreateEndpoint(
         string endpointName,
-        TransportDefinition transport)
+        TransportDefinition transport,
+        bool setupInfrastructure = true)
     {
         var infrastructure = await InternalCreateInfrastructure(
             endpointName,
             transport,
-            isReceiveEnabled: true);
+            isReceiveEnabled: true,
+            setupInfrastructure);
 
-        return new RawEndpoint(infrastructure);
+        return new RawEndpoint(infrastructure, endpointName);
     }
 
     private static async Task<RawSendOnlyEndpoint> InternalCreateSendOnlyEndpoint(
@@ -165,15 +167,17 @@ private static async Task<RawSendOnlyEndpoint> InternalCreateSendOnlyEndpoint(
         var infrastructure = await InternalCreateInfrastructure(
             endpointName,
             transport,
-            isReceiveEnabled: false);
+            isReceiveEnabled: false,
+            setupInfrastructure: false);
 
-        return new RawSendOnlyEndpoint(infrastructure);
+        return new RawSendOnlyEndpoint(infrastructure, endpointName);
     }
 
     private static async Task<TransportInfrastructure> InternalCreateInfrastructure(
         string endpointName,
         TransportDefinition transport,
-        bool isReceiveEnabled)
+        bool isReceiveEnabled,
+        bool setupInfrastructure)
     {
         var hostSettings = new HostSettings(
             endpointName,
@@ -183,7 +187,7 @@ private static async Task<TransportInfrastructure> InternalCreateInfrastructure(
             {
                 // Console.WriteLine("Critical error: " + exception);
             },
-            isReceiveEnabled);
+            setupInfrastructure);
 
         var infrastructure = await transport.Initialize(hostSettings,
             isReceiveEnabled

src/BuslyCLI.Console/Factories/RawSendOnlyEndpoint.cs

@@ -5,11 +5,13 @@ namespace BuslyCLI.Factories;
 public class RawSendOnlyEndpoint
 {
     protected readonly TransportInfrastructure _infrastructure;
+    public string EndpointName { get; }
 
 
-    public RawSendOnlyEndpoint(TransportInfrastructure infrastructure)
+    public RawSendOnlyEndpoint(TransportInfrastructure infrastructure, string endpointName)
     {
         _infrastructure = infrastructure;
+        EndpointName = endpointName;
     }
 
     public async Task Dispatch(TransportOperations outgoingMessages, TransportTransaction transaction,

tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/SendCommandAmazonSqsEndToEndAmazonSqsTests.cs

@@ -1,8 +1,9 @@
 using System.Text;
 using System.Text.Json;
-using BuslyCLI.Console.Tests.EndToEnd.Infrastructure;
+using BuslyCLI.Config;
 using BuslyCLI.Console.Tests.TestHelpers;
 using BuslyCLI.DependencyInjection;
+using BuslyCLI.Factories;
 using BuslyCLI.Spectre;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
@@ -110,9 +111,19 @@ await RunWithTestEndpoint(async testEndpoint =>
         });
     }
 
-    private async Task RunWithTestEndpoint(Func<TestEndpoint, Task> testAction)
+    private async Task RunWithTestEndpoint(Func<RawEndpoint, Task> testAction)
     {
-        var testEndpoint = await new TestEndpointFactory().CreateAmazonSQSTestEndpoint(Container.GetConnectionString());
+        var testEndpoint = await new RawEndpointFactory().CreateRawEndpoint(TestEndpointNameGenerator.GenerateUniqueEndpointName(), new TransportConfig()
+        {
+            AmazonsqsTransportConfig = new AmazonsqsTransportConfig()
+            {
+                ServiceUrl = Container.GetConnectionString(),
+                RegionName = "us-east-1",
+                AccessKey = "test",
+                SecretKey = "test"
+            }
+        });
+
 
         try
         {

tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs

@@ -1,8 +1,9 @@
 using System.Text;
 using System.Text.Json;
-using BuslyCLI.Console.Tests.EndToEnd.Infrastructure;
+using BuslyCLI.Config;
 using BuslyCLI.Console.Tests.TestHelpers;
 using BuslyCLI.DependencyInjection;
+using BuslyCLI.Factories;
 using BuslyCLI.Spectre;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
@@ -116,11 +117,17 @@ await RunWithTestEndpoint(async testEndpoint =>
         });
     }
 
-    private async Task RunWithTestEndpoint(Func<TestEndpoint, Task> testAction)
+    private async Task RunWithTestEndpoint(Func<RawEndpoint, Task> testAction)
     {
         var random = new Random();
         var testEndpointName = GeneratedTestEndpointNamesAndSubscribedEvent[random.Next(GeneratedTestEndpointNamesAndSubscribedEvent.Count)];
-        var testEndpoint = await new TestEndpointFactory().CreateAzureServiceBusTestEndpoint(testEndpointName.Item1, Container.GetConnectionString());
+        var testEndpoint = await new RawEndpointFactory().CreateRawEndpoint(testEndpointName.Item1, new TransportConfig()
+        {
+            AzureServiceBusTransportConfig = new AzureServiceBusTransportConfig()
+            {
+                ConnectionString = Container.GetConnectionString()
+            }
+        }, false);
 
         await testAction(testEndpoint);
         await testEndpoint.ShutDownAndCleanUp();

tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/SendCommandAzureStorageQueuesEndToEndTests.cs

@@ -1,8 +1,9 @@
 using System.Text;
 using System.Text.Json;
-using BuslyCLI.Console.Tests.EndToEnd.Infrastructure;
+using BuslyCLI.Config;
 using BuslyCLI.Console.Tests.TestHelpers;
 using BuslyCLI.DependencyInjection;
+using BuslyCLI.Factories;
 using BuslyCLI.Spectre;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
@@ -109,9 +110,15 @@ await RunWithTestEndpoint(async testEndpoint =>
     // Test Endpoint
     // Example of how to wait for and get messages
     // https://github.com/Particular/NServiceBus.RabbitMQ/blob/dba627a5a2c50519d7a2466efe3f76c8d5c8828d/src/NServiceBus.Transport.RabbitMQ.Tests/RabbitMqContext.cs#L41
-    private async Task RunWithTestEndpoint(Func<TestEndpoint, Task> testAction)
+    private async Task RunWithTestEndpoint(Func<RawEndpoint, Task> testAction)
     {
-        var testEndpoint = await new TestEndpointFactory().CreateAzureStorageQueuesTestEndpoint(Container.GetConnectionString());
+        var testEndpoint = await new RawEndpointFactory().CreateRawEndpoint(TestEndpointNameGenerator.GenerateUniqueEndpointName(), new TransportConfig()
+        {
+            AzureStorageQueuesTransportConfig = new AzureStorageQueuesTransportConfig()
+            {
+                ConnectionString = Container.GetConnectionString()
+            }
+        });
 
         await testAction(testEndpoint);
         await testEndpoint.ShutDownAndCleanUp();