Author: davsclaus
Date: Tue Oct 20 06:07:47 2009
New Revision: 826968
URL: http://svn.apache.org/viewvc?rev=826968&view=rev
Log:
Fixed unit tests.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
Tue Oct 20 06:07:47 2009
@@ -33,7 +33,7 @@
@Override
protected void setUp() throws Exception {
deleteDirectory("target/reports");
- // use current dir as base as aboslute path
+ // use current dir as base as absolute path
base = new File("").getAbsolutePath() + "/target/reports";
super.setUp();
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
Tue Oct 20 06:07:47 2009
@@ -23,7 +23,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.interceptor.Tracer;
/**
* @version $Revision$
@@ -32,7 +31,7 @@
public void testMultipleFromEndpoint() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:results");
- mock.expectedMessageCount(3);
+ mock.expectedMessageCount(2);
template.sendBody("direct:foo", "foo");
template.sendBody("seda:bar", "bar");
@@ -56,7 +55,7 @@
public void configure() throws Exception {
getContext().setTracing(true);
- from("direct:foo", "seda:bar",
"timer://baz?delay=500&period=1000").to("mock:results");
+ from("direct:foo", "seda:bar").to("mock:results");
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
Tue Oct 20 06:07:47 2009
@@ -66,7 +66,7 @@
Long last = (Long) mbeanServer.getAttribute(routeName,
"LastProcessingTime");
Long total = (Long) mbeanServer.getAttribute(routeName,
"TotalProcessingTime");
- assertTrue("Should take at most 2.0 sec: was " + total, total < 2000);
+ assertTrue("Should take at most 2.5 sec: was " + total, total < 2500);
// change the throttler using JMX
mbeanServer.setAttribute(throttlerName, new
Attribute("MaximumRequestsPerPeriod", (long) 2));
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
Tue Oct 20 06:07:47 2009
@@ -41,8 +41,8 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
deleteDirectory("target/originalexchange");
+ super.setUp();
}
@Override
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
Tue Oct 20 06:07:47 2009
@@ -55,10 +55,10 @@
<bean id="myThrowProcessor"
class="org.apache.camel.processor.DeadLetterChannelUseOriginalInBodyWithFileTest$MyThrowProcessor"/>
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
- <route errorHandlerRef="dead">
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";
errorHandlerRef="dead">
+ <route>
<from uri="file://target/originalexchange?noop=true"/>
- <setBody><simple>${in.body} World</simple></setBody>
+ <transform><simple>${in.body} World</simple></transform>
<process ref="myThrowProcessor"/>
</route>
</camelContext>
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml?rev=826968&r1=826967&r2=826968&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/fromMultipleEndpointTest.xml
Tue Oct 20 06:07:47 2009
@@ -27,7 +27,6 @@
<route>
<from uri="direct:foo"/>
<from uri="seda:bar"/>
- <from uri="timer://baz?delay=500&period=1000"/>
<to uri="mock:results"/>
</route>
<!-- END SNIPPET: e1 -->
