You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/12/08 18:14:30 UTC
svn commit: r1418711 - in /camel/branches/camel-2.9.x: ./
tests/camel-itest/src/test/java/org/apache/camel/itest/sql/
Author: bvahdat
Date: Sat Dec 8 17:14:29 2012
New Revision: 1418711
URL: http://svn.apache.org/viewvc?rev=1418711&view=rev
Log:
Merged revisions 1418710 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1418710 | bvahdat | 2012-12-08 18:12:55 +0100 (Sa, 08 Dez 2012) | 9 lines
Merged revisions 1418708 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1418708 | bvahdat | 2012-12-08 18:11:11 +0100 (Sa, 08 Dez 2012) | 1 line
CAMEL-5856: Polished.
........
................
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1418708
Merged /camel/branches/camel-2.10.x:r1418710
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java?rev=1418711&r1=1418710&r2=1418711&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java Sat Dec 8 17:14:29 2012
@@ -90,7 +90,7 @@ public class FromJmsToJdbcIdempotentCons
// use a notify to know that after 1+6 (1 original + 6 redelivery) attempts from AcitveMQ
NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create();
- // TODO: occasionally we get only 6 instead of 7 expected exchanges which's most probably an issue in AcitveMQ itself
+ // TODO: occasionally we get only 6 instead of 7 expected exchanges which's most probably an issue in ActiveMQ itself
getMockEndpoint("mock:a").expectedMessageCount(7);
// force exception to occur at mock a
getMockEndpoint("mock:a").whenAnyExchangeReceived(new Processor() {
Modified: camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java?rev=1418711&r1=1418710&r2=1418711&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java Sat Dec 8 17:14:29 2012
@@ -48,6 +48,7 @@ public class FromJmsToJdbcIdempotentCons
DriverManager.getConnection("jdbc:derby:target/testdb;shutdown=true");
} catch (SQLException e) {
// a successful shutdown always results in an SQLException to indicate that Derby has shut down and that there is no other exception.
+ assertEquals("Database 'target/testdb' shutdown.", e.getMessage());
}
}