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:24:39 UTC
svn commit: r1407490 - in /camel/branches/camel-2.10.x: ./
components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/
components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/
Author: davsclaus
Date: Fri Nov 9 15:24:38 2012
New Revision: 1407490
URL: http://svn.apache.org/viewvc?rev=1407490&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-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1407487
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=1407490&r1=1407489&r2=1407490&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:24:38 2012
@@ -31,7 +31,7 @@ public class JdbcAnotherRouteTest extend
@Test
public void testTimerInvoked() throws Exception {
- mock.expectedMessageCount(1);
+ mock.expectedMinimumMessageCount(1);
assertMockEndpointsSatisfied();
}
@@ -40,9 +40,7 @@ public class JdbcAnotherRouteTest extend
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- getContext().setTracing(true);
-
- from("timer://kickoff?delay=100&period=10000").
+ from("timer://kickoff?period=1s").
setBody(constant("select * from customer")).
to("jdbc:testdb").
to("mock:result");
Modified: camel/branches/camel-2.10.x/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java?rev=1407490&r1=1407489&r2=1407490&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java Fri Nov 9 15:24:38 2012
@@ -24,12 +24,6 @@ import org.junit.Test;
public class JdbcAggregateDiscardOnTimeoutTest extends AbstractJdbcAggregationTestSupport {
- @Override
- void configureJdbcAggregationRepository() {
- repo.setUseRecovery(true);
- repo.setRecoveryInterval(500, TimeUnit.MILLISECONDS);
- }
-
@Test
public void testAggregateDiscardOnTimeout() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:aggregated");