Updated Branches: refs/heads/master 9b0c6756c -> b5816d332
Trying to fix the tests failing on the CI-Server being recently re-enabled after the upgrade to AMQ 5.9. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b5816d33 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b5816d33 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b5816d33 Branch: refs/heads/master Commit: b5816d332bacef6dacefd545d0004d010c61799c Parents: 9b0c675 Author: Babak Vahdat <bvah...@apache.org> Authored: Mon Oct 28 16:27:42 2013 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Mon Oct 28 16:27:42 2013 +0100 ---------------------------------------------------------------------- .../sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b5816d33/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java index 2bff6df..bbd04eb 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java @@ -54,6 +54,10 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup dataSource = context.getRegistry().lookupByNameAndType(getDatasourceName(), DataSource.class); jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.afterPropertiesSet(); + + // cater for slow servers + getMockEndpoint("mock:a").setResultWaitTime(30000); + getMockEndpoint("mock:b").setResultWaitTime(30000); } protected String getDatasourceName() { @@ -133,10 +137,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup template.sendBodyAndHeader("activemq:queue:inbox", "B", "uid", 456); - // cater for slow servers - getMockEndpoint("mock:a").setResultWaitTime(30000); - getMockEndpoint("mock:b").setResultWaitTime(30000); - // assert mock and wait for the message to be done assertMockEndpointsSatisfied(); assertTrue("Should complete 7 messages", notify.matchesMockWaitTime()); @@ -165,10 +165,6 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup template.sendBodyAndHeader("activemq:queue:inbox", "E", "uid", 222); template.sendBodyAndHeader("activemq:queue:inbox", "D", "uid", 111); - // cater for slow servers - getMockEndpoint("mock:a").setResultWaitTime(30000); - getMockEndpoint("mock:b").setResultWaitTime(30000); - // assert mock and wait for the message to be done assertMockEndpointsSatisfied(); assertTrue("Should complete 3 messages", notify.matchesMockWaitTime());
