You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2014/12/11 17:16:29 UTC
camel git commit: Improve tests
Repository: camel
Updated Branches:
refs/heads/master 1c90efda8 -> 906985f07
Improve tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/906985f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/906985f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/906985f0
Branch: refs/heads/master
Commit: 906985f076f489dfc917424e3f5aaad9f900976e
Parents: 1c90efd
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Dec 11 17:16:22 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Dec 11 17:16:22 2014 +0100
----------------------------------------------------------------------
.../jetty/jettyproducer/JettyHttpProducerRedirectTest.java | 2 +-
.../jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java | 2 +-
.../jetty/jettyproducer/JettyHttpProducerTimeoutTest.java | 2 +-
.../jettyproducer/JettyHttpProducerTransferExceptionTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/906985f0/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java
index 7f4bcf7..d91561d 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerRedirectTest.java
@@ -35,7 +35,7 @@ public class JettyHttpProducerRedirectTest extends BaseJettyTest {
template.requestBody("jetty:http://localhost:{{port}}/test", "Hello World", String.class);
fail("Should have thrown an exception");
} catch (RuntimeCamelException e) {
- HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
+ HttpOperationFailedException cause = assertThrowable(HttpOperationFailedException.class, e.getCause());
assertEquals(301, cause.getStatusCode());
assertEquals(true, cause.isRedirectError());
assertEquals(true, cause.hasRedirectLocation());
http://git-wip-us.apache.org/repos/asf/camel/blob/906985f0/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
index c854124..0aa9e44 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
@@ -69,7 +69,7 @@ public class JettyHttpProducerSuspendResumeTest extends BaseJettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(serverUri)
+ from(serverUri).id("route1")
.transform(body().prepend("Bye "));
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/906985f0/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
index b316c96..0192953 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
@@ -49,7 +49,7 @@ public class JettyHttpProducerTimeoutTest extends BaseJettyTest {
});
Exception e = reply.getException();
assertNotNull("Should have thrown an exception", e);
- ExchangeTimedOutException cause = assertIsInstanceOf(ExchangeTimedOutException.class, e);
+ ExchangeTimedOutException cause = assertThrowable(ExchangeTimedOutException.class, e);
assertEquals(2000, cause.getTimeout());
assertTrue("The input stream should be closed", is.isClosed());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/906985f0/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java
index 29f8a1e..1c59c4f 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java
@@ -32,7 +32,7 @@ public class JettyHttpProducerTransferExceptionTest extends BaseJettyTest {
template.requestBody("jetty:http://localhost:{{port}}/myapp/myservice?transferException=true", "");
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
- IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ IllegalArgumentException cause = assertThrowable(IllegalArgumentException.class, e.getCause());
assertEquals("Damn", cause.getMessage());
}
}