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 2015/07/21 12:03:05 UTC
camel git commit: CAMEL-8985: Fixed tests
Repository: camel
Updated Branches:
refs/heads/master dfd51fe09 -> 2ac36c0c8
CAMEL-8985: Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ac36c0c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ac36c0c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ac36c0c
Branch: refs/heads/master
Commit: 2ac36c0c89cca2ac196635773221567d00d547a6
Parents: dfd51fe
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 21 12:04:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 21 12:08:04 2015 +0200
----------------------------------------------------------------------
.../jetty/HttpStreamCacheFileTest.java | 11 +--
.../JettyHttpProducerAsynchronousTest.java | 16 +---
.../JettyHttpProducerSlowResponseTest.java | 84 --------------------
3 files changed, 8 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ac36c0c/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
index 5be4669..3c63f6a 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
@@ -21,10 +21,10 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.StreamCache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpOperationFailedException;
import org.apache.camel.converter.stream.CachedOutputStream;
+import org.apache.camel.util.ObjectHelper;
import org.junit.Before;
import org.junit.Test;
@@ -33,7 +33,7 @@ import org.junit.Test;
*/
public class HttpStreamCacheFileTest extends BaseJettyTest {
- private String body = "12345678901234567890123456789012345678901234567890";
+ private final String responseBody = "12345678901234567890123456789012345678901234567890";
@Override
@Before
@@ -62,7 +62,7 @@ public class HttpStreamCacheFileTest extends BaseJettyTest {
} catch (CamelExecutionException e) {
HttpOperationFailedException hofe = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
String s = context.getTypeConverter().convertTo(String.class, hofe.getResponseBody());
- assertEquals("Response body", body, s);
+ assertEquals("Response body", responseBody, s);
}
// the temporary files should have been deleted
@@ -87,8 +87,9 @@ public class HttpStreamCacheFileTest extends BaseJettyTest {
from("jetty://http://localhost:{{port}}/myserver")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- if (exchange.getIn().getBody() == null) {
- exchange.getOut().setBody(body);
+ String body = exchange.getIn().getBody(String.class);
+ if (ObjectHelper.isEmpty(body)) {
+ exchange.getOut().setBody(responseBody);
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
} else {
exchange.getOut().setBody("Bye World");
http://git-wip-us.apache.org/repos/asf/camel/blob/2ac36c0c/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
index f8ceaae..6736308 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jetty.jettyproducer;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -73,18 +71,8 @@ public class JettyHttpProducerAsynchronousTest extends BaseJettyTest {
from(url).process(new Processor() {
public void process(Exchange exchange) throws Exception {
- HttpServletResponse res = exchange.getIn().getBody(HttpServletResponse.class);
- res.setStatus(200);
- res.setHeader("customer", "gold");
-
- // write empty string to force flushing
- res.getWriter().write("");
- res.flushBuffer();
-
- Thread.sleep(2000);
-
- res.getWriter().write("Bye World");
- res.flushBuffer();
+ exchange.getIn().setHeader("customer", "gold");
+ exchange.getIn().setBody("Bye World");
}
});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2ac36c0c/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
deleted file mode 100644
index c4cfd99..0000000
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty.jettyproducer;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty.BaseJettyTest;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-/**
- * @version
- */
-public class JettyHttpProducerSlowResponseTest extends BaseJettyTest {
-
- private String url = "jetty://http://0.0.0.0:" + getPort() + "/foo";
-
- @Test
- public void testSlowReply() throws Exception {
- // these tests does not run well on Windows
- if (isPlatform("windows")) {
- return;
- }
-
- // give Jetty time to startup properly
- Thread.sleep(1000);
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
-
- Exchange exchange = template.request(url, null);
-
- assertMockEndpointsSatisfied();
-
- assertNotNull(exchange);
-
- String reply = exchange.getOut().getBody(String.class);
- assertEquals("Bye World", reply);
-
- assertEquals(5, exchange.getOut().getHeaders().size());
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from(url).process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- HttpServletResponse res = exchange.getIn().getBody(HttpServletResponse.class);
- res.setStatus(200);
- res.setHeader("customer", "gold");
-
- // write empty string to force flushing
- res.getWriter().write("");
- res.flushBuffer();
-
- Thread.sleep(1000);
-
- res.getWriter().write("Bye World");
- res.flushBuffer();
- }
- }).to("mock:result");
- }
- };
- }
-}
\ No newline at end of file