Author: davsclaus
Date: Fri Jan 22 08:15:09 2010
New Revision: 902031
URL: http://svn.apache.org/viewvc?rev=902031&view=rev
Log:
Fixed unit test on slower boxes
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java?rev=902031&r1=902030&r2=902031&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
Fri Jan 22 08:15:09 2010
@@ -42,9 +42,11 @@
}
public void testShutdownCompleteAllTasks() throws Exception {
+ // give it 20 seconds to shutdown
+ context.getShutdownStrategy().setTimeout(20);
+
MockEndpoint bar = getMockEndpoint("mock:bar");
bar.expectedMinimumMessageCount(1);
- bar.setResultWaitTime(3000);
assertMockEndpointsSatisfied();
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java?rev=902031&r1=902030&r2=902031&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
Fri Jan 22 08:15:09 2010
@@ -39,23 +39,22 @@
template.sendBodyAndHeader(url, "C", Exchange.FILE_NAME, "c.txt");
template.sendBodyAndHeader(url, "D", Exchange.FILE_NAME, "d.txt");
template.sendBodyAndHeader(url, "E", Exchange.FILE_NAME, "e.txt");
- template.sendBodyAndHeader(url, "F", Exchange.FILE_NAME, "f.txt");
- template.sendBodyAndHeader(url, "G", Exchange.FILE_NAME, "g.txt");
- template.sendBodyAndHeader(url, "H", Exchange.FILE_NAME, "h.txt");
}
public void testShutdownCompleteCurrentTaskOnly() throws Exception {
+ // give it 20 seconds to shutdown
+ context.getShutdownStrategy().setTimeout(20);
+
MockEndpoint bar = getMockEndpoint("mock:bar");
bar.expectedMinimumMessageCount(1);
- bar.setResultWaitTime(3000);
assertMockEndpointsSatisfied();
// shutdown during processing
context.stop();
- // should NOT route all 8
- assertTrue("Should NOT complete all messages, was: " +
bar.getReceivedCounter(), bar.getReceivedCounter() < 8);
+ // should NOT route all 5
+ assertTrue("Should NOT complete all messages, was: " +
bar.getReceivedCounter(), bar.getReceivedCounter() < 5);
}
@Override
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml?rev=902031&r1=902030&r2=902031&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
Fri Jan 22 08:15:09 2010
@@ -22,6 +22,11 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
+ <bean id="shutdown" class="org.apache.camel.impl.DefaultShutdownStrategy">
+ <!-- give it 20 sec to shutdown -->
+ <property name="timeout" value="20"/>
+ </bean>
+
<!-- START SNIPPET: e1 -->
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<!-- let this route complete all its pending messages when asked to
shutdown -->
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml?rev=902031&r1=902030&r2=902031&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
Fri Jan 22 08:15:09 2010
@@ -22,6 +22,11 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
+ <bean id="shutdown" class="org.apache.camel.impl.DefaultShutdownStrategy">
+ <!-- give it 20 sec to shutdown -->
+ <property name="timeout" value="20"/>
+ </bean>
+
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route startupOrder="1" shutdownRunningTask="CompleteCurrentTaskOnly">
<from uri="file:target/pending"/>
