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/16 11:02:29 UTC
svn commit: r785117 - in /camel/trunk/components/camel-http: ./
src/test/java/org/apache/camel/component/http/
Author: ningjiang
Date: Tue Jun 16 09:02:29 2009
New Revision: 785117
URL: http://svn.apache.org/viewvc?rev=785117&view=rev
Log:
CAMEL-1712 Upgraded the camel-http to JUnit4
Modified:
camel/trunk/components/camel-http/pom.xml
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithQueryParamsTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPostWithBodyTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryGoogleTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
Modified: camel/trunk/components/camel-http/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/pom.xml?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/pom.xml (original)
+++ camel/trunk/components/camel-http/pom.xml Tue Jun 16 09:02:29 2009
@@ -62,8 +62,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<!-- to allow Spring annotations (jmx) to be tested -->
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java Tue Jun 16 09:02:29 2009
@@ -19,18 +19,21 @@
import java.util.List;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class HttpGetTest extends ContextTestSupport {
+public class HttpGetTest extends CamelTestSupport {
protected String expectedText = "activemq";
+ @Test
public void testHttpGet() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java Tue Jun 16 09:02:29 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.http;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
public class HttpGetWithHeadersTest extends HttpGetTest {
@@ -34,7 +35,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
// "Szukaj" is "Search" in polish language
expectedText = "Szukaj";
super.setUp();
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithQueryParamsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithQueryParamsTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithQueryParamsTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithQueryParamsTest.java Tue Jun 16 09:02:29 2009
@@ -16,11 +16,15 @@
*/
package org.apache.camel.component.http;
+import org.junit.Before;
+
/**
* @version $Revision$
*/
public class HttpGetWithQueryParamsTest extends HttpGetTest {
- protected void setUp() throws Exception {
+
+ @Before
+ public void setUp() throws Exception {
super.setUp();
expectedText = "activemq.apache.org";
}
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java Tue Jun 16 09:02:29 2009
@@ -16,19 +16,22 @@
*/
package org.apache.camel.component.http;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test of invalid configuraiton
*/
-public class HttpInvalidConfigurationTest extends ContextTestSupport {
+public class HttpInvalidConfigurationTest extends CamelTestSupport {
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
try {
super.setUp();
fail("Should have thrown ResolveEndpointFailedException");
@@ -37,6 +40,7 @@
}
}
+ @Test
public void testInvalidHostConfiguration() {
// dummy
}
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java Tue Jun 16 09:02:29 2009
@@ -16,19 +16,22 @@
*/
package org.apache.camel.component.http;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test of invalid configuraiton
*/
-public class HttpInvalidHttpClientConfigurationTest extends ContextTestSupport {
+public class HttpInvalidHttpClientConfigurationTest extends CamelTestSupport {
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
try {
super.setUp();
fail("Should have thrown ResolveEndpointFailedException");
@@ -37,6 +40,7 @@
}
}
+ @Test
public void testInvalidHostConfiguration() {
// dummy
}
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPostWithBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPostWithBodyTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPostWithBodyTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPostWithBodyTest.java Tue Jun 16 09:02:29 2009
@@ -20,20 +20,22 @@
import java.util.List;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
import static org.apache.camel.component.http.HttpMethods.POST;
-public class HttpPostWithBodyTest extends ContextTestSupport {
+public class HttpPostWithBodyTest extends CamelTestSupport {
protected String expectedText = "Method Not Allowed";
+ @Test
public void testHttpPostWithError() throws Exception {
Exchange exchange = template.send("direct:start", new Processor() {
@@ -62,6 +64,7 @@
}
+ @Test
public void testHttpPostRecovery() throws Exception {
MockEndpoint mockResult = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java Tue Jun 16 09:02:29 2009
@@ -18,9 +18,10 @@
import java.io.IOException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpMethod;
+import org.junit.Test;
import static org.apache.camel.component.http.HttpMethods.GET;
import static org.apache.camel.component.http.HttpMethods.POST;
@@ -28,8 +29,9 @@
/**
* Unit test to verify the algorithm for selecting either GET or POST.
*/
-public class HttpProducerSelectMethodTest extends ContextTestSupport {
+public class HttpProducerSelectMethodTest extends CamelTestSupport {
+ @Test
public void testNoDataDefaultIsGet() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -47,6 +49,7 @@
producer.stop();
}
+ @Test
public void testDataDefaultIsPost() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -64,6 +67,7 @@
producer.stop();
}
+ @Test
public void testWithMethodPostInHeader() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -82,6 +86,7 @@
producer.stop();
}
+ @Test
public void testWithMethodGetInHeader() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -100,6 +105,7 @@
producer.stop();
}
+ @Test
public void testWithEndpointQuery() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -117,6 +123,7 @@
producer.stop();
}
+ @Test
public void testWithQueryInHeader() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
@@ -135,6 +142,7 @@
producer.stop();
}
+ @Test
public void testWithQueryInHeaderOverrideEndpoint() throws Exception {
HttpComponent component = new HttpComponent();
component.setCamelContext(context);
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyTest.java Tue Jun 16 09:02:29 2009
@@ -16,14 +16,16 @@
*/
package org.apache.camel.component.http;
-import org.apache.camel.ContextTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.httpclient.HttpClient;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class HttpProxyTest extends ContextTestSupport {
+public class HttpProxyTest extends CamelTestSupport {
+ @Test
public void testNoHttpProxyConfigured() throws Exception {
HttpEndpoint http = context.getEndpoint("http://www.google.com", HttpEndpoint.class);
@@ -32,6 +34,7 @@
assertEquals("No proxy configured yet", -1, client.getHostConfiguration().getProxyPort());
}
+ @Test
public void testHttpProxyConfigured() throws Exception {
HttpEndpoint http = context.getEndpoint("http://www.google.com", HttpEndpoint.class);
@@ -48,6 +51,7 @@
}
}
+ @Test
public void testHttpProxyEndpointConfigured() throws Exception {
HttpEndpoint http = context.getEndpoint("http://www.google.com?proxyHost=myotherproxy&proxyPort=2345", HttpEndpoint.class);
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryGoogleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryGoogleTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryGoogleTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryGoogleTest.java Tue Jun 16 09:02:29 2009
@@ -16,17 +16,20 @@
*/
package org.apache.camel.component.http;
-import org.apache.camel.ContextTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
/**
* Unit test to query Google using GET with endpoint having the query parameters.
*/
-public class HttpQueryGoogleTest extends ContextTestSupport {
+public class HttpQueryGoogleTest extends CamelTestSupport {
public boolean isUseRouteBuilder() {
return false;
}
+ @Test
public void testQueryGoogle() throws Exception {
Object out = template.requestBody("http://www.google.com/search?q=Camel", "");
assertNotNull(out);
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java?rev=785117&r1=785116&r2=785117&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java Tue Jun 16 09:02:29 2009
@@ -19,16 +19,17 @@
import java.util.List;
import java.util.Map;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
public class HttpsGetTest extends HttpGetTest {
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
expectedText = "https://mail.google.com/mail/";
super.setUp();
}