Add Azure Service Bus Emulator container to Azure module

- Fix code review findings

Signed-off-by: Esta Nagy <[email protected]>

Author: nagyesta

modules/azure/src/main/java/org/testcontainers/azure/AzureServiceBusEmulatorContainer.java

@@ -25,24 +25,39 @@ public class AzureServiceBusEmulatorContainer extends GenericContainer<AzureServ
         "mcr.microsoft.com/azure-messaging/servicebus-emulator"
     );
 
-    private final MSSQLServerContainer<?> mssqlServerContainer;
+    private MSSQLServerContainer<?> msSqlServerContainer;
 
     /**
-     * @param dockerImageName      The specified docker image name to run
-     * @param mssqlServerContainer The MS SQL Server container used by Service Bus as a dependency
+     * @param dockerImageName The specified docker image name to run
      */
-    public AzureServiceBusEmulatorContainer(
-        final DockerImageName dockerImageName,
-        final MSSQLServerContainer<?> mssqlServerContainer
-    ) {
+    public AzureServiceBusEmulatorContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    /**
+     * @param dockerImageName The specified docker image name to run
+     */
+    public AzureServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        this.mssqlServerContainer = mssqlServerContainer;
-        dependsOn(mssqlServerContainer);
         withExposedPorts(DEFAULT_PORT);
         waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
     }
 
+    /**
+     * Sets the MS SQL Server dependency needed by the Service Bus Container,
+     *
+     * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
+     * @return this
+     */
+    public AzureServiceBusEmulatorContainer withMsSqlServerContainer(
+        final MSSQLServerContainer<?> msSqlServerContainer
+    ) {
+        dependsOn(msSqlServerContainer);
+        this.msSqlServerContainer = msSqlServerContainer;
+        return this;
+    }
+
     /**
      * Provide the Service Bus configuration JSON.
      *
@@ -65,8 +80,15 @@ public AzureServiceBusEmulatorContainer acceptLicense() {
 
     @Override
     protected void configure() {
-        withEnv("SQL_SERVER", mssqlServerContainer.getNetworkAliases().get(0));
-        withEnv("MSSQL_SA_PASSWORD", mssqlServerContainer.getPassword());
+        if (msSqlServerContainer == null) {
+            throw new IllegalStateException(
+                "The image " +
+                getDockerImageName() +
+                " requires an Microsoft SQL Server container. Please provide one with the withMsSqlServerContainer method!"
+            );
+        }
+        withEnv("SQL_SERVER", msSqlServerContainer.getNetworkAliases().get(0));
+        withEnv("MSSQL_SA_PASSWORD", msSqlServerContainer.getPassword());
         // If license was not accepted programmatically, check if it was accepted via resource file
         if (!getEnvMap().containsKey("ACCEPT_EULA")) {
             LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());

modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java

@@ -2,34 +2,32 @@
 
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
 import com.azure.messaging.servicebus.ServiceBusErrorContext;
+import com.azure.messaging.servicebus.ServiceBusException;
 import com.azure.messaging.servicebus.ServiceBusMessage;
 import com.azure.messaging.servicebus.ServiceBusProcessorClient;
-import com.azure.messaging.servicebus.ServiceBusReceivedMessage;
 import com.azure.messaging.servicebus.ServiceBusReceivedMessageContext;
 import com.azure.messaging.servicebus.ServiceBusSenderClient;
-import com.azure.messaging.servicebus.ServiceBusTransactionContext;
 import com.github.dockerjava.api.model.Capability;
 import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 public class AzureServiceBusEmulatorContainerTest {
 
     @Rule
     // network {
     public Network network = Network.newNetwork();
-
     // }
 
     @Rule
@@ -43,23 +41,21 @@ public class AzureServiceBusEmulatorContainerTest {
             cmd.getHostConfig().withCapAdd(Capability.SYS_PTRACE);
         })
         .withNetwork(network);
-
     // }
 
     @Rule
     // emulatorContainer {
     public AzureServiceBusEmulatorContainer emulator = new AzureServiceBusEmulatorContainer(
-        DockerImageName.parse("mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"),
-        mssqlServerContainer
+        "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
     )
         .acceptLicense()
         .withConfig(MountableFile.forClasspathResource("/service-bus-config.json"))
-        .withNetwork(network);
-
+        .withNetwork(network)
+        .withMsSqlServerContainer(mssqlServerContainer);
     // }
 
     @Test
-    public void testWithClient() throws InterruptedException {
+    public void testWithClient() {
         assertThat(emulator.getConnectionString()).startsWith("Endpoint=sb://");
 
         // senderClient {
@@ -70,16 +66,18 @@ public void testWithClient() throws InterruptedException {
             .buildClient();
         // }
 
-        TimeUnit.SECONDS.sleep(5);
-        ServiceBusTransactionContext transaction = senderClient.createTransaction();
-        senderClient.sendMessage(new ServiceBusMessage("Hello, Testcontainers!"), transaction);
-        senderClient.commitTransaction(transaction);
+        await()
+            .atMost(20, TimeUnit.SECONDS)
+            .ignoreException(ServiceBusException.class)
+            .until(() -> {
+                senderClient.sendMessage(new ServiceBusMessage("Hello, Testcontainers!"));
+                return true;
+            });
         senderClient.close();
 
-        TimeUnit.SECONDS.sleep(5);
-        final List<ServiceBusReceivedMessage> received = new ArrayList<>();
+        final List<String> received = new CopyOnWriteArrayList<>();
         Consumer<ServiceBusReceivedMessageContext> messageConsumer = m -> {
-            received.add(m.getMessage());
+            received.add(m.getMessage().getBody().toString());
             m.complete();
         };
         Consumer<ServiceBusErrorContext> errorConsumer = e -> Assertions.fail("Unexpected error: " + e);
@@ -94,9 +92,11 @@ public void testWithClient() throws InterruptedException {
         // }
         processorClient.start();
 
-        TimeUnit.SECONDS.sleep(10);
+        await()
+            .atMost(20, TimeUnit.SECONDS)
+            .untilAsserted(() -> {
+                assertThat(received).hasSize(1).containsExactlyInAnyOrder("Hello, Testcontainers!");
+            });
         processorClient.close();
-        assertThat(received).hasSize(1);
-        assertThat(received.get(0).getBody().toString()).isEqualTo("Hello, Testcontainers!");
     }
 }