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:18:27 UTC

svn commit: r1407487 - in /camel/trunk/components: camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java

Author: davsclaus
Date: Fri Nov  9 15:18:26 2012
New Revision: 1407487

URL: http://svn.apache.org/viewvc?rev=1407487&view=rev
Log:
Fixed tests

Modified:
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
    camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java

Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java?rev=1407487&r1=1407486&r2=1407487&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java Fri Nov  9 15:18:26 2012
@@ -31,7 +31,7 @@ public class JdbcAnotherRouteTest extend
     
     @Test
     public void testTimerInvoked() throws Exception {
-        mock.expectedMessageCount(1);
+        mock.expectedMinimumMessageCount(1);
 
         assertMockEndpointsSatisfied();
     }
@@ -40,7 +40,7 @@ public class JdbcAnotherRouteTest extend
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("timer://kickoff?period=10000").
+                from("timer://kickoff?period=1s").
                     setBody(constant("select * from customer")).
                     to("jdbc:testdb").
                     to("mock:result");

Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java?rev=1407487&r1=1407486&r2=1407487&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java Fri Nov  9 15:18:26 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");