Repository: camel Updated Branches: refs/heads/master d5b596403 -> eb86ec62c
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/f18270e8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f18270e8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f18270e8 Branch: refs/heads/master Commit: f18270e8d0d559912f92af832ad0982570d4a751 Parents: 464c06e Author: Andrew Austin <andrew.aus...@wgu.edu> Authored: Sat Feb 21 17:28:31 2015 -0700 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Feb 22 16:17:32 2015 +0100 ---------------------------------------------------------------------- .../rabbitmq/RabbitMQRequeueIntTest.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f18270e8/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();
