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 2010/06/09 06:09:19 UTC
svn commit: r952896 - in
/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4:
HttpNoConnectionTest.java HttpSOTimeoutTest.java
HttpThrowExceptionOnFailureTest.java
Author: davsclaus
Date: Wed Jun 9 04:09:18 2010
New Revision: 952896
URL: http://svn.apache.org/viewvc?rev=952896&view=rev
Log:
CAMEL-2795: Fixed tests
Modified:
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java?rev=952896&r1=952895&r2=952896&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java Wed Jun 9 04:09:18 2010
@@ -20,7 +20,6 @@ import java.net.ConnectException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.http4.handler.BasicValidationHandler;
import org.apache.http.conn.HttpHostConnectException;
import org.apache.http.localserver.LocalTestServer;
@@ -47,13 +46,11 @@ public class HttpNoConnectionTest extend
// stop server so there are no connection
localServer.stop();
- try {
- template.request(url, null);
- fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- HttpHostConnectException cause = assertIsInstanceOf(HttpHostConnectException.class, e.getCause());
- assertIsInstanceOf(ConnectException.class, cause.getCause());
- }
+ Exchange reply = template.request(url, null);
+ Exception e = reply.getException();
+ assertNotNull("Should have thrown an exception", e);
+ HttpHostConnectException cause = assertIsInstanceOf(HttpHostConnectException.class, e);
+ assertIsInstanceOf(ConnectException.class, cause.getCause());
}
@Override
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java?rev=952896&r1=952895&r2=952896&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java Wed Jun 9 04:09:18 2010
@@ -18,7 +18,6 @@ package org.apache.camel.component.http4
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.http4.handler.DelayValidationHandler;
import org.apache.http.localserver.LocalTestServer;
import org.junit.Test;
@@ -41,15 +40,12 @@ public class HttpSOTimeoutTest extends B
@Test
public void httpGetShouldThrowASocketTimeoutException() throws Exception {
- try {
- template.request("http4://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=1000", new Processor() {
- public void process(Exchange exchange) throws Exception {
- }
- });
- fail("Should throw a RuntimeCamelException");
- } catch (RuntimeCamelException e) {
- // expected
- }
+ Exchange reply = template.request("http4://" + getHostName() + ":" + getPort() + "?httpClient.soTimeout=1000", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ }
+ });
+ Exception e = reply.getException();
+ assertNotNull("Should have thrown an exception", e);
}
@Override
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java?rev=952896&r1=952895&r2=952896&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java Wed Jun 9 04:09:18 2010
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.http4.handler.BasicValidationHandler;
import org.apache.http.HttpStatus;
import org.apache.http.localserver.LocalTestServer;
@@ -52,18 +51,15 @@ public class HttpThrowExceptionOnFailure
@Test
public void httpGetWhichReturnsHttp501ShouldThrowAnException() throws Exception {
- try {
- template.request("http4://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=true", new Processor() {
- public void process(Exchange exchange) throws Exception {
- }
- });
- fail("RuntimeCamelException expected");
- } catch (RuntimeCamelException e) {
- // expected
- HttpOperationFailedException ex = (HttpOperationFailedException) e.getCause();
- assertEquals(501, ex.getStatusCode());
- }
+ Exchange reply = template.request("http4://" + getHostName() + ":" + getPort() + "/XXX?throwExceptionOnFailure=true", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ }
+ });
+ Exception e = reply.getException();
+ assertNotNull("Should have thrown an exception", e);
+ HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e);
+ assertEquals(501, cause.getStatusCode());
}
@Override