Author: davsclaus
Date: Wed Dec 2 15:02:42 2009
New Revision: 886167
URL: http://svn.apache.org/viewvc?rev=886167&view=rev
Log:
CAMEL-2246: Improved unit test for Jetty Http Producer to let Jetty be prepared
when its hit
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
Wed Dec 2 15:02:42 2009
@@ -22,6 +22,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
@@ -115,7 +116,14 @@
}
protected int waitForDoneOrFailure() throws InterruptedException {
- done.await();
+
+ long timeout = client.getTimeout();
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Waiting for done or failure with timeout: " + timeout);
+ }
+ done.await(timeout, TimeUnit.MILLISECONDS);
+
return getStatus();
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
Wed Dec 2 15:02:42 2009
@@ -107,7 +107,7 @@
}
@Test
- public void testEndpointWithoutHttps() {
+ public void testEndpointWithoutHttps() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a",
MockEndpoint.class);
try {
template.sendBodyAndHeader("http://localhost:9080/test";,
expectedBody, "Content-Type", "application/xml");
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
Wed Dec 2 15:02:42 2009
@@ -29,6 +29,9 @@
@Test
public void testTwoEndpoints() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
Exchange a = template.request("direct:a", null);
assertNotNull(a);
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
Wed Dec 2 15:02:42 2009
@@ -29,7 +29,10 @@
@Test
public void testHttpFault() throws Exception {
- String out =
template.requestBody("jetty://http://localhost:9080/test";, "Hello World",
String.class);
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
+ String out =
template.requestBody("jetty://http://localhost:9082/test";, "Hello World",
String.class);
assertEquals("This is a fault", out);
}
@@ -38,7 +41,7 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("jetty://http://localhost:9080/test";)
+ from("jetty://http://localhost:9082/test";)
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
exchange.getOut().setFault(true);
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
Wed Dec 2 15:02:42 2009
@@ -30,6 +30,9 @@
@Test
public void testTimeout() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:error").expectedMessageCount(0);
getMockEndpoint("mock:timeout").expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
Wed Dec 2 15:02:42 2009
@@ -37,6 +37,9 @@
@Test
public void testAsynchronous() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
thread1 = "";
thread2 = "";
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
Wed Dec 2 15:02:42 2009
@@ -38,11 +38,17 @@
@Test
public void testNoConcurrentProducers() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
doSendMessages(1, 1);
}
@Test
public void testConcurrentProducers() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
doSendMessages(10, 5);
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
Wed Dec 2 15:02:42 2009
@@ -26,10 +26,13 @@
*/
public class JettyHttpProducerContentBasedRouteTest extends CamelTestSupport {
- private String serverUri = "jetty://http://localhost:9080/myservice";;
+ private String serverUri = "jetty://http://localhost:9087/myservice";;
@Test
public void testSendOne() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
MockEndpoint mock = getMockEndpoint("mock:one");
mock.expectedHeaderReceived("one", "true");
@@ -41,6 +44,9 @@
@Test
public void testSendOther() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
MockEndpoint mock = getMockEndpoint("mock:other");
mock.expectedHeaderReceived("two", "true");
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
Wed Dec 2 15:02:42 2009
@@ -27,7 +27,7 @@
*/
public class JettyHttpProducerGetWithParamAsExchangeHeaderTest extends
CamelTestSupport {
- private String serverUri = "jetty://http://localhost:9080/myservice";;
+ private String serverUri = "jetty://http://localhost:9088/myservice";;
@Test
public void testHttpGetWithParamsViaURI() throws Exception {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
Wed Dec 2 15:02:42 2009
@@ -30,7 +30,7 @@
*/
public class JettyHttpProducerGetWithParamTest extends CamelTestSupport {
- private String serverUri = "jetty://http://localhost:9080/myservice";;
+ private String serverUri = "jetty://http://localhost:9086/myservice";;
private MyParamsProcessor processor = new MyParamsProcessor();
@Test
@@ -40,6 +40,9 @@
mock.expectedHeaderReceived("one", "eins");
mock.expectedHeaderReceived("two", "zwei");
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
template.requestBody(serverUri + "?one=uno&two=dos", "Hello World");
assertMockEndpointsSatisfied();
@@ -52,6 +55,9 @@
mock.expectedHeaderReceived("one", "eins");
mock.expectedHeaderReceived("two", "zwei");
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
template.requestBodyAndHeader(serverUri, "Hello World",
Exchange.HTTP_QUERY, "one=uno&two=dos");
assertMockEndpointsSatisfied();
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
Wed Dec 2 15:02:42 2009
@@ -32,6 +32,9 @@
@Test
public void testQueryParameters() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
Exchange exchange = template.request(url + "?quote=Camel%20rocks",
null);
assertNotNull(exchange);
@@ -44,6 +47,9 @@
@Test
public void testQueryParametersWithHeader() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
Exchange exchange = template.request(url, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_QUERY, "quote=Camel
rocks");
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
Wed Dec 2 15:02:42 2009
@@ -33,6 +33,9 @@
@Test
public void testSendImage() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.message(0).body().isInstanceOf(InputStream.class);
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
Wed Dec 2 15:02:42 2009
@@ -32,6 +32,9 @@
@Test
public void test404() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
try {
template.request(url, null);
} catch (Exception e) {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
Wed Dec 2 15:02:42 2009
@@ -34,6 +34,9 @@
@Test
public void testSlowReply() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
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=886167&r1=886166&r2=886167&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 Dec 2 15:02:42 2009
@@ -30,6 +30,9 @@
@Test
public void testTimeout() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
try {
template.request(url, null);
fail("Should have thrown a timeout exception");
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
Wed Dec 2 15:02:42 2009
@@ -28,6 +28,9 @@
@Override
@Before
public void setUp() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
// ensure jsse clients can validate the self signed dummy localhost
cert,
// use the server keystore as the trust store for these tests
URL trustStoreUrl =
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java?rev=886167&r1=886166&r2=886167&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
Wed Dec 2 15:02:42 2009
@@ -29,7 +29,10 @@
}
@Test
- public void testEndpointWithoutHttps() {
+ public void testEndpointWithoutHttps() throws Exception {
+ // give Jetty time to startup properly
+ Thread.sleep(1000);
+
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a",
MockEndpoint.class);
try {
template.sendBodyAndHeader("jetty://http://localhost:9080/test";,
expectedBody, "Content-Type", "application/xml");
