You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/31 15:07:36 UTC
[camel] 06/08: CAMEL-13792 - Rename components to default names,
Camel-http4 to Camel-http - Aligned Integration tests
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c7a51901791c84d3ecda9da58d4451751879f454
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 16:08:25 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Aligned Integration tests
---
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-itest/pom.xml | 2 +-
.../java/org/apache/camel/itest/http/Http4RouteTest.java | 6 +++---
.../apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java | 2 +-
.../camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java | 12 ++++++------
.../org/apache/camel/itest/jetty/JettyRestRedirectTest.java | 4 ++--
tests/camel-performance/pom.xml | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 9acb307..1e7254b 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -48,7 +48,7 @@
<!-- TODO OSGi hell with starting up Karaf 4.x for this test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 9489324..b27980b 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
index b74e3a5..383a78a 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
@@ -30,7 +30,7 @@ public class Http4RouteTest extends CamelTestSupport {
@Test
public void sendHttpGetRequestTest() {
- String response = template.requestBody("http4://localhost:" + port1
+ String response = template.requestBody("http://localhost:" + port1
+ "/test?aa=bb&httpClient.socketTimeout=10000&httpClient.connectTimeout=10000"
+ "&bridgeEndpoint=true&throwExceptionOnFailure=false", null, String.class);
assertEquals("Get a wrong response", "aa=bb", response);
@@ -76,9 +76,9 @@ public class Http4RouteTest extends CamelTestSupport {
});
- from("direct:start1").to("http4://localhost:" + port1 + "/test");
+ from("direct:start1").to("http://localhost:" + port1 + "/test");
- from("direct:start2").to("http4://localhost:" + port2 + "/test");
+ from("direct:start2").to("http://localhost:" + port2 + "/test");
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java
index de43d0c..ab0bde2 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class IsUseAdviceWithJUnit4Test extends CamelTestSupport {
- private String providerEndPointURI = "http4://fakeeeeWebsite.com:80";
+ private String providerEndPointURI = "http://fakeeeeWebsite.com:80";
private String timerEndPointURI = "timer://myTimer";
private String mockEndPointURI = "mock:myMock";
private String directEndPointURI = "direct:myDirect";
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
index 1954350..da376c9 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
@@ -43,7 +43,7 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The first call to our service will hit the first destination in the round robin load balancer
//this destination has the preserveProxyHeader parameter set to true, so we verify the Host header
//received by our downstream instance matches the address and port of the proxied service
- Exchange reply = template.request("http4:localhost:" + port + "/myapp", new Processor() {
+ Exchange reply = template.request("http:localhost:" + port + "/myapp", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Hello World");
@@ -57,7 +57,7 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The second call to our service will hit the second destination in the round robin load balancer
//this destination does not have the preserveProxyHeader, so we expect the Host header received by the destination
//to match the url of the destination service itself
- Exchange reply2 = template.request("http4:localhost:" + port + "/myapp", new Processor() {
+ Exchange reply2 = template.request("http:localhost:" + port + "/myapp", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Bye World");
@@ -72,7 +72,7 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The next two calls will use/test the jetty producers in the round robin load balancer
//The first has the preserveHostHeader option set to true, so we would expect to receive a Host header matching the /myapp proxied service
- Exchange reply3 = template.request("http4:localhost:" + port + "/myapp", new Processor() {
+ Exchange reply3 = template.request("http:localhost:" + port + "/myapp", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Bye JWorld");
@@ -84,7 +84,7 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
assertEquals("localhost:" + port, receivedHostHeaderEndpoint3);
//The second does not have a preserveHostHeader (preserveHostHeader=false), we would expect to see a Host header matching the destination service
- Exchange reply4 = template.request("http4:localhost:" + port + "/myapp", new Processor() {
+ Exchange reply4 = template.request("http:localhost:" + port + "/myapp", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("JAVA!!!!");
@@ -109,8 +109,8 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
public void configure() throws Exception {
from("jetty:http://localhost:" + port + "/myapp?matchOnUriPrefix=true")
.loadBalance().roundRobin()
- .to("http4://localhost:" + port2 + "/foo?bridgeEndpoint=true&throwExceptionOnFailure=false&preserveHostHeader=true")
- .to("http4://localhost:" + port3 + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false")
+ .to("http://localhost:" + port2 + "/foo?bridgeEndpoint=true&throwExceptionOnFailure=false&preserveHostHeader=true")
+ .to("http://localhost:" + port3 + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false")
.to("http://localhost:" + port4 + "/jbar?bridgeEndpoint=true&throwExceptionOnFailure=false&preserveHostHeader=true")
.to("http://localhost:" + port5 + "/jbarf?bridgeEndpoint=true&throwExceptionOnFailure=false");
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
index 3bd25af..6036fef 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
@@ -29,7 +29,7 @@ public class JettyRestRedirectTest extends CamelTestSupport {
@Test
public void testRedirectInvocation() throws Exception {
- String response = template.requestBody("http4://localhost:" + port + "/metadata/profile/tag", "<hello>Camel</hello>", String.class);
+ String response = template.requestBody("http://localhost:" + port + "/metadata/profile/tag", "<hello>Camel</hello>", String.class);
assertEquals("It should support the redirect out of box.", "Mock profile", response);
}
@@ -40,7 +40,7 @@ public class JettyRestRedirectTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
- restConfiguration().component("jetty").host("localhost").scheme("http").port(port).producerComponent("http4");
+ restConfiguration().component("jetty").host("localhost").scheme("http").port(port).producerComponent("http");
rest("/metadata/profile")
.get("/{id}").to("direct:profileLookup")
.post("/tag").to("direct:tag");
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index a3adc9e..9076291 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>