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 13:01:57 UTC
svn commit: r785160 - in /camel/trunk/components/camel-jetty: ./
src/test/java/org/apache/camel/component/jetty/
Author: ningjiang
Date: Tue Jun 16 11:01:55 2009
New Revision: 785160
URL: http://svn.apache.org/viewvc?rev=785160&view=rev
Log:
CAMEL-1712 Upgraded the camel-jetty to JUnit4
Modified:
camel/trunk/components/camel-jetty/pom.xml
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingGetTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
Modified: camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Tue Jun 16 11:01:55 2009
@@ -52,14 +52,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ConvertPayloadToInputStreamTest.java Tue Jun 16 11:01:55 2009
@@ -23,19 +23,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.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;
/**
* @version $Revision$
*/
-public class ConvertPayloadToInputStreamTest extends ContextTestSupport {
+public class ConvertPayloadToInputStreamTest extends CamelTestSupport {
protected String expectedBody = "<hello>world!</hello>";
+ @Test
public void testConvertPayloadToInputStream() throws Exception {
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java Tue Jun 16 11:01:55 2009
@@ -20,20 +20,22 @@
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
-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.junit.Test;
import org.mortbay.jetty.handler.StatisticsHandler;
-public class HandlerTest extends ContextTestSupport {
+public class HandlerTest extends CamelTestSupport {
private StatisticsHandler statisticsHandler1 = new StatisticsHandler();
private StatisticsHandler statisticsHandler2 = new StatisticsHandler();
private StatisticsHandler statisticsHandler3 = new StatisticsHandler();
private String htmlResponse = "<html><body>Book 123 is Camel in Action</body></html>";
+ @Test
public void testHandler() throws Exception {
// First test the situation where one should invoke the handler once
assertEquals(0, statisticsHandler1.getRequests());
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java Tue Jun 16 11:01:55 2009
@@ -22,15 +22,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.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;
-public class HttpClientRouteTest extends ContextTestSupport {
+public class HttpClientRouteTest extends CamelTestSupport {
+ @Test
public void testHttpClient() throws Exception {
System.getProperties().put("HTTPClient.dontChunkRequests", "yes");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGetTest.java Tue Jun 16 11:01:55 2009
@@ -19,18 +19,20 @@
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 = "<html";
+ @Test
public void testHttpGet() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingGetTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingGetTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpPollingGetTest.java Tue Jun 16 11:01:55 2009
@@ -19,20 +19,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;
/**
* @version $Revision$
*/
-public class HttpPollingGetTest extends ContextTestSupport {
+public class HttpPollingGetTest extends CamelTestSupport {
protected String expectedText = "<html";
+ @Test
public void testHttpPollingGet() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", MockEndpoint.class);
mockEndpoint.expectedMinimumMessageCount(1);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java Tue Jun 16 11:01:55 2009
@@ -25,20 +25,23 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* HTTP producer concurrent test.
*
* @version $Revision$
*/
-public class HttpProducerConcurrentTest extends ContextTestSupport {
+public class HttpProducerConcurrentTest extends CamelTestSupport {
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSOTimeoutTest.java Tue Jun 16 11:01:55 2009
@@ -18,18 +18,20 @@
import java.net.SocketTimeoutException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for using http client SO timeout
*
* @version $Revision$
*/
-public class HttpProducerSOTimeoutTest extends ContextTestSupport {
+public class HttpProducerSOTimeoutTest extends CamelTestSupport {
+ @Test
public void testSendWithSOTimeoutNoTimeout() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -39,7 +41,8 @@
assertMockEndpointsSatisfied();
}
-
+
+ @Test
public void testSendWithSOTimeoutTimeout() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java Tue Jun 16 11:01:55 2009
@@ -23,15 +23,16 @@
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.impl.DefaultHeaderFilterStrategy;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
-public class HttpRoundtripHeaderTest extends ContextTestSupport {
+public class HttpRoundtripHeaderTest extends CamelTestSupport {
protected final String uri = "http://localhost:8088/WhichWillGetCloseException";
protected final String jettyUri = "jetty:" + uri;
protected final String outputText = ":output";
@@ -39,6 +40,7 @@
protected String expectedText = inputText + outputText;
// http://issues.apache.org/activemq/browse/CAMEL-324
+ @Test
public void testHttpRoundTripHeaders() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
@@ -54,6 +56,7 @@
assertEquals("response matches: " + expectedText, expectedText, lastLine);
}
+ @Test
public void testHttpRoundTripHeadersWithNoIngoredHeaders() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java Tue Jun 16 11:01:55 2009
@@ -25,20 +25,22 @@
import javax.servlet.http.HttpSession;
-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.http.HttpExchange;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class HttpRouteTest extends ContextTestSupport {
+public class HttpRouteTest extends CamelTestSupport {
protected String expectedBody = "<hello>world!</hello>";
+ @Test
public void testEndpoint() throws Exception {
MockEndpoint mockEndpoint = getMockEndpoint("mock:a");
mockEndpoint.expectedBodiesReceived(expectedBody);
@@ -60,6 +62,7 @@
assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
}
+ @Test
public void testHelloEndpoint() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java Tue Jun 16 11:01:55 2009
@@ -18,17 +18,20 @@
import java.io.File;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
/**
* Unit testing demonstrating how to store incomming requests as files and serving a reponse back.
*/
-public class HttpToFileTest extends ContextTestSupport {
+public class HttpToFileTest extends CamelTestSupport {
+ @Test
public void testToJettyAndSaveToFile() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -52,7 +55,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
deleteDirectory("target/myworld");
super.setUp();
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java Tue Jun 16 11:01:55 2009
@@ -21,11 +21,13 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
public class HttpsRouteSetupWithSystemPropsTest extends HttpsRouteTest {
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
// ensure jsse clients can validate the self signed dummy localhost cert,
// use the server keystore as the trust store for these tests
URL trustStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java Tue Jun 16 11:01:55 2009
@@ -26,23 +26,27 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-public class HttpsRouteTest extends ContextTestSupport {
- private static final String NULL_VALUE_MARKER = ContextTestSupport.class.getCanonicalName();
+public class HttpsRouteTest extends CamelTestSupport {
+ private static final String NULL_VALUE_MARKER = CamelTestSupport.class.getCanonicalName();
protected String expectedBody = "<hello>world!</hello>";
protected String pwd = "changeit";
protected Properties originalValues = new Properties();
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
// ensure jsse clients can validate the self signed dummy localhost cert,
// use the server keystore as the trust store for these tests
@@ -51,7 +55,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
restoreSystemProperties();
super.tearDown();
}
@@ -72,6 +77,7 @@
}
}
+ @Test
public void testEndpoint() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
mockEndpoint.expectedBodiesReceived(expectedBody);
@@ -93,7 +99,7 @@
assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
}
-
+ @Test
public void testEndpointWithoutHttps() {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
try {
@@ -104,6 +110,7 @@
assertTrue("mock endpoint was not called", mockEndpoint.getExchanges().isEmpty());
}
+ @Test
public void testHelloEndpoint() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -117,7 +124,8 @@
assertEquals("<b>Hello World</b>", data);
}
-
+
+ @Test
public void testHelloEndpointWithoutHttps() throws Exception {
try {
new URL("http://localhost:9080/hello").openStream();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java Tue Jun 16 11:01:55 2009
@@ -23,11 +23,12 @@
import java.net.URL;
import java.util.Enumeration;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.io.IOUtils;
+import org.junit.Test;
-public class InterfacesTest extends ContextTestSupport {
+public class InterfacesTest extends CamelTestSupport {
private String remoteInterfaceAddress;
@@ -53,6 +54,7 @@
}
}
+ @Test
public void testLocalInterfaceHandled() throws IOException, InterruptedException {
int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2;
getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
@@ -75,7 +77,7 @@
assertMockEndpointsSatisfied();
}
-
+ @Test
public void testAllInterfaces() throws Exception {
int expectedMessages = (remoteInterfaceAddress != null) ? 2 : 1;
getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java Tue Jun 16 11:01:55 2009
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test with a simple route test.
*/
-public class JettyContentBasedRouteTest extends ContextTestSupport {
+public class JettyContentBasedRouteTest extends CamelTestSupport {
private String serverUri = "http://localhost:9080/myservice";
+ @Test
public void testSendOne() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:one");
@@ -37,6 +39,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testSendOther() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:other");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java Tue Jun 16 11:01:55 2009
@@ -16,19 +16,20 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpConstants;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.MessageHelper;
+import org.junit.Test;
/**
* Unit test for content-type
*/
-public class JettyContentTypeTest extends ContextTestSupport {
+public class JettyContentTypeTest extends CamelTestSupport {
protected void sendMessageWithContentType(boolean usingGZip) {
Endpoint endpoint = context.getEndpoint("http://localhost:9080/myapp/myservice");
@@ -47,14 +48,17 @@
assertEquals("Get a wrong content-type ", MessageHelper.getContentType(exchange.getOut()), "text/xml");
}
+ @Test
public void testSameContentType() throws Exception {
sendMessageWithContentType(false);
}
+ @Test
public void testContentTypeWithGZip() throws Exception {
sendMessageWithContentType(true);
}
+ @Test
public void testMixedContentType() throws Exception {
Endpoint endpoint = context.getEndpoint("http://localhost:9080/myapp/myservice");
Exchange exchange = endpoint.createExchange();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHandle404Test.java Tue Jun 16 11:01:55 2009
@@ -16,21 +16,23 @@
*/
package org.apache.camel.component.jetty;
-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.component.http.HttpOperationFailedException;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Based on end user on forum how to get the 404 error code in his enrich aggregator
*
* @version $Revision$
*/
-public class JettyHandle404Test extends ContextTestSupport {
+public class JettyHandle404Test extends CamelTestSupport {
+ @Test
public void testSimulate404() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Page not found");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java Tue Jun 16 11:01:55 2009
@@ -19,23 +19,26 @@
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-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.component.http.DefaultHttpBinding;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for http binding ref option.
*/
-public class JettyHttpBindingRefTest extends ContextTestSupport {
+public class JettyHttpBindingRefTest extends CamelTestSupport {
+ @Test
public void testDefaultHttpBinding() throws Exception {
Object out = template.requestBody("http://localhost:9080/myapp/myservice", "Hello World");
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out));
}
+ @Test
public void testCustomHttpBinding() throws Exception {
Object out = template.requestBody("http://localhost:9081/myapp/myotherservice", "Hello World");
assertEquals("Something went wrong but we dont care", context.getTypeConverter().convertTo(String.class, out));
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java Tue Jun 16 11:01:55 2009
@@ -16,16 +16,18 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpProducer;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for http client options.
*/
-public class JettyHttpClientOptionsTest extends ContextTestSupport {
+public class JettyHttpClientOptionsTest extends CamelTestSupport {
+ @Test
public void testCustomHttpBinding() throws Exception {
// assert jetty was configured with our timeout
JettyHttpEndpoint jettyEndpoint = (JettyHttpEndpoint) context.getEndpoint("jetty:http://localhost:8080/myapp/myservice?httpClient.soTimeout=5555");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java Tue Jun 16 11:01:55 2009
@@ -16,16 +16,18 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test to verify that the Jetty HTTP connector is correctly disconnected on shutdown
*/
-public class JettyHttpEndpointDisconnectTest extends ContextTestSupport {
+public class JettyHttpEndpointDisconnectTest extends CamelTestSupport {
private String serverUri = "http://localhost:9080/myservice";
+ @Test
public void testContextShutdownRemovesHttpConnector() throws Exception {
context.stop();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java Tue Jun 16 11:01:55 2009
@@ -16,19 +16,21 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test to verify that we can have URI options for external system (endpoint is lenient)
*/
-public class JettyHttpGetWithParamAsExchangeHeaderTest extends ContextTestSupport {
+public class JettyHttpGetWithParamAsExchangeHeaderTest extends CamelTestSupport {
private String serverUri = "http://localhost:9080/myservice";
+ @Test
public void testHttpGetWithParamsViaURI() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedHeaderReceived("one", "einz");
@@ -40,6 +42,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testHttpGetWithParamsViaHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedHeaderReceived("one", "uno");
@@ -51,6 +54,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testHttpPost() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java Tue Jun 16 11:01:55 2009
@@ -17,22 +17,24 @@
package org.apache.camel.component.jetty;
import junit.framework.Assert;
-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.component.http.HttpConstants;
import org.apache.camel.component.http.HttpExchange;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test to verify that we can have URI options for external system (endpoint is lenient)
*/
-public class JettyHttpGetWithParamTest extends ContextTestSupport {
+public class JettyHttpGetWithParamTest extends CamelTestSupport {
private String serverUri = "http://localhost:9080/myservice";
private MyParamsProcessor processor = new MyParamsProcessor();
+ @Test
public void testHttpGetWithParamsViaURI() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
@@ -44,6 +46,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testHttpGetWithParamsViaHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java Tue Jun 16 11:01:55 2009
@@ -18,18 +18,19 @@
import java.io.File;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpConstants;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.MessageHelper;
+import org.junit.Test;
/**
* Unit test for exposing a http server that returns images
*/
-public class JettyImageFileTest extends ContextTestSupport {
+public class JettyImageFileTest extends CamelTestSupport {
private void sendImageContent(boolean usingGZip) throws Exception {
Endpoint endpoint = context.getEndpoint("http://localhost:9080/myapp/myservice");
@@ -43,10 +44,12 @@
assertEquals("Get a wrong content-type ", MessageHelper.getContentType(exchange.getOut()), "image/jpeg");
}
+ @Test
public void testImageContentType() throws Exception {
sendImageContent(false);
}
-
+
+ @Test
public void testImageContentWithGZip() throws Exception {
sendImageContent(true);
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java Tue Jun 16 11:01:55 2009
@@ -16,18 +16,20 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpOperationFailedException;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for HttpOperationFailedException should contain reponse body
*/
-public class JettyResponseBodyWhenErrorTest extends ContextTestSupport {
+public class JettyResponseBodyWhenErrorTest extends CamelTestSupport {
+ @Test
public void testResponseBodyWhenError() throws Exception {
try {
template.requestBody("http://localhost:9080/myapp/myservice", "bookid=123");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java Tue Jun 16 11:01:55 2009
@@ -18,16 +18,18 @@
import javax.servlet.http.HttpServletRequest;
-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;
/**
* Unit test for wiki demonstration.
*/
-public class JettyRouteTest extends ContextTestSupport {
+public class JettyRouteTest extends CamelTestSupport {
+ @Test
public void testSendToJetty() throws Exception {
Object response = template.requestBody("http://localhost:9080/myapp/myservice", "bookid=123");
// convert the response to a String
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java Tue Jun 16 11:01:55 2009
@@ -16,21 +16,23 @@
*/
package org.apache.camel.component.jetty;
-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.component.http.HttpConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Based on end user on forum how to get the 404 error code in his enrich aggregator
*
* @version $Revision$
*/
-public class JettySimplifiedHandle404Test extends ContextTestSupport {
+public class JettySimplifiedHandle404Test extends CamelTestSupport {
+ @Test
public void testSimulate404() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Page not found");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java Tue Jun 16 11:01:55 2009
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test based on Steve request for CAMEL-877.
*/
-public class JettySteveIssueTest extends ContextTestSupport {
+public class JettySteveIssueTest extends CamelTestSupport {
private String serverUri = "http://localhost:9080/myservice";
+ @Test
public void testSendX() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("<html><body>foo</body></html>");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java Tue Jun 16 11:01:55 2009
@@ -16,16 +16,19 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-public class JettyWithXPathChoiceTest extends ContextTestSupport {
+public class JettyWithXPathChoiceTest extends CamelTestSupport {
protected MockEndpoint x;
protected MockEndpoint y;
protected MockEndpoint z;
+ @Test
public void testSendToFirstWhen() throws Exception {
String body = "<one/>";
expectsMessageCount(0, y, z);
@@ -51,7 +54,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
x = getMockEndpoint("mock:x");
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java Tue Jun 16 11:01:55 2009
@@ -19,18 +19,20 @@
import java.io.InputStream;
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.component.http.HttpComponent;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class MultiThreadedHttpGetTest extends ContextTestSupport {
+public class MultiThreadedHttpGetTest extends CamelTestSupport {
+ @Test
public void testHttpGetWithConversion() throws Exception {
// In this scenario response stream is converted to String
@@ -41,6 +43,7 @@
sendMessagesTo(endpointName, 5);
}
+ @Test
public void testHttpGetWithoutConversion() throws Exception {
// This is needed as by default there are 2 parallel
@@ -54,6 +57,7 @@
sendMessagesTo(endpointName, 5);
}
+ @Test
public void testHttpGetWithExplicitStreamClose() throws Exception {
// We close connections explicitely at the very end of the flow
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java?rev=785160&r1=785159&r2=785160&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java Tue Jun 16 11:01:55 2009
@@ -23,22 +23,28 @@
import java.util.Properties;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.Service;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
-public class SpringHttpsRouteTest extends ContextTestSupport {
- private static final String NULL_VALUE_MARKER = ContextTestSupport.class.getCanonicalName();
+public class SpringHttpsRouteTest extends CamelTestSupport {
+ private static final String NULL_VALUE_MARKER = CamelTestSupport.class.getCanonicalName();
protected String expectedBody = "<hello>world!</hello>";
protected String pwd = "changeit";
protected Properties originalValues = new Properties();
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
// ensure jsse clients can validate the self signed dummy localhost cert,
// use the server keystore as the trust store for these tests
@@ -47,7 +53,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
restoreSystemProperties();
super.tearDown();
JettyHttpComponent component = context.getComponent("jetty", JettyHttpComponent.class);
@@ -70,6 +77,7 @@
}
}
+ @Test
public void testEndpoint() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
mockEndpoint.expectedBodiesReceived(expectedBody);
@@ -91,7 +99,7 @@
assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
}
-
+ @Test
public void testEndpointWithoutHttps() {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
try {
@@ -109,7 +117,21 @@
}
protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this, "org/apache/camel/component/jetty/jetty-https.xml");
+ setUseRouteBuilder(false);
+
+ final AbstractXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jetty/jetty-https.xml");
+ setCamelContextService(new Service() {
+ public void start() throws Exception {
+ applicationContext.start();
+
+ }
+
+ public void stop() throws Exception {
+ applicationContext.stop();
+ }
+ });
+
+ return SpringCamelContext.springCamelContext(applicationContext);
}
}