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/06/07 09:48:46 UTC
[camel] branch master updated: CAMEL-13220 - Fixed camel-consul
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
The following commit(s) were added to refs/heads/master by this push:
new 5c7d632 CAMEL-13220 - Fixed camel-consul tests
5c7d632 is described below
commit 5c7d632cdec612329aa3e1a1775fe3b247c271e0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jun 7 11:48:18 2019 +0200
CAMEL-13220 - Fixed camel-consul tests
---
components/camel-consul/pom.xml | 5 +++++
.../component/consul/cloud/ConsulDefaultServiceCallRouteTest.java | 2 +-
.../component/consul/cloud/ConsulRibbonServiceCallRouteTest.java | 2 +-
.../consul/cloud/ConsulServiceCallWithRegistrationTest.java | 4 ++--
.../consul/cloud/SpringConsulDefaultServiceCallRouteTest.xml | 4 ++--
.../consul/cloud/SpringConsulExpressionServiceCallRouteTest.xml | 6 +++---
.../consul/cloud/SpringConsulRibbonServiceCallRouteTest.xml | 4 ++--
7 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 9ad068e..73a0d0a 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -55,6 +55,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-http4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
index 7532ccb..61cb3b6 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
@@ -97,7 +97,7 @@ public class ConsulDefaultServiceCallRouteTest extends ConsulTestSupport {
from("direct:start")
.serviceCall()
.name(SERVICE_NAME)
- .component("jetty")
+ .component("http")
.defaultLoadBalancer()
.consulServiceDiscovery()
.url(consulUrl())
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
index e09510a..065c3ff 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
@@ -97,7 +97,7 @@ public class ConsulRibbonServiceCallRouteTest extends ConsulTestSupport {
from("direct:start")
.serviceCall()
.name(SERVICE_NAME)
- .component("jetty")
+ .component("http")
.consulServiceDiscovery()
.url(consulUrl())
.endParent()
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
index cbc3361..e7f6a80 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
@@ -71,7 +71,7 @@ public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
from("direct:start")
.serviceCall()
.name(serviceName)
- .component("jetty")
+ .component("undertow")
.defaultLoadBalancer()
.consulServiceDiscovery()
.url(consulUrl())
@@ -107,7 +107,7 @@ public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
from("direct:start")
.serviceCall()
.name(serviceName + "/bad/path")
- .component("jetty")
+ .component("http")
.defaultLoadBalancer()
.consulServiceDiscovery()
.url(consulUrl())
diff --git a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.xml b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.xml
index 18f5f9e..8d3cfa7 100644
--- a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.xml
+++ b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.xml
@@ -31,7 +31,7 @@
<!-- ServiceCall -->
<!-- ************************************* -->
- <defaultServiceCallConfiguration id="default" component="jetty">
+ <defaultServiceCallConfiguration id="default" component="http">
<!-- service discovery -->
<consulServiceDiscovery url="http://{{container:host:consul}}:{{container:port:8500@consul}}"/>
@@ -42,7 +42,7 @@
</blacklistServiceFilter>
</defaultServiceCallConfiguration>
- <serviceCallConfiguration id="service-2" component="jetty">
+ <serviceCallConfiguration id="service-2" component="http">
<!-- service filter -->
<blacklistServiceFilter>
<servers>http-service-2@127.0.0.1:9022</servers>
diff --git a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.xml b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.xml
index e7732b0..67420ba 100644
--- a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.xml
+++ b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.xml
@@ -31,7 +31,7 @@
<!-- ServiceCall -->
<!-- ************************************* -->
- <defaultServiceCallConfiguration id="default" component="jetty">
+ <defaultServiceCallConfiguration id="default" component="http">
<!-- service discovery -->
<consulServiceDiscovery url="http://{{container:host:consul}}:{{container:port:8500@consul}}"/>
@@ -42,13 +42,13 @@
</blacklistServiceFilter>
</defaultServiceCallConfiguration>
- <serviceCallConfiguration id="service-2" component="jetty">
+ <serviceCallConfiguration id="service-2" component="http">
<!-- service filter -->
<blacklistServiceFilter>
<servers>http-service-2@127.0.0.1:9022</servers>
</blacklistServiceFilter>
<expression>
- <simple>jetty:http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/hello</simple>
+ <simple>http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/hello</simple>
</expression>
</serviceCallConfiguration>
diff --git a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.xml b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.xml
index f7c4105..0bdcec2 100644
--- a/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.xml
+++ b/components/camel-consul/src/test/resources/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.xml
@@ -31,7 +31,7 @@
<!-- ServiceCall -->
<!-- ************************************* -->
- <defaultServiceCallConfiguration id="default" component="jetty">
+ <defaultServiceCallConfiguration id="default" component="http">
<!-- service discovery -->
<consulServiceDiscovery url="http://{{container:host:consul}}:{{container:port:8500@consul}}"/>
@@ -42,7 +42,7 @@
</blacklistServiceFilter>
</defaultServiceCallConfiguration>
- <serviceCallConfiguration id="service-2" component="jetty">
+ <serviceCallConfiguration id="service-2" component="http">
<!-- service filter -->
<blacklistServiceFilter>
<servers>http-service-2@127.0.0.1:9022</servers>