camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r896369 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/impl/ camel-core/src/test/java/org/apache/camel/processor/ components/camel-spring/src/test/resources/org/apache/camel/spring/processor/
Date Wed, 06 Jan 2010 10:20:58 GMT
Author: davsclaus
Date: Wed Jan  6 10:20:57 2010
New Revision: 896369

URL: http://svn.apache.org/viewvc?rev=896369&view=rev
Log:
Fixing tests on other boxes.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleShutdownGracefulTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownDeferTest.xml

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleShutdownGracefulTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleShutdownGracefulTest.java?rev=896369&r1=896368&r2=896369&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleShutdownGracefulTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleShutdownGracefulTest.java
Wed Jan  6 10:20:57 2010
@@ -46,7 +46,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("seda:foo").to("mock:foo").delay(2000).process(new Processor() {
+                from("seda:foo").to("mock:foo").delay(3000).process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         foo = foo + exchange.getIn().getBody(String.class);
                     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java?rev=896369&r1=896368&r2=896369&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
Wed Jan  6 10:20:57 2010
@@ -36,23 +36,19 @@
     public void testShutdownDeferred() throws Exception {
         MockEndpoint bar = getMockEndpoint("mock:bar");
         bar.expectedMinimumMessageCount(1);
-        bar.setResultWaitTime(3000);
 
         template.sendBody("seda:foo", "A");
         template.sendBody("seda:foo", "B");
         template.sendBody("seda:foo", "C");
         template.sendBody("seda:foo", "D");
         template.sendBody("seda:foo", "E");
-        template.sendBody("seda:foo", "F");
-        template.sendBody("seda:foo", "G");
-        template.sendBody("seda:foo", "H");
 
         assertMockEndpointsSatisfied();
 
         context.stop();
 
-        // should route all 8
-        assertEquals("Should complete all 8 messages", 8, bar.getReceivedCounter());
+        // should route all 5
+        assertEquals("Should complete all 8 messages", 5, bar.getReceivedCounter());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java?rev=896369&r1=896368&r2=896369&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
Wed Jan  6 10:20:57 2010
@@ -36,23 +36,19 @@
     public void testShutdownNotDeferred() throws Exception {
         MockEndpoint bar = getMockEndpoint("mock:bar");
         bar.expectedMinimumMessageCount(1);
-        bar.setResultWaitTime(3000);
 
         template.sendBody("seda:foo", "A");
         template.sendBody("seda:foo", "B");
         template.sendBody("seda:foo", "C");
         template.sendBody("seda:foo", "D");
         template.sendBody("seda:foo", "E");
-        template.sendBody("seda:foo", "F");
-        template.sendBody("seda:foo", "G");
-        template.sendBody("seda:foo", "H");
 
         assertMockEndpointsSatisfied();
 
         context.stop();
 
-        // should not route all 8
-        assertTrue("Should NOT complete all 8 messages, was " + bar.getReceivedCounter(),
bar.getReceivedCounter() < 8);
+        // should not route all 5
+        assertTrue("Should NOT complete all 5 messages, was " + bar.getReceivedCounter(),
bar.getReceivedCounter() < 5);
     }
 
     @Override

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownDeferTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownDeferTest.xml?rev=896369&r1=896368&r2=896369&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownDeferTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownDeferTest.xml
Wed Jan  6 10:20:57 2010
@@ -26,7 +26,7 @@
     <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
         <route startupOrder="1">
             <from uri="seda:foo"/>
-            <delay><constant>500</constant></delay>
+            <delay><constant>1000</constant></delay>
             <to uri="file://target/deferred"/>
         </route>
 



Mime
View raw message