This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8c7d405911ee23c7ee63a2a44bd857b5e5c0e928
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Wed Oct 3 14:00:30 2018 +0200
Avoid potentially conflicting jetty port during test execution
in case tests are not cleaning correctly the Jetty server or are
launched in parallel, having different ports will avoid to have port
still occupied for other tests
Signed-off-by: Aurélien Pupier <apup...@redhat.com>
---
.../ribbon/cloud/SpringBeanServiceCallRouteTest.java | 8 ++++++++
.../SpringDslRibbonPropertiesServiceCallRouteTest.java | 9 +++++++++
.../ribbon/cloud/SpringDslRibbonServiceCallRouteTest.java | 8 ++++++++
.../ribbon/cloud/SpringRibbonServiceCallRouteTest.java | 12 ++++++++----
.../ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml | 14 +++++++-------
.../SpringDslRibbonPropertiesServiceCallRouteTest.xml | 14 +++++++-------
.../ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml | 14 +++++++-------
7 files changed, 54 insertions(+), 25 deletions(-)
diff --git
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringBeanServiceCallRouteTest.java
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringBeanServiceCallRouteTest.java
index 5cbf8c4..fc264ff 100644
---
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringBeanServiceCallRouteTest.java
+++
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringBeanServiceCallRouteTest.java
@@ -42,5 +42,13 @@ public class SpringBeanServiceCallRouteTest extends
SpringRibbonServiceCallRoute
RibbonServiceLoadBalancer loadBalancer =
(RibbonServiceLoadBalancer)processor.getLoadBalancer();
Assert.assertTrue(loadBalancer.getServiceDiscovery() instanceof
StaticServiceDiscovery);
}
+
+ protected String getFirstPort() {
+ return "9092";
+ }
+
+ protected String getSecondPort() {
+ return "9093";
+ }
}
diff --git
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.java
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.java
index 56d734f..736bed4 100644
---
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.java
+++
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.java
@@ -41,5 +41,14 @@ public class SpringDslRibbonPropertiesServiceCallRouteTest
extends SpringRibbonS
RibbonServiceLoadBalancer loadBalancer =
(RibbonServiceLoadBalancer)processor.getLoadBalancer();
Assert.assertNull(loadBalancer.getServiceDiscovery());
}
+
+ protected String getFirstPort() {
+ return "9094";
+ }
+
+ protected String getSecondPort() {
+ return "9095";
+ }
+
}
diff --git
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.java
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.java
index bb5304e..271d723 100644
---
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.java
+++
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.java
@@ -42,5 +42,13 @@ public class SpringDslRibbonServiceCallRouteTest extends
SpringRibbonServiceCall
RibbonServiceLoadBalancer loadBalancer =
(RibbonServiceLoadBalancer)processor.getLoadBalancer();
Assert.assertTrue(loadBalancer.getServiceDiscovery() instanceof
StaticServiceDiscovery);
}
+
+ protected String getFirstPort() {
+ return "9096";
+ }
+
+ protected String getSecondPort() {
+ return "9097";
+ }
}
diff --git
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringRibbonServiceCallRouteTest.java
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringRibbonServiceCallRouteTest.java
index 0ca03f8..43376d7 100644
---
a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringRibbonServiceCallRouteTest.java
+++
b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/cloud/SpringRibbonServiceCallRouteTest.java
@@ -32,18 +32,22 @@ import org.springframework.test.annotation.DirtiesContext;
public abstract class SpringRibbonServiceCallRouteTest extends
CamelSpringTestSupport {
@Test
public void testServiceCall() throws Exception {
- getMockEndpoint("mock:9090").expectedMessageCount(1);
- getMockEndpoint("mock:9091").expectedMessageCount(1);
+ getMockEndpoint("mock:"+getFirstPort()).expectedMessageCount(1);
+ getMockEndpoint("mock:"+getSecondPort()).expectedMessageCount(1);
getMockEndpoint("mock:result").expectedMessageCount(2);
String out = template.requestBody("direct:start", null, String.class);
String out2 = template.requestBody("direct:start", null, String.class);
- assertEquals("9091", out);
- assertEquals("9090", out2);
+ assertEquals(getSecondPort(), out);
+ assertEquals(getFirstPort(), out2);
assertMockEndpointsSatisfied();
}
+ protected abstract String getSecondPort();
+
+ protected abstract String getFirstPort();
+
// ************************************
// Helpers
// ************************************
diff --git
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
index 55654bf..e69d9a8 100644
---
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
+++
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringBeanRibbonServiceCallRouteTest.xml
@@ -27,7 +27,7 @@
<!-- setup a static ribbon server list with these 2 servers to start with -->
<bean id="discovery"
class="org.apache.camel.impl.cloud.StaticServiceDiscovery">
- <property name="servers" value="localhost:9090,localhost:9091"/>
+ <property name="servers" value="localhost:9092,localhost:9093"/>
</bean>
<bean id="balancer"
class="org.apache.camel.component.ribbon.cloud.RibbonServiceLoadBalancer">
@@ -48,18 +48,18 @@
</route>
<route>
- <from uri="jetty:http://localhost:9090"/>
- <to uri="mock:9090"/>
+ <from uri="jetty:http://localhost:9092"/>
+ <to uri="mock:9092"/>
<transform>
- <constant>9090</constant>
+ <constant>9092</constant>
</transform>
</route>
<route>
- <from uri="jetty:http://localhost:9091"/>
- <to uri="mock:9091"/>
+ <from uri="jetty:http://localhost:9093"/>
+ <to uri="mock:9093"/>
<transform>
- <constant>9091</constant>
+ <constant>9093</constant>
</transform>
</route>
</camelContext>
diff --git
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
index 6fb2da3..0c6aa06 100644
---
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
+++
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonPropertiesServiceCallRouteTest.xml
@@ -31,25 +31,25 @@
<serviceCall name="myService" component="jetty">
<!-- enable ribbon load balancer -->
<ribbonLoadBalancer clientName="myClient">
- <properties key="listOfServers"
value="localhost:9090,localhost:9091"/>
+ <properties key="listOfServers"
value="localhost:9094,localhost:9095"/>
</ribbonLoadBalancer>
</serviceCall>
<to uri="mock:result"/>
</route>
<route>
- <from uri="jetty:http://localhost:9090"/>
- <to uri="mock:9090"/>
+ <from uri="jetty:http://localhost:9094"/>
+ <to uri="mock:9094"/>
<transform>
- <constant>9090</constant>
+ <constant>9094</constant>
</transform>
</route>
<route>
- <from uri="jetty:http://localhost:9091"/>
- <to uri="mock:9091"/>
+ <from uri="jetty:http://localhost:9095"/>
+ <to uri="mock:9095"/>
<transform>
- <constant>9091</constant>
+ <constant>9095</constant>
</transform>
</route>
</camelContext>
diff --git
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
index 60560ea..433aec3 100644
---
a/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
+++
b/components/camel-ribbon/src/test/resources/org/apache/camel/component/ribbon/cloud/SpringDslRibbonServiceCallRouteTest.xml
@@ -31,7 +31,7 @@
<serviceCall name="myService" component="jetty">
<!-- static list of servers -->
<staticServiceDiscovery>
- <servers>localhost:9090,localhost:9091</servers>
+ <servers>localhost:9096,localhost:9097</servers>
</staticServiceDiscovery>
<!-- enable ribbon load balancer -->
@@ -41,18 +41,18 @@
</route>
<route>
- <from uri="jetty:http://localhost:9090"/>
- <to uri="mock:9090"/>
+ <from uri="jetty:http://localhost:9096"/>
+ <to uri="mock:9096"/>
<transform>
- <constant>9090</constant>
+ <constant>9096</constant>
</transform>
</route>
<route>
- <from uri="jetty:http://localhost:9091"/>
- <to uri="mock:9091"/>
+ <from uri="jetty:http://localhost:9097"/>
+ <to uri="mock:9097"/>
<transform>
- <constant>9091</constant>
+ <constant>9097</constant>
</transform>
</route>
</camelContext>
