Skip to content

Commit 38b685d

Browse files
committed
Add Azure Service Bus Emulator container to Azure module
- Rename container Signed-off-by: Esta Nagy <nagyesta@gmail.com>
1 parent 49beb0d commit 38b685d

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

docs/modules/azure.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Currently, the module supports `Azurite`, `Azure Service Bus` and `CosmosDB` emu
1010
Class | Container Image
1111
-|-
1212
AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
13-
AzureServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
13+
AzureServiceBusContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
1414
CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
1515

1616
## Usage example
@@ -82,27 +82,27 @@ Build Azure Table client:
8282
Start Azure Service Bus Emulator during a test:
8383

8484
<!--codeinclude-->
85-
[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java) inside_block:network
85+
[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:network
8686
<!--/codeinclude-->
8787

8888
<!--codeinclude-->
89-
[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java) inside_block:sqlContainer
89+
[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:sqlContainer
9090
<!--/codeinclude-->
9191

9292
<!--codeinclude-->
93-
[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java) inside_block:emulatorContainer
93+
[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:emulatorContainer
9494
<!--/codeinclude-->
9595

9696
#### Using Azure Service Bus clients
9797

9898
Configure the sender and the processor clients:
9999

100100
<!--codeinclude-->
101-
[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java) inside_block:senderClient
101+
[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:senderClient
102102
<!--/codeinclude-->
103103

104104
<!--codeinclude-->
105-
[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusEmulatorContainerTest.java) inside_block:processorClient
105+
[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:processorClient
106106
<!--/codeinclude-->
107107

108108
### CosmosDB

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

+11-13
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
* <p>
1515
* Exposed port: 5672
1616
*/
17-
public class AzureServiceBusEmulatorContainer extends GenericContainer<AzureServiceBusEmulatorContainer> {
17+
public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusContainer> {
1818

1919
private static final String CONNECTION_STRING_FORMAT =
20-
"Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
20+
"Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
2121

2222
private static final int DEFAULT_PORT = 5672;
2323

2424
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(
25-
"mcr.microsoft.com/azure-messaging/servicebus-emulator"
25+
"mcr.microsoft.com/azure-messaging/servicebus-emulator"
2626
);
2727

2828
private MSSQLServerContainer<?> msSqlServerContainer;
2929

3030
/**
3131
* @param dockerImageName The specified docker image name to run
3232
*/
33-
public AzureServiceBusEmulatorContainer(final String dockerImageName) {
33+
public AzureServiceBusContainer(final String dockerImageName) {
3434
this(DockerImageName.parse(dockerImageName));
3535
}
3636

3737
/**
3838
* @param dockerImageName The specified docker image name to run
3939
*/
40-
public AzureServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
40+
public AzureServiceBusContainer(final DockerImageName dockerImageName) {
4141
super(dockerImageName);
4242
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
4343
withExposedPorts(DEFAULT_PORT);
@@ -50,9 +50,7 @@ public AzureServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
5050
* @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
5151
* @return this
5252
*/
53-
public AzureServiceBusEmulatorContainer withMsSqlServerContainer(
54-
final MSSQLServerContainer<?> msSqlServerContainer
55-
) {
53+
public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
5654
dependsOn(msSqlServerContainer);
5755
this.msSqlServerContainer = msSqlServerContainer;
5856
return this;
@@ -64,7 +62,7 @@ public AzureServiceBusEmulatorContainer withMsSqlServerContainer(
6462
* @param config The configuration
6563
* @return this
6664
*/
67-
public AzureServiceBusEmulatorContainer withConfig(final Transferable config) {
65+
public AzureServiceBusContainer withConfig(final Transferable config) {
6866
withCopyToContainer(config, "/ServiceBus_Emulator/ConfigFiles/Config.json");
6967
return this;
7068
}
@@ -74,17 +72,17 @@ public AzureServiceBusEmulatorContainer withConfig(final Transferable config) {
7472
*
7573
* @return this
7674
*/
77-
public AzureServiceBusEmulatorContainer acceptLicense() {
75+
public AzureServiceBusContainer acceptLicense() {
7876
return withEnv("ACCEPT_EULA", "Y");
7977
}
8078

8179
@Override
8280
protected void configure() {
8381
if (msSqlServerContainer == null) {
8482
throw new IllegalStateException(
85-
"The image " +
86-
getDockerImageName() +
87-
" requires a Microsoft SQL Server container. Please provide one with the withMsSqlServerContainer method!"
83+
"The image " +
84+
getDockerImageName() +
85+
" requires a Microsoft SQL Server container. Please provide one with the withMsSqlServerContainer method!"
8886
);
8987
}
9088
withEnv("SQL_SERVER", msSqlServerContainer.getNetworkAliases().get(0));

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static org.assertj.core.api.Assertions.assertThat;
2424
import static org.awaitility.Awaitility.await;
2525

26-
public class AzureServiceBusEmulatorContainerTest {
26+
public class AzureServiceBusContainerTest {
2727

2828
@Rule
2929
// network {
@@ -45,7 +45,7 @@ public class AzureServiceBusEmulatorContainerTest {
4545

4646
@Rule
4747
// emulatorContainer {
48-
public AzureServiceBusEmulatorContainer emulator = new AzureServiceBusEmulatorContainer(
48+
public AzureServiceBusContainer emulator = new AzureServiceBusContainer(
4949
"mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
5050
)
5151
.acceptLicense()

0 commit comments

Comments
 (0)