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 16:29:50 UTC
svn commit: r785230 - in /camel/trunk/components/camel-jdbc: ./
src/test/java/org/apache/camel/component/jdbc/
Author: ningjiang
Date: Tue Jun 16 14:29:49 2009
New Revision: 785230
URL: http://svn.apache.org/viewvc?rev=785230&view=rev
Log:
CAMEL-1712 Upgraded the camel-jdbc to JUnit4
Modified:
camel/trunk/components/camel-jdbc/pom.xml
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
Modified: camel/trunk/components/camel-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/pom.xml (original)
+++ camel/trunk/components/camel-jdbc/pom.xml Tue Jun 16 14:29:49 2009
@@ -43,8 +43,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,8 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java Tue Jun 16 14:29:49 2009
@@ -18,23 +18,27 @@
import javax.sql.DataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
/**
* Unit test based on user forum request about this component
*/
-public class JdbcAnotherRouteTest extends ContextTestSupport {
+public class JdbcAnotherRouteTest extends CamelTestSupport {
private String driverClass = "org.hsqldb.jdbcDriver";
private String url = "jdbc:hsqldb:mem:camel_jdbc";
private String user = "sa";
private String password = "";
private DataSource ds;
+ @Test
public void testTimerInvoked() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -59,7 +63,8 @@
};
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
DriverManagerDataSource dataSource = new DriverManagerDataSource(url, user, password);
dataSource.setDriverClassName(driverClass);
ds = dataSource;
@@ -71,7 +76,8 @@
super.setUp();
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbc = new JdbcTemplate(ds);
jdbc.execute("drop table customer");
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java Tue Jun 16 14:29:49 2009
@@ -21,21 +21,25 @@
import javax.sql.DataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
-public class JdbcOptionsTest extends ContextTestSupport {
+public class JdbcOptionsTest extends CamelTestSupport {
private String driverClass = "org.hsqldb.jdbcDriver";
private String url = "jdbc:hsqldb:mem:camel_jdbc";
private String user = "sa";
private String password = "";
private DataSource ds;
+ @Test
public void testReadSize() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -48,6 +52,7 @@
assertEquals(1, list.size());
}
+ @Test
public void testNoDataSourceInRegistry() throws Exception {
try {
template.sendBody("jdbc:xxx", "Hello World");
@@ -72,7 +77,8 @@
};
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
DriverManagerDataSource dataSource = new DriverManagerDataSource(url, user, password);
dataSource.setDriverClassName(driverClass);
ds = dataSource;
@@ -84,7 +90,8 @@
super.setUp();
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbc = new JdbcTemplate(ds);
jdbc.execute("drop table customer");
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java Tue Jun 16 14:29:49 2009
@@ -25,16 +25,19 @@
import java.util.concurrent.Future;
import javax.sql.DataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
/**
* @version $Revision$
*/
-public class JdbcProducerConcurrenctTest extends ContextTestSupport {
+public class JdbcProducerConcurrenctTest extends CamelTestSupport {
protected DataSource ds;
private String driverClass = "org.hsqldb.jdbcDriver";
@@ -42,10 +45,12 @@
private String user = "sa";
private String password = "";
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
@@ -95,7 +100,8 @@
};
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
DriverManagerDataSource dataSource = new DriverManagerDataSource(url, user, password);
dataSource.setDriverClassName(driverClass);
ds = dataSource;
@@ -107,7 +113,8 @@
super.setUp();
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbc = new JdbcTemplate(ds);
jdbc.execute("drop table customer");
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java Tue Jun 16 14:29:49 2009
@@ -20,24 +20,28 @@
import java.util.HashMap;
import javax.sql.DataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
/**
* @version $Revision$
*/
-public class JdbcRouteTest extends ContextTestSupport {
+public class JdbcRouteTest extends CamelTestSupport {
protected DataSource ds;
private String driverClass = "org.hsqldb.jdbcDriver";
private String url = "jdbc:hsqldb:mem:camel_jdbc";
private String user = "sa";
private String password = "";
+ @Test
public void testJdbcRoutes() throws Exception {
// START SNIPPET: invoke
// first we create our exchange using the endpoint
@@ -85,7 +89,8 @@
};
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
DriverManagerDataSource dataSource = new DriverManagerDataSource(url, user, password);
dataSource.setDriverClassName(driverClass);
ds = dataSource;
@@ -99,7 +104,8 @@
super.setUp();
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbc = new JdbcTemplate(ds);
jdbc.execute("drop table customer");
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java?rev=785230&r1=785229&r2=785230&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java Tue Jun 16 14:29:49 2009
@@ -18,13 +18,16 @@
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.junit.After;
+import org.junit.Before;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JdbcSpringAnotherRouteTest extends JdbcAnotherRouteTest {
private ClassPathXmlApplicationContext applicationContext;
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
setUseRouteBuilder(false);
applicationContext = createApplicationContext();
super.setUp();
@@ -34,7 +37,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
if (applicationContext != null) {
applicationContext.destroy();
}