Author: davsclaus Date: Fri Feb 11 08:45:33 2011 New Revision: 1069706 URL: http://svn.apache.org/viewvc?rev=1069706&view=rev Log: Fixed test.
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java?rev=1069706&r1=1069705&r2=1069706&view=diff ============================================================================== --- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java (original) +++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java Fri Feb 11 08:45:33 2011 @@ -51,11 +51,6 @@ public class HawtDBAggregateRecoverDeadL getMockEndpoint("mock:aggregated").expectedMessageCount(3); // it should keep sending to DLC if it failed, so test for min 2 attempts getMockEndpoint("mock:dead").expectedMinimumMessageCount(2); - // all the details should be the same about redelivered and redelivered 2 times - getMockEndpoint("mock:dead").message(0).header(Exchange.REDELIVERY_COUNTER).isEqualTo(2); - getMockEndpoint("mock:dead").message(0).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE); - getMockEndpoint("mock:dead").message(1).header(Exchange.REDELIVERY_COUNTER).isEqualTo(2); - getMockEndpoint("mock:dead").message(1).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE); template.sendBodyAndHeader("direct:start", "A", "id", 123); template.sendBodyAndHeader("direct:start", "B", "id", 123); @@ -64,6 +59,15 @@ public class HawtDBAggregateRecoverDeadL template.sendBodyAndHeader("direct:start", "E", "id", 123); assertMockEndpointsSatisfied(30, TimeUnit.SECONDS); + + // all the details should be the same about redelivered and redelivered 2 times + Exchange first = getMockEndpoint("mock:dead").getReceivedExchanges().get(0); + assertEquals(true, first.getIn().getHeader(Exchange.REDELIVERED)); + assertEquals(2, first.getIn().getHeader(Exchange.REDELIVERY_COUNTER)); + + Exchange second = getMockEndpoint("mock:dead").getReceivedExchanges().get(1); + assertEquals(true, second.getIn().getHeader(Exchange.REDELIVERED)); + assertEquals(2, first.getIn().getHeader(Exchange.REDELIVERY_COUNTER)); } @Override