Author: davsclaus
Date: Thu Jun 23 14:24:45 2011
New Revision: 1138894
URL: http://svn.apache.org/viewvc?rev=1138894&view=rev
Log:
CAMEL-4104: Using dynmaic port numbers for test. Thanks to Jean for patch.
Fixed CS.
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java?rev=1138894&r1=1138893&r2=1138894&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
Thu Jun 23 14:24:45 2011
@@ -35,7 +35,7 @@ public class RestletFaultTest extends Re
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("restlet:http://localhost:9080/users/{username}?restletMethod=POST";).process(new
Processor() {
+ from("restlet:http://localhost:"; + portNum +
"/users/{username}?restletMethod=POST").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setFault(true);
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "404");
@@ -49,7 +49,7 @@ public class RestletFaultTest extends Re
@Test
public void testFaultResponse() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+ HttpResponse response = doExecute(new HttpPost("http://localhost:"; +
portNum + "/users/homer"));
assertHttpResponse(response, 404, "text/plain", "Application fault");
}
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java?rev=1138894&r1=1138893&r2=1138894&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java
Thu Jun 23 14:24:45 2011
@@ -31,7 +31,7 @@ public class RestletPostXmlRouteAndJSONA
private static final String REQUEST_MESSAGE_WITH_XML_TAG =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
REQUEST_MESSAGE;
- private String url =
"restlet:http://localhost:9087/users?restletMethod=POST";;
+ private String url = "restlet:http://localhost:"; + portNum +
"/users?restletMethod=POST";
@Override
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteTest.java?rev=1138894&r1=1138893&r2=1138894&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlRouteTest.java
Thu Jun 23 14:24:45 2011
@@ -31,7 +31,7 @@ public class RestletPostXmlRouteTest ext
private static final String REQUEST_MESSAGE_WITH_XML_TAG =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
REQUEST_MESSAGE;
- private String url =
"restlet:http://localhost:9087/users?restletMethod=POST";;
+ private String url = "restlet:http://localhost:"; + portNum +
"/users?restletMethod=POST";
@Override
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlTest.java?rev=1138894&r1=1138893&r2=1138894&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostXmlTest.java
Thu Jun 23 14:24:45 2011
@@ -41,7 +41,7 @@ public class RestletPostXmlTest extends
@Override
public void configure() throws Exception {
// enable POST support
-
from("restlet:http://localhost:9087/users/?restletMethods=post";)
+ from("restlet:http://localhost:"; + portNum +
"/users/?restletMethods=post")
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
String body =
exchange.getIn().getBody(String.class);
@@ -66,7 +66,7 @@ public class RestletPostXmlTest extends
}
private void postRequestMessage(String message) throws Exception {
- HttpPost post = new HttpPost("http://localhost:9087/users/";);
+ HttpPost post = new HttpPost("http://localhost:"; + portNum +
"/users/");
post.addHeader(Exchange.CONTENT_TYPE, "application/xml");
post.setEntity(new StringEntity(message));
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java?rev=1138894&r1=1138893&r2=1138894&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
Thu Jun 23 14:24:45 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.restl
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
/**
* Route builder for RestletRouteBuilderAuthTest
@@ -30,8 +31,11 @@ public class TestRouteBuilder extends Ro
@Override
public void configure() throws Exception {
+ // get port number dynamically
+ int port = AvailablePortFinder.getNextAvailable();
+
// START SNIPPET: consumer_route
-
from("restlet:http://localhost:9080/securedOrders?restletMethod=post&restletRealm=#realm";).process(new
Processor() {
+ from("restlet:http://localhost:"; + port +
"/securedOrders?restletMethod=post&restletRealm=#realm").process(new
Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(
"received [" + exchange.getIn().getBody()
@@ -45,7 +49,7 @@ public class TestRouteBuilder extends Ro
// Note: restletMethod and restletRealmRef are stripped
// from the query before a request is sent as they are
// only processed by Camel.
-
from("direct:start-auth").to("restlet:http://localhost:9080/securedOrders?restletMethod=post";);
+ from("direct:start-auth").to("restlet:http://localhost:"; + port +
"/securedOrders?restletMethod=post");
// END SNIPPET: producer_route
}
