Allow to create exchanges, queues, bindings in the same vhost (#5348)

Author: eddumelendez

modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java

@@ -220,8 +220,25 @@ public RabbitMQContainer withBinding(String source, String destination) {
         return self();
     }
 
+    public RabbitMQContainer withBinding(String vhost, String source, String destination) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
+            "source=" + source,
+            "destination=" + destination));
+        return self();
+    }
+
     public RabbitMQContainer withBinding(String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
         values.add(asList("rabbitmqadmin", "declare", "binding",
+            "source=" + source,
+            "destination=" + destination,
+            "routing_key=" + routingKey,
+            "destination_type=" + destinationType,
+            "arguments=" + toJson(arguments)));
+        return self();
+    }
+
+    public RabbitMQContainer withBinding(String vhost, String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "binding",
                 "source=" + source,
                 "destination=" + destination,
                 "routing_key=" + routingKey,
@@ -332,6 +349,12 @@ public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
 
     public RabbitMQContainer withQueue(String name) {
         values.add(asList("rabbitmqadmin", "declare", "queue",
+            "name=" + name));
+        return self();
+    }
+
+    public RabbitMQContainer withQueue(String vhost, String name) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
                 "name=" + name));
         return self();
     }
@@ -345,13 +368,29 @@ public RabbitMQContainer withQueue(String name, boolean autoDelete, boolean dura
         return self();
     }
 
+    public RabbitMQContainer withQueue(String vhost, String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "queue",
+            "name=" + name,
+            "auto_delete=" + autoDelete,
+            "durable=" + durable,
+            "arguments=" + toJson(arguments)));
+        return self();
+    }
+
     public RabbitMQContainer withExchange(String name, String type) {
         values.add(asList("rabbitmqadmin", "declare", "exchange",
                 "name=" + name,
                 "type=" + type));
         return self();
     }
 
+    public RabbitMQContainer withExchange(String vhost, String name, String type) {
+        values.add(asList("rabbitmqadmin", "--vhost=" + vhost, "declare", "exchange",
+            "name=" + name,
+            "type=" + type));
+        return self();
+    }
+
     public RabbitMQContainer withExchange(String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
         values.add(asList("rabbitmqadmin", "declare", "exchange",
             "name=" + name,

modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java

@@ -14,16 +14,13 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
-import java.util.Objects;
-import java.util.Scanner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
@@ -159,9 +156,16 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
                     .withVhost("vhost2", true)
                     .withExchange("direct-exchange", "direct")
                     .withExchange("topic-exchange", "topic")
+                    .withExchange("vhost1", "topic-exchange-2", "topic", false, false, true, Collections.emptyMap())
+                    .withExchange("vhost2", "topic-exchange-3", "topic")
+                    .withExchange("topic-exchange-4", "topic", false, false, true, Collections.emptyMap())
                     .withQueue("queue1")
                     .withQueue("queue2", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withQueue("vhost1", "queue3", true, false, ImmutableMap.of("x-message-ttl", 1000))
+                    .withQueue("vhost2", "queue4")
                     .withBinding("direct-exchange", "queue1")
+                    .withBinding("vhost1", "topic-exchange-2", "queue3")
+                    .withBinding("vhost2", "topic-exchange-3", "queue4", Collections.emptyMap(), "ss7", "queue")
                     .withUser("user1", "password1")
                     .withUser("user2", "password2", ImmutableSet.of("administrator"))
                     .withPermission("vhost1", "user1", ".*", ".*", ".*")
@@ -175,15 +179,15 @@ public void shouldStartTheWholeEnchilada() throws IOException, InterruptedExcept
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "queues")
                 .getStdout())
-                .contains("queue1", "queue2");
+                .contains("queue1", "queue2", "queue3", "queue4");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "exchanges")
                 .getStdout())
-                .contains("direct-exchange", "topic-exchange");
+                .contains("direct-exchange", "topic-exchange", "topic-exchange-2", "topic-exchange-3", "topic-exchange-4");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "bindings")
                 .getStdout())
-                .contains("direct-exchange");
+                .contains("direct-exchange", "topic-exchange-2", "topic-exchange-3");
 
             assertThat(container.execInContainer("rabbitmqadmin", "list", "users")
                 .getStdout())