You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/15 14:57:36 UTC
svn commit: r784762 - in /camel/trunk/components/camel-restlet: ./
src/test/java/org/apache/camel/component/restlet/
Author: ningjiang
Date: Mon Jun 15 12:57:35 2009
New Revision: 784762
URL: http://svn.apache.org/viewvc?rev=784762&view=rev
Log:
CAMEL-1712 upgrade the camel-restlet JUnit version to 4.6
Modified:
camel/trunk/components/camel-restlet/pom.xml
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/RestletMultiMethodsEndpointTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderAuthTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
Modified: camel/trunk/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Mon Jun 15 12:57:35 2009
@@ -53,8 +53,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
@@ -65,13 +64,6 @@
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
@@ -93,6 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
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=784762&r1=784761&r2=784762&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 Mon Jun 15 12:57:35 2009
@@ -15,20 +15,20 @@
* limitations under the License.
*/
package org.apache.camel.component.restlet;
-
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.junit.Test;
/**
*
* @version $Revision$
*/
-public class RestletFaultTest extends ContextTestSupport {
+public class RestletFaultTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
@@ -48,6 +48,7 @@
};
}
+ @Test
public void testFaultResponse() throws Exception {
HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
try {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java Mon Jun 15 12:57:35 2009
@@ -16,22 +16,24 @@
*/
package org.apache.camel.component.restlet;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.junit.Test;
/**
* This unit test verifies a single route can service multiple methods.
*
* @version $Revision$
*/
-public class RestletMultiMethodsEndpointTest extends ContextTestSupport {
+public class RestletMultiMethodsEndpointTest extends CamelTestSupport {
+ @Test
public void testPostMethod() throws Exception {
HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
try {
@@ -45,6 +47,7 @@
}
+ @Test
public void testGetMethod() throws Exception {
HttpMethod method = new GetMethod("http://localhost:9080/users/homer");
try {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java Mon Jun 15 12:57:35 2009
@@ -19,22 +19,23 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.junit.Test;
/**
* This unit test verifies a single route can service multiple templates.
*
* @version $Revision$
*/
-public class RestletMultiUriTemplatesEndpointTest extends ContextTestSupport {
+public class RestletMultiUriTemplatesEndpointTest extends CamelTestSupport {
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -47,6 +48,7 @@
return jndi;
}
+ @Test
public void testPostUserUriPattern() throws Exception {
HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
try {
@@ -60,6 +62,7 @@
}
+ @Test
public void testGetAtomUriPattern() throws Exception {
HttpMethod method = new GetMethod("http://localhost:9080/atom/collection/foo/component/bar");
try {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java Mon Jun 15 12:57:35 2009
@@ -16,22 +16,23 @@
*/
package org.apache.camel.component.restlet;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.junit.Test;
/**
*
* @version $Revision$
*/
-public class RestletPostContentTest extends ContextTestSupport {
+public class RestletPostContentTest extends CamelTestSupport {
private static final String MSG_BODY = "Hello World!";
@@ -56,6 +57,7 @@
}
+ @Test
public void testPostBody() throws Exception {
HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
try {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java Mon Jun 15 12:57:35 2009
@@ -26,22 +26,25 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Restlet producer concurrent test
*
* @version $Revision$
*/
-public class RestletProducerConcurrentTest extends ContextTestSupport {
+public class RestletProducerConcurrentTest extends CamelTestSupport {
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
@@ -50,7 +53,7 @@
getMockEndpoint("mock:result").expectedMessageCount(files);
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap();
+ Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
for (int i = 0; i < files; i++) {
final int index = i;
Future out = executor.submit(new Callable<Object>() {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java Mon Jun 15 12:57:35 2009
@@ -16,19 +16,20 @@
*/
package org.apache.camel.component.restlet;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.junit.Test;
/**
*
* @version $Revision$
*/
-public class RestletQueryTest extends ContextTestSupport {
+public class RestletQueryTest extends CamelTestSupport {
private static final String QUERY_STRING = "foo=bar&test=123";
@Override
@@ -50,6 +51,7 @@
}
+ @Test
public void testPostBody() throws Exception {
HttpMethod method = new GetMethod("http://localhost:9080/users/homer?" + QUERY_STRING);
try {
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java Mon Jun 15 12:57:35 2009
@@ -19,19 +19,20 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.junit.Test;
/**
*
* @version $Revision$
*/
-public class RestletResponseTest extends ContextTestSupport {
+public class RestletResponseTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
@@ -52,6 +53,7 @@
};
}
+ @Test
public void testCustomResponse() throws Exception {
HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
try {
@@ -64,6 +66,7 @@
}
}
+ @Test
public void testRestletProducer() throws Exception {
Map<String, Object> headers = new HashMap<String, Object>();
headers.put("username", "homer");
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderAuthTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderAuthTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderAuthTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderAuthTest.java Mon Jun 15 12:57:35 2009
@@ -20,11 +20,14 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.spring.SpringTestSupport;
+
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class RestletRouteBuilderAuthTest extends SpringTestSupport {
+public class RestletRouteBuilderAuthTest extends CamelSpringTestSupport {
+ @Test
public void testBasicAuth() throws IOException {
// START SNIPPET: auth_request
@@ -43,6 +46,7 @@
response);
}
+ @Test
public void testhBasicAuthError() throws IOException {
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(RestletConstants.RESTLET_LOGIN, "admin");
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java?rev=784762&r1=784761&r2=784762&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java Mon Jun 15 12:57:35 2009
@@ -18,11 +18,12 @@
import java.io.IOException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.restlet.Client;
import org.restlet.data.Method;
import org.restlet.data.Protocol;
@@ -30,7 +31,7 @@
import org.restlet.data.Response;
import org.restlet.data.Status;
-public class RestletRouteBuilderTest extends ContextTestSupport {
+public class RestletRouteBuilderTest extends CamelTestSupport {
private static final String ID = "89531";
@Override
@@ -67,7 +68,7 @@
};
}
-
+ @Test
public void testProducer() throws IOException {
String response = (String)template.requestBody("direct:start", "<order foo='1'/>");
assertEquals("received [<order foo='1'/>] as an order id = " + ID, response);
@@ -80,6 +81,7 @@
assertEquals("received [<order foo='1'/>] as an order id = " + ID, response);
}
+ @Test
public void testConsumer() throws IOException {
Client client = new Client(Protocol.HTTP);
Response response = client.handle(new Request(Method.GET,
@@ -87,7 +89,8 @@
assertEquals("received GET request with id=99991 and x=6",
response.getEntity().getText());
}
-
+
+ @Test
public void testUnhandledConsumer() throws IOException {
Client client = new Client(Protocol.HTTP);
Response response = client.handle(new Request(Method.POST,