You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/02/22 16:28:12 UTC
[2/3] camel git commit: CAMEL-8310 Cleaning up tests
CAMEL-8310 Cleaning up tests
Cleaning up test approach.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/abee35c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/abee35c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/abee35c6
Branch: refs/heads/camel-2.14.x
Commit: abee35c6800a68e96ccd867723180a1c1f0521df
Parents: 99d8831
Author: Andrew Austin <an...@wgu.edu>
Authored: Sat Feb 21 17:28:31 2015 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Feb 22 16:28:49 2015 +0100
----------------------------------------------------------------------
.../rabbitmq/RabbitMQRequeueIntTest.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/abee35c6/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java
----------------------------------------------------------------------
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 534f5b4..d860a41 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
@@ -45,17 +45,6 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
.id("consumingRoute")
.log("Receiving message")
.inOnly(consumingMockEndpoint)
- .choice()
- .when(body().isEqualTo("requeue header false"))
- .log("Setting REQUEUE flag to false")
- .setHeader(RabbitMQConstants.REQUEUE, constant(false))
- .when(body().isEqualTo("requeue header true"))
- .log("Setting REQUEUE flag to true")
- .setHeader(RabbitMQConstants.REQUEUE, constant(true))
- .when(body().isEqualTo("non-boolean header"))
- .log("Setting REQUEUE flag to non-boolean")
- .setHeader(RabbitMQConstants.REQUEUE, constant(4l))
- .end()
.throwException(new Exception("Simulated exception"));
}
};
@@ -66,7 +55,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
producingMockEndpoint.expectedMessageCount(1);
consumingMockEndpoint.expectedMessageCount(1);
- directProducer.sendBody("no requeue header");
+ directProducer.sendBody("Hello, World!");
Thread.sleep(100);
producingMockEndpoint.assertIsSatisfied();
@@ -78,7 +67,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
producingMockEndpoint.expectedMessageCount(1);
consumingMockEndpoint.expectedMessageCount(1);
- directProducer.sendBody("non-boolean header");
+ directProducer.sendBodyAndHeader("Hello, World!", RabbitMQConstants.REQUEUE, 4l);
Thread.sleep(100);
producingMockEndpoint.assertIsSatisfied();
@@ -90,7 +79,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
producingMockEndpoint.expectedMessageCount(1);
consumingMockEndpoint.expectedMessageCount(1);
- directProducer.sendBody("non-boolean header");
+ directProducer.sendBodyAndHeader("Hello, World!", RabbitMQConstants.REQUEUE, false);
Thread.sleep(100);
producingMockEndpoint.assertIsSatisfied();
@@ -102,7 +91,7 @@ public class RabbitMQRequeueIntTest extends CamelTestSupport {
producingMockEndpoint.expectedMessageCount(1);
consumingMockEndpoint.setMinimumExpectedMessageCount(2);
- directProducer.sendBody("requeue header true");
+ directProducer.sendBodyAndHeader("Hello, World!", RabbitMQConstants.REQUEUE, true);
Thread.sleep(100);
producingMockEndpoint.assertIsSatisfied();