Author: davsclaus
Date: Wed Jun 9 06:21:40 2010
New Revision: 952909
URL: http://svn.apache.org/viewvc?rev=952909&view=rev
Log:
CAMEL-2795: Fixed tests
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java?rev=952909&r1=952908&r2=952909&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
Wed Jun 9 06:21:40 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty.jettyproducer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -38,13 +39,11 @@ public class JettyHttpProducerTimeoutTes
// give Jetty time to startup properly
Thread.sleep(1000);
- try {
- template.request(url, null);
- fail("Should have thrown a timeout exception");
- } catch (Exception e) {
- ExchangeTimedOutException cause =
assertIsInstanceOf(ExchangeTimedOutException.class, e.getCause());
- assertEquals(2000, cause.getTimeout());
- }
+ Exchange reply = template.request(url, null);
+ Exception e = reply.getException();
+ assertNotNull("Should have thrown an exception", e);
+ ExchangeTimedOutException cause =
assertIsInstanceOf(ExchangeTimedOutException.class, e);
+ assertEquals(2000, cause.getTimeout());
}
@Override