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/18 06:43:24 UTC
svn commit: r785898 - in /camel/trunk/components/camel-sql: ./
src/test/java/org/apache/camel/component/sql/
Author: ningjiang
Date: Thu Jun 18 04:43:23 2009
New Revision: 785898
URL: http://svn.apache.org/viewvc?rev=785898&view=rev
Log:
CAMEL-1712 Upgraded the camel-sql to JUnit4
Modified:
camel/trunk/components/camel-sql/pom.xml
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
Modified: camel/trunk/components/camel-sql/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/pom.xml (original)
+++ camel/trunk/components/camel-sql/pom.xml Thu Jun 18 04:43:23 2009
@@ -44,8 +44,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>
<!-- to allow Spring annotations (jmx) to be tested -->
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java Thu Jun 18 04:43:23 2009
@@ -21,17 +21,20 @@
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.SingleConnectionDataSource;
/**
* @version $Revision$
*/
-public class SqlDataSourceRefTest extends ContextTestSupport {
+public class SqlDataSourceRefTest extends CamelTestSupport {
protected String driverClass = "org.hsqldb.jdbcDriver";
protected String url = "jdbc:hsqldb:mem:camel_jdbc";
protected String user = "sa";
@@ -45,6 +48,7 @@
return jndi;
}
+ @Test
public void testSimpleBody() throws Exception {
// START SNIPPET: e3
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -69,7 +73,8 @@
// END SNIPPET: e3
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -84,7 +89,8 @@
// END SNIPPET: e2
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbcTemplate = new JdbcTemplate(createDataSource());
jdbcTemplate.execute("drop table projects");
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java Thu Jun 18 04:43:23 2009
@@ -18,16 +18,19 @@
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.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.SingleConnectionDataSource;
/**
* @version $Revision$
*/
-public class SqlEndpointTest extends ContextTestSupport {
+public class SqlEndpointTest extends CamelTestSupport {
protected String driverClass = "org.hsqldb.jdbcDriver";
protected String url = "jdbc:hsqldb:mem:camel_jdbc";
protected String user = "sa";
@@ -35,6 +38,7 @@
private DataSource ds;
private JdbcTemplate jdbcTemplate;
+ @Test
public void testSQLEndpoint() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -44,7 +48,8 @@
assertMockEndpointsSatisfied();
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -56,7 +61,8 @@
jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')");
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
jdbcTemplate.execute("drop table projects");
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java Thu Jun 18 04:43:23 2009
@@ -18,16 +18,19 @@
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.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.SingleConnectionDataSource;
/**
* @version $Revision$
*/
-public class SqlPreserveHeaderTest extends ContextTestSupport {
+public class SqlPreserveHeaderTest extends CamelTestSupport {
protected String driverClass = "org.hsqldb.jdbcDriver";
protected String url = "jdbc:hsqldb:mem:camel_jdbc";
protected String user = "sa";
@@ -35,6 +38,7 @@
private DataSource ds;
private JdbcTemplate jdbcTemplate;
+ @Test
public void testPreserveHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -45,7 +49,8 @@
assertMockEndpointsSatisfied();
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -57,7 +62,8 @@
jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')");
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
jdbcTemplate.execute("drop table projects");
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java Thu Jun 18 04:43:23 2009
@@ -25,15 +25,18 @@
import java.util.concurrent.Future;
import javax.sql.DataSource;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+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.SingleConnectionDataSource;
/**
* @version $Revision$
*/
-public class SqlProducerConcurrentTest extends ContextTestSupport {
+public class SqlProducerConcurrentTest extends CamelTestSupport {
protected String driverClass = "org.hsqldb.jdbcDriver";
protected String url = "jdbc:hsqldb:mem:camel_jdbc";
protected String user = "sa";
@@ -41,10 +44,12 @@
private DataSource ds;
private JdbcTemplate jdbcTemplate;
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
@@ -82,7 +87,8 @@
}
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -94,7 +100,8 @@
jdbcTemplate.execute("insert into projects values (2, 'Linux', 'GPL')");
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
jdbcTemplate.execute("drop table projects");
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java?rev=785898&r1=785897&r2=785898&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java Thu Jun 18 04:43:23 2009
@@ -22,10 +22,13 @@
import javax.sql.DataSource;
-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.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -34,7 +37,7 @@
/**
* @version $Revision$
*/
-public class SqlRouteTest extends ContextTestSupport {
+public class SqlRouteTest extends CamelTestSupport {
protected String driverClass = "org.hsqldb.jdbcDriver";
protected String url = "jdbc:hsqldb:mem:camel_jdbc";
protected String user = "sa";
@@ -42,6 +45,7 @@
private DataSource ds;
private JdbcTemplate jdbcTemplate;
+ @Test
public void testSimpleBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -52,6 +56,7 @@
assertEquals("Linux", row.get("PROJECT"));
}
+ @Test
public void testListBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -65,6 +70,7 @@
assertEquals(1, row.get("ID"));
}
+ @Test
public void testLowNumberOfParameter() throws Exception {
try {
template.sendBody("direct:list", "ASF");
@@ -75,6 +81,7 @@
}
}
+ @Test
public void testHighNumberOfParameter() throws Exception {
try {
template.sendBody("direct:simple", new Object[] {"ASF", "Foo"});
@@ -84,7 +91,8 @@
assertTrue("Exception thrown is wrong", e.getCause() instanceof DataAccessException);
}
}
-
+
+ @Test
public void testListResult() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedHeaderReceived(SqlConstants.SQL_ROW_COUNT, "2");
@@ -101,6 +109,7 @@
assertEquals("AMQ", row2.get("PROJECT"));
}
+ @Test
public void testListLimitedResult() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -114,6 +123,7 @@
assertEquals("Camel", row1.get("PROJECT"));
}
+ @Test
public void testInsert() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -131,6 +141,7 @@
assertEquals((Integer) 1, actualUpdateCount);
}
+ @Test
public void testNoBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -141,7 +152,8 @@
assertEquals("Camel", row.get("PROJECT"));
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -153,7 +165,8 @@
jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')");
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
jdbcTemplate.execute("drop table projects");