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 2012/11/09 16:27:04 UTC
svn commit: r1407491 - in /camel/branches/camel-2.10.x: ./
components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/
components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/
Author: davsclaus
Date: Fri Nov 9 15:27:02 2012
New Revision: 1407491
URL: http://svn.apache.org/viewvc?rev=1407491&view=rev
Log:
Fixed tests
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
camel/branches/camel-2.10.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1407488
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java?rev=1407491&r1=1407490&r2=1407491&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java Fri Nov 9 15:27:02 2012
@@ -40,6 +40,7 @@ public class JdbcAnotherRouteTest extend
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
+ // trigger every second
from("timer://kickoff?period=1s").
setBody(constant("select * from customer")).
to("jdbc:testdb").
Modified: camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java?rev=1407491&r1=1407490&r2=1407491&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java Fri Nov 9 15:27:02 2012
@@ -30,7 +30,7 @@ public class JdbcSpringAnotherRouteTest
@Test
public void testTimerInvoked() throws Exception {
- mock.expectedMessageCount(1);
+ mock.expectedMinimumMessageCount(1);
assertMockEndpointsSatisfied();
}
Modified: camel/branches/camel-2.10.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml?rev=1407491&r1=1407490&r2=1407491&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml Fri Nov 9 15:27:02 2012
@@ -27,7 +27,8 @@
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="timer://kickoff?delay=100&period=10000"/>
+ <!-- trigger every second -->
+ <from uri="timer://kickoff?period=1s"/>
<setBody>
<constant>select * from customer</constant>
</setBody>