This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fde3332ef6660e5007aecef638abe8b447a1c915
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Mar 7 10:34:11 2018 +0100
CAMEL-12329: Fixed rabbitmq integration tests
---
components/camel-rabbitmq/readme.txt | 16 ++++++++++++----
...bbitMQIntBasicTest.java => RabbitMQBasicIntTest.java} | 5 ++---
.../rabbitmq/RabbitMQConsumerIntTestReplyTo.java | 2 +-
.../rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java | 4 ++--
.../camel/component/rabbitmq/RabbitMQRequeueIntTest.java | 4 ++--
.../RabbitMQRequeueUnhandledExceptionIntTest.java | 4 ++--
components/camel-rabbitmq/src/test/resources/README.md | 5 -----
7 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/components/camel-rabbitmq/readme.txt
b/components/camel-rabbitmq/readme.txt
index b95b015..ef005d5 100644
--- a/components/camel-rabbitmq/readme.txt
+++ b/components/camel-rabbitmq/readme.txt
@@ -2,12 +2,20 @@ Integration testing
===================
The camel-rabbitmq component has both unit tests and integration tests.
-The integration tests requires a running RabbitMQ broker. This broker can be
run via Docker
- docker run -d -p 5672:5672 -e RABBITMQ_DEFAULT_USER=cameltest -e
RABBITMQ_DEFAULT_PASS=cameltest --hostname my-rabbit --name some-rabbit
rabbitmq:3
+The integration tests requires a running RabbitMQ broker.
-And then the integration tests can be run via Maven
+The broker can be run via Docker:
- mvn test -P itest
+ docker run -it -p 5672:5672 -e RABBITMQ_DEFAULT_USER=cameltest -e
RABBITMQ_DEFAULT_PASS=cameltest --hostname my-rabbit --name some-rabbit
rabbitmq:3
+
+Or to install RabbitMQ as standalone and then configure it:
+
+ rabbitmq-server
+ rabbitmqctl add_user cameltest cameltest
+ rabbitmqctl set_permissions -p / cameltest ".*" ".*" ".*"
+The integration tests can be run via Maven:
+
+ mvn test -P itest
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQIntBasicTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java
similarity index 91%
rename from
components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQIntBasicTest.java
rename to
components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java
index 209f940..4d4ad74 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQIntBasicTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java
@@ -22,10 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class RabbitMQIntBasicTest extends AbstractRabbitMQIntTest {
+public class RabbitMQBasicIntTest extends AbstractRabbitMQIntTest {
- // Startup RabbitMQ via Docker
- // docker run -d -it -p 5672:5672 -e RABBITMQ_DEFAULT_USER=cameltest -e
RABBITMQ_DEFAULT_PASS=cameltest --hostname my-rabbit --name some-rabbit
rabbitmq:3
+ // Startup RabbitMQ via Docker (see readme.txt in camel-rabbitmq folder)
@EndpointInject(uri =
"rabbitmq:localhost:5672/foo?username=cameltest&password=cameltest")
private Endpoint foo;
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
index 07c2d6e..1f3bd86 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
@@ -46,7 +46,7 @@ public class RabbitMQConsumerIntTestReplyTo extends
AbstractRabbitMQIntTest {
protected Channel channel;
- @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE +
"?routingKey=" + ROUTING_KEY)
+ @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE +
"?username=cameltest&password=cameltest&routingKey=" + ROUTING_KEY)
private Endpoint from;
private Connection connection;
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java
index a6e1d73..cea64be 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java
@@ -34,8 +34,8 @@ public class RabbitMQRequeueHandledExceptionIntTest extends
CamelTestSupport {
@Produce(uri = "direct:rabbitMQ")
protected ProducerTemplate directProducer;
- @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?"
- + "autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
+ @EndpointInject(uri =
"rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest"
+ + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
private Endpoint rabbitMQEndpoint;
@EndpointInject(uri = "mock:producing")
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
index cbaf3d0..1de23f0 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
@@ -33,8 +33,8 @@ public class RabbitMQRequeueIntTest extends
AbstractRabbitMQIntTest {
@Produce(uri = "direct:rabbitMQ")
protected ProducerTemplate directProducer;
- @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?"
- + "autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
+ @EndpointInject(uri =
"rabbitmq:localhost:5672/ex4??username=cameltest&password=cameltest"
+ + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
private Endpoint rabbitMQEndpoint;
@EndpointInject(uri = "mock:producing")
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java
index 2e18a4e..c0fea76 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java
@@ -33,8 +33,8 @@ public class RabbitMQRequeueUnhandledExceptionIntTest extends
AbstractRabbitMQIn
@Produce(uri = "direct:rabbitMQ")
protected ProducerTemplate directProducer;
- @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?"
- + "autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
+ @EndpointInject(uri =
"rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest"
+ + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY)
private Endpoint rabbitMQEndpoint;
@EndpointInject(uri = "mock:producing")
diff --git a/components/camel-rabbitmq/src/test/resources/README.md
b/components/camel-rabbitmq/src/test/resources/README.md
deleted file mode 100644
index 89f3d1b..0000000
--- a/components/camel-rabbitmq/src/test/resources/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-How to configure RabbitMQ server for integration tests
------------------------
-rabbitmq-server
-rabbitmqctl add_user cameltest cameltest
-rabbitmqctl set_permissions -p / cameltest ".*" ".*" ".*"
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
