Add Azure Eventhubs Emulator container to Azure module

- Fix license acceptance
- Use Transferable
- Remove unnecessary code from tests

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

Author: nagyesta

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

@@ -2,8 +2,9 @@
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.MountableFile;
+import org.testcontainers.utility.LicenseAcceptance;
 
 /**
  * Testcontainers implementation for Azure Eventhubs Emulator.
@@ -31,7 +32,7 @@ public class AzureEventhubsEmulatorContainer extends GenericContainer<AzureEvent
 
     private AzuriteContainer azuriteContainer;
 
-    private MountableFile config;
+    private Transferable config;
 
     /**
      * @param dockerImageName specified docker image name to run
@@ -69,7 +70,7 @@ public void stop() {
      * @param config The file containing the broker configuration
      * @return this
      */
-    public AzureEventhubsEmulatorContainer withConfig(final MountableFile config) {
+    public AzureEventhubsEmulatorContainer withConfig(final Transferable config) {
         this.config = config;
         return this;
     }
@@ -79,7 +80,7 @@ public AzureEventhubsEmulatorContainer withConfig(final MountableFile config) {
      *
      * @return this
      */
-    public AzureEventhubsEmulatorContainer acceptEula() {
+    public AzureEventhubsEmulatorContainer acceptLicense() {
         return withEnv("ACCEPT_EULA", "Y");
     }
 
@@ -89,9 +90,14 @@ protected void configure() {
         final String azuriteHost = azuriteContainer.getNetworkAliases().get(0);
         withEnv("BLOB_SERVER", azuriteHost);
         withEnv("METADATA_SERVER", azuriteHost);
+        // If license was not accepted programatically, check if it was accepted via resource file
+        if (!getEnvMap().containsKey("ACCEPT_EULA")) {
+            LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
+            acceptLicense();
+        }
         if (this.config != null) {
             logger().info("Using path for configuration file: '{}'", this.config);
-            withCopyFileToContainer(this.config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
+            withCopyToContainer(this.config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
         }
     }
 

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

@@ -7,8 +7,6 @@
 import com.azure.messaging.eventhubs.EventHubProducerClient;
 import com.azure.messaging.eventhubs.models.EventPosition;
 import com.azure.messaging.eventhubs.models.PartitionEvent;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.containers.Network;
@@ -18,31 +16,18 @@
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Optional;
-import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.waitAtMost;
 
 public class AzureEventhubsEmulatorContainerTest {
 
-    private static Properties originalSystemProperties;
-
-    @BeforeClass
-    public static void captureOriginalSystemProperties() {
-        originalSystemProperties = (Properties) System.getProperties().clone();
-    }
-
-    @AfterClass
-    public static void restoreOriginalSystemProperties() {
-        System.setProperties(originalSystemProperties);
-    }
-
     @Rule
     // emulatorContainer {
     public AzureEventhubsEmulatorContainer emulator = new AzureEventhubsEmulatorContainer(
         DockerImageName.parse("mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1")
     )
-        .acceptEula()
+        .acceptLicense()
         .withNetwork(Network.newNetwork())
         .withConfig(MountableFile.forClasspathResource("/eventhubs_config.json"));