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/24 12:34:21 UTC
svn commit: r787970 - in /camel/trunk/tests/camel-itest: ./
src/test/java/org/apache/camel/itest/async/
src/test/java/org/apache/camel/itest/customerrelations/
src/test/java/org/apache/camel/itest/ftp/
src/test/java/org/apache/camel/itest/greeter/ src/...
Author: ningjiang
Date: Wed Jun 24 10:34:20 2009
New Revision: 787970
URL: http://svn.apache.org/viewvc?rev=787970&view=rev
Log:
CAMEL-1754 Upgrade integration test to JUnit4
Modified:
camel/trunk/tests/camel-itest/pom.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpSyncTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Wed Jun 24 10:34:20 2009
@@ -124,8 +124,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java Wed Jun 24 10:34:20 2009
@@ -19,20 +19,23 @@
import javax.naming.Context;
import org.apache.activemq.camel.component.ActiveMQComponent;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.StringDataFormat;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class HttpAsyncDslTest extends ContextTestSupport {
+public class HttpAsyncDslTest extends CamelTestSupport {
private static String order = "";
+ @Test
public void testRequestOnly() throws Exception {
getMockEndpoint("mock:validate").expectedMessageCount(1);
// even though its request only the message is still continued being processed
@@ -46,6 +49,7 @@
assertEquals("CAB", order);
}
+ @Test
public void testRequestReply() throws Exception {
getMockEndpoint("mock:validate").expectedMessageCount(1);
// even though its request only the message is still continued being processed
@@ -61,7 +65,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
order = "";
super.setUp();
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java Wed Jun 24 10:34:20 2009
@@ -18,15 +18,17 @@
import java.util.concurrent.Future;
-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;
/**
* @version $Revision$
*/
-public class HttpAsyncTest extends ContextTestSupport {
+public class HttpAsyncTest extends CamelTestSupport {
+ @Test
public void testAsyncAndSyncAtSameTimeWithHttp() throws Exception {
// START SNIPPET: e2
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpSyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpSyncTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpSyncTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpSyncTest.java Wed Jun 24 10:34:20 2009
@@ -18,15 +18,17 @@
import java.util.concurrent.Future;
-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;
/**
* @version $Revision$
*/
-public class HttpSyncTest extends ContextTestSupport {
+public class HttpSyncTest extends CamelTestSupport {
+ @Test
public void testSyncAndSyncAtSameTimeWithHttp() throws Exception {
// START SNIPPET: e2
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java Wed Jun 24 10:34:20 2009
@@ -19,17 +19,19 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
+import org.junit.Assert;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class CustomerServicesTest extends TestCase {
+public class CustomerServicesTest extends Assert {
+ @Test
public void testCustomerService() throws Exception {
ClassPathXmlApplicationContext serverContext = null;
ClassPathXmlApplicationContext clientContext = null;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java Wed Jun 24 10:34:20 2009
@@ -17,10 +17,13 @@
package org.apache.camel.itest.customerrelations;
import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class CustomerServicesWsAddressingTest extends TestCase {
+public class CustomerServicesWsAddressingTest extends Assert {
+ @Test
public void testCustomerService() throws Exception {
ClassPathXmlApplicationContext serverContext = null;
ClassPathXmlApplicationContext clientContext = null;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java Wed Jun 24 10:34:20 2009
@@ -30,15 +30,19 @@
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
import org.apache.ftpserver.usermanager.impl.PropertiesUserManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
/**
* Unit testing FTP ant path matcher
*/
@ContextConfiguration
-public class SpringFileAntPathMatcherRemoteFileFilterTest extends AbstractJUnit38SpringContextTests {
+public class SpringFileAntPathMatcherRemoteFileFilterTest extends AbstractJUnit4SpringContextTests {
protected FtpServer ftpServer;
protected String expectedBody = "Godday World";
@@ -49,6 +53,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint result;
+ @Test
public void testAntPatchMatherFilter() throws Exception {
result.expectedBodiesReceived(expectedBody);
@@ -61,14 +66,14 @@
result.assertIsSatisfied();
}
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
initFtpServer();
ftpServer.start();
}
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
ftpServer.stop();
ftpServer = null;
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java Wed Jun 24 10:34:20 2009
@@ -30,15 +30,18 @@
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
import org.apache.ftpserver.usermanager.impl.PropertiesUserManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
* Unit testing FTP configured using spring bean
*/
@ContextConfiguration
-public class SpringFtpEndpointTest extends AbstractJUnit38SpringContextTests {
+public class SpringFtpEndpointTest extends AbstractJUnit4SpringContextTests {
protected FtpServer ftpServer;
@Autowired
@@ -50,6 +53,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint result;
+ @Test
public void testFtpEndpointAsSpringBean() throws Exception {
result.expectedBodiesReceived("Hello World");
@@ -58,14 +62,14 @@
result.assertIsSatisfied();
}
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
initFtpServer();
ftpServer.start();
}
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
ftpServer.stop();
ftpServer = null;
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java Wed Jun 24 10:34:20 2009
@@ -25,17 +25,23 @@
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@ContextConfiguration
-public class CamelGreeterConsumerTest extends AbstractJUnit38SpringContextTests {
+public class CamelGreeterConsumerTest extends AbstractJUnit4SpringContextTests {
private static final transient Log LOG = LogFactory.getLog(CamelGreeterTest.class);
@Autowired
protected CamelContext camelContext;
+ @Test
public void testMocksAreValid() throws Exception {
assertNotNull(camelContext);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java Wed Jun 24 10:34:20 2009
@@ -27,23 +27,30 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@ContextConfiguration
-public class CamelGreeterTest extends AbstractJUnit38SpringContextTests {
+public class CamelGreeterTest extends AbstractJUnit4SpringContextTests {
private static final transient Log LOG = LogFactory.getLog(CamelGreeterTest.class);
-
+
+ private static Endpoint endpoint;
@Autowired
protected CamelContext camelContext;
@EndpointInject(uri = "mock:resultEndpoint")
protected MockEndpoint resultEndpoint;
- private Endpoint endpoint;
-
- protected void setUp() throws Exception {
+ @BeforeClass
+ public static void startServer() throws Exception {
// Start the Greeter Server
Object implementor = new GreeterImpl();
String address = "http://localhost:9000/SoapContext/SoapPort";
@@ -51,13 +58,16 @@
LOG.info("The WS endpoint is published! ");
}
- protected void tearDown() throws Exception {
+ @AfterClass
+ public static void stopServer() throws Exception {
// Shutdown the Greeter Server
if (endpoint != null) {
endpoint.stop();
+ endpoint = null;
}
}
+ @Test
public void testMocksAreValid() throws Exception {
assertNotNull(camelContext);
assertNotNull(resultEndpoint);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java Wed Jun 24 10:34:20 2009
@@ -20,12 +20,14 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
@ContextConfiguration
-public class HttpEndpointTest extends AbstractJUnit38SpringContextTests {
+public class HttpEndpointTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
@@ -36,6 +38,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint mock;
+ @Test
public void testMocksIsValid() throws Exception {
mock.expectedMessageCount(1);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java Wed Jun 24 10:34:20 2009
@@ -20,12 +20,14 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-public class HttpMaxConnectionPerHostTest extends AbstractJUnit38SpringContextTests {
+public class HttpMaxConnectionPerHostTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
@@ -36,6 +38,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint mock;
+ @Test
public void testMocksIsValid() throws Exception {
mock.expectedMessageCount(1);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java Wed Jun 24 10:34:20 2009
@@ -20,12 +20,13 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-public class InterceptEndpointTest extends AbstractJUnit38SpringContextTests {
+public class InterceptEndpointTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
@@ -36,6 +37,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint mock;
+ @Test
public void testMocksIsValid() throws Exception {
mock.expectedBodiesReceived("Simulated response from Google");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java Wed Jun 24 10:34:20 2009
@@ -24,12 +24,16 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.interceptor.Tracer;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@ContextConfiguration
-public class JettyFileMulticastTest extends AbstractJUnit38SpringContextTests {
+public class JettyFileMulticastTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
@@ -40,6 +44,7 @@
@EndpointInject(uri = "mock:fileEndpoint")
protected MockEndpoint fileEndpoint;
+ @Test
public void testMulticastEndpoint() throws Exception {
assertNotNull(resultEndpoint);
assertNotNull(fileEndpoint);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Wed Jun 24 10:34:20 2009
@@ -24,12 +24,17 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.interceptor.Tracer;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@ContextConfiguration
-public class JettyJmsTest extends AbstractJUnit38SpringContextTests {
+public class JettyJmsTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
@@ -37,6 +42,7 @@
@EndpointInject(uri = "mock:resultEndpoint")
protected MockEndpoint resultEndpoint;
+ @Test
public void testMocksAreValidWithTracerEnabled() throws Exception {
assertNotNull(camelContext);
Tracer tracer = Tracer.getTracer(camelContext);
@@ -45,6 +51,7 @@
validMockes();
}
+ @Test
public void testMocksAreValidWithTracerDisabled() throws Exception {
assertNotNull(camelContext);
Tracer tracer = Tracer.getTracer(camelContext);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java Wed Jun 24 10:34:20 2009
@@ -20,16 +20,21 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@ContextConfiguration
-public class JettyJmsTwowayTest extends AbstractJUnit38SpringContextTests {
+public class JettyJmsTwowayTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext camelContext;
+ @Test
public void testSendingRequest() throws Exception {
assertNotNull("the camelContext should not be null", camelContext);
ProducerTemplate template = camelContext.createProducerTemplate();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java Wed Jun 24 10:34:20 2009
@@ -18,14 +18,16 @@
import java.io.InputStream;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class JettyValidatorStreamTest extends ContextTestSupport {
+public class JettyValidatorStreamTest extends CamelTestSupport {
+ @Test
public void testValideRequestAsStream() throws Exception {
InputStream inputStream = HttpClient.class.getResourceAsStream("ValidRequest.xml");
assertNotNull("the inputStream should not be null", inputStream);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java Wed Jun 24 10:34:20 2009
@@ -18,14 +18,16 @@
import java.io.InputStream;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class JettyValidatorStreamWithStreamCachingEnabledTest extends ContextTestSupport {
+public class JettyValidatorStreamWithStreamCachingEnabledTest extends CamelTestSupport {
+ @Test
public void testValideRequestAsStream() throws Exception {
InputStream inputStream = HttpClient.class.getResourceAsStream("ValidRequest.xml");
assertNotNull("the inputStream should not be null", inputStream);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java Wed Jun 24 10:34:20 2009
@@ -18,12 +18,14 @@
import java.io.InputStream;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ValidationException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
-public class JettyValidatorTest extends ContextTestSupport {
+public class JettyValidatorTest extends CamelTestSupport {
+ @Test
public void testValideRequest() throws Exception {
InputStream inputStream = HttpClient.class.getResourceAsStream("ValidRequest.xml");
assertNotNull("the inputStream should not be null", inputStream);
@@ -31,6 +33,7 @@
assertEquals("The response should be ok", response, "<ok/>");
}
+ @Test
public void testInvalideRequest() throws Exception {
InputStream inputStream = HttpClient.class.getResourceAsStream("InvalidRequest.xml");
assertNotNull("the inputStream should not be null", inputStream);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java Wed Jun 24 10:34:20 2009
@@ -20,18 +20,20 @@
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-public class FileToJmsTest extends AbstractJUnit38SpringContextTests {
+public class FileToJmsTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected ProducerTemplate template;
@EndpointInject(uri = "mock:result")
protected MockEndpoint result;
+ @Test
public void testFileToJms() throws Exception {
result.expectedBodiesReceived("Hello World");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java Wed Jun 24 10:34:20 2009
@@ -19,21 +19,23 @@
import javax.naming.Context;
import org.apache.activemq.camel.component.ActiveMQComponent;
-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.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
/**
* Based on user forum.
*
* @version $Revision$
*/
-public class JmsHttpJmsTest extends ContextTestSupport {
+public class JmsHttpJmsTest extends CamelTestSupport {
+ @Test
public void testJmsHttpJms() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java Wed Jun 24 10:34:20 2009
@@ -22,18 +22,20 @@
import javax.naming.Context;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
/**
* @version $Revision:520964 $
*/
-public class JmsIntegrationTest extends ContextTestSupport {
+public class JmsIntegrationTest extends CamelTestSupport {
protected CountDownLatch receivedCountDown = new CountDownLatch(1);
protected MyBean myBean = new MyBean();
+ @Test
public void testOneWayInJmsOutPojo() throws Exception {
// Send a message to the JMS endpoint
template.sendBodyAndHeader("jms:test", "Hello", "cheese", 123);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java Wed Jun 24 10:34:20 2009
@@ -19,18 +19,20 @@
import javax.naming.Context;
import org.apache.activemq.camel.component.ActiveMQComponent;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class JmsJaxbTest extends ContextTestSupport {
+public class JmsJaxbTest extends CamelTestSupport {
+ @Test
public void testOk() throws Exception {
PurchaseOrder order = new PurchaseOrder();
order.setName("Wine");
@@ -45,6 +47,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testUnmarshalError() throws Exception {
MockEndpoint error = getMockEndpoint("mock:error");
error.expectedBodiesReceived("<foo/>");
@@ -56,6 +59,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testNotWine() throws Exception {
PurchaseOrder order = new PurchaseOrder();
order.setName("Beer");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java Wed Jun 24 10:34:20 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.itest.jms;
+import org.junit.Test;
+
/**
* @version $Revision$
*/
@@ -23,6 +25,7 @@
protected int mediumQueueCount = 1000;
@Override
+ @Test
public void testSendingAndReceivingMessages() throws Exception {
int expected = mediumQueueCount + messageCount;
setExpectedMessageCount(expected);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java Wed Jun 24 10:34:20 2009
@@ -20,17 +20,20 @@
import java.util.concurrent.TimeUnit;
import javax.naming.Context;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision:520964 $
*/
-public class JmsPerformanceTest extends ContextTestSupport {
+public class JmsPerformanceTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(JmsPerformanceTest.class);
protected MyBean myBean = new MyBean();
protected int messageCount = 1000;
@@ -41,6 +44,7 @@
protected boolean useLocalBroker = true;
private int consumedMessageCount;
+ @Test
public void testSendingAndReceivingMessages() throws Exception {
setExpectedMessageCount(messageCount);
@@ -70,7 +74,7 @@
}
public String getQueueName() {
- return getName();
+ return "testSendingAndReceivingMessages";
}
protected void assertExpectedMessagesReceived() throws InterruptedException {
@@ -82,7 +86,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
if (useLocalBroker) {
applicationContext = new ClassPathXmlApplicationContext("activemq.xml");
applicationContext.start();
@@ -92,7 +97,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
if (applicationContext != null) {
applicationContext.stop();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java Wed Jun 24 10:34:20 2009
@@ -23,7 +23,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.Body;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -31,11 +30,14 @@
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.config.BatchResequencerConfig;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
-public class JmsResequencerTest extends ContextTestSupport {
+public class JmsResequencerTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(JmsResequencerTest.class);
private ReusableBean b1 = new ReusableBean("myBean1");
@@ -52,16 +54,18 @@
Message in = exchange.getIn();
in.setBody(body);
in.setHeader(headerName, headerValue);
- in.setHeader("testCase", getName());
+ //in.setHeader("testCase", getName());
in.setHeader(Exchange.BEAN_METHOD_NAME, "execute");
}
});
}
+ @Test
public void testSendMessagesInWrongOrderButReceiveThemInCorrectOrder() throws Exception {
sendAndVerifyMessages("activemq:queue:batch");
}
+ @Test
public void testSendMessageToStream() throws Exception {
sendAndVerifyMessages("activemq:queue:stream");
}
@@ -82,7 +86,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
resultEndpoint = getMockEndpoint("mock:result");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java Wed Jun 24 10:34:20 2009
@@ -19,22 +19,25 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
/**
* Unit testing Mail configured using spring bean
*/
@ContextConfiguration
-public class SpringMailEndpointTest extends AbstractJUnit38SpringContextTests {
+public class SpringMailEndpointTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected ProducerTemplate template;
@EndpointInject(uri = "mock:result")
protected MockEndpoint result;
+ @Test
public void testMailEndpointAsSpringBean() throws Exception {
Mailbox.clearAll();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java Wed Jun 24 10:34:20 2009
@@ -19,9 +19,11 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertEquals;
/**
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
@@ -32,7 +34,7 @@
* @version $Revision$
*/
@ContextConfiguration
-public class JmsToHttpTXTest extends AbstractJUnit38SpringContextTests {
+public class JmsToHttpTXTest extends AbstractJUnit4SpringContextTests {
// use uri to refer to our mock
@EndpointInject(uri = "mock:rollback")
@@ -47,6 +49,7 @@
// the ok response to expect
private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
+ @Test
public void testSendToTXJms() throws Exception {
// we assume 2 rollbacks
mock.expectedMessageCount(2);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java Wed Jun 24 10:34:20 2009
@@ -22,10 +22,14 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
@@ -36,7 +40,7 @@
* @version $Revision$
*/
@ContextConfiguration
-public class JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest extends AbstractJUnit38SpringContextTests {
+public class JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest extends AbstractJUnit4SpringContextTests {
@Autowired
private ProducerTemplate template;
@@ -52,6 +56,7 @@
private String nok = "<?xml version=\"1.0\"?><reply><status>nok</status></reply>";
private String noAccess = "<?xml version=\"1.0\"?><reply><status>Access denied</status></reply>";
+ @Test
public void test404() throws Exception {
// use requestBody to force a InOut message exchange pattern ( = request/reply)
// will send and wait for a response
@@ -62,6 +67,7 @@
assertEquals(noAccess, out);
}
+ @Test
public void testRollback() throws Exception {
// will rollback forver so we run 3 times or more
rollback.expectedMinimumMessageCount(3);
@@ -79,6 +85,7 @@
rollback.assertIsSatisfied();
}
+ @Test
public void testOK() throws Exception {
// use requestBody to force a InOut message exchange pattern ( = request/reply)
// will send and wait for a response
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java Wed Jun 24 10:34:20 2009
@@ -22,9 +22,14 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Unit test will look for the spring .xml file with the same class name
@@ -36,7 +41,7 @@
* @version $Revision$
*/
@ContextConfiguration
-public class JmsToHttpTXWithOnExceptionTest extends AbstractJUnit38SpringContextTests {
+public class JmsToHttpTXWithOnExceptionTest extends AbstractJUnit4SpringContextTests {
@Autowired
private ProducerTemplate template;
@@ -52,6 +57,7 @@
private String nok = "<?xml version=\"1.0\"?><reply><status>nok</status></reply>";
private String noAccess = "<?xml version=\"1.0\"?><reply><status>Access denied</status></reply>";
+ @Test
public void test404() throws Exception {
// use requestBody to force a InOut message exchange pattern ( = request/reply)
// will send and wait for a response
@@ -62,6 +68,7 @@
assertEquals(noAccess, out);
}
+ @Test
public void testRollback() throws Exception {
// will rollback forver so we run 3 times or more
rollback.expectedMinimumMessageCount(3);
@@ -79,6 +86,7 @@
rollback.assertIsSatisfied();
}
+ @Test
public void testOK() throws Exception {
// use requestBody to force a InOut message exchange pattern ( = request/reply)
// will send and wait for a response
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java?rev=787970&r1=787969&r2=787970&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java Wed Jun 24 10:34:20 2009
@@ -19,8 +19,11 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
/**
* Unit test will look for the spring .xml file with the same class name
@@ -32,7 +35,7 @@
* @version $Revision$
*/
@ContextConfiguration
-public class JmsToHttpTXWithRollbackTest extends AbstractJUnit38SpringContextTests {
+public class JmsToHttpTXWithRollbackTest extends AbstractJUnit4SpringContextTests {
// use uri to refer to our mock
@EndpointInject(uri = "mock:rollback")
@@ -47,6 +50,7 @@
// the ok response to expect
private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
+ @Test
public void testSendToTXJmsWithRollback() throws Exception {
// we assume 2 rollbacks
mock.expectedMessageCount(2);