From d9e1685f478bf4ae3681c19ed393a9c3acd41a06 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 19 May 2020 18:47:54 -0400 Subject: [PATCH] Random port for rabbit docker tests --- .../rabbit/RabbitSinkIntegrationTests.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java index 4f9a2296..398935eb 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java @@ -16,12 +16,6 @@ package org.springframework.cloud.stream.app.sink.rabbit; -import java.util.function.Consumer; - -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; import org.testcontainers.containers.GenericContainer; import org.springframework.amqp.core.Binding; @@ -44,19 +38,18 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; @SpringBootTest( - properties = {"spring.cloud.stream.function.definition=rabbitConsumer"}, + properties = {"spring.cloud.stream.function.definition=rabbitConsumer", "spring.rabbitmq.port = ${spring.rabbitmq.test.port}"}, webEnvironment = SpringBootTest.WebEnvironment.NONE) @DirtiesContext @Import(RabbitSinkIntegrationTests.FooConfiguration.class) abstract class RabbitSinkIntegrationTests { static { - Consumer cmd = e -> e.withPortBindings(new PortBinding(Ports.Binding.bindPort(5672), new ExposedPort(5672))); - - GenericContainer rabbitMq = new GenericContainer("rabbitmq:3.5.3") - .withExposedPorts(5672) - .withCreateContainerCmdModifier(cmd); - rabbitMq.start(); + GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3") + .withExposedPorts(5672); + rabbitmq.start(); + final Integer mappedPort = rabbitmq.getMappedPort(5672); + System.setProperty("spring.rabbitmq.test.port", mappedPort.toString()); } @Qualifier("rabbitConsumer-in-0")