You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/08/30 21:03:52 UTC
svn commit: r690554 [2/2] - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-core/src/main/java/org/apache/ibatis/adhoc/
ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/
ibatis-3-core/src/main/java/org/a...
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/AdHocExecutorTest.java Sat Aug 30 12:03:51 2008
@@ -1,7 +1,8 @@
package org.apache.ibatis.adhoc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.SimpleDataSource;
+import org.apache.ibatis.migration.*;
+import org.apache.ibatis.jdbc.PooledDataSource;
import org.junit.*;
import java.sql.Connection;
@@ -11,12 +12,12 @@
@Test
public void shouldSelectOne() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
runScript(ds, JPETSTORE_DATA);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection);
+ SqlRunner exec = new SqlRunner(connection);
Map row = exec.selectOne("SELECT * FROM PRODUCT WHERE PRODUCTID = ?", "FI-SW-01");
Assert.assertEquals("FI-SW-01", row.get("PRODUCTID"));
} finally {
@@ -26,12 +27,12 @@
@Test
public void shouldSelectList() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
runScript(ds, JPETSTORE_DATA);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection);
+ SqlRunner exec = new SqlRunner(connection);
List rows = exec.selectAll("SELECT * FROM PRODUCT");
Assert.assertEquals(16, rows.size());
} finally {
@@ -41,15 +42,15 @@
@Test
public void shouldInsert() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(BLOG_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(BLOG_PROPERTIES);
runScript(ds, BLOG_DDL);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection, true);
+ SqlRunner exec = new SqlRunner(connection, true);
int id = exec.insert("INSERT INTO author (username, password, email, bio) VALUES (?,?,?,?)", "someone", "******", "someone@apache.org", Null.LONGVARCHAR);
Map row = exec.selectOne("SELECT * FROM author WHERE username = ?", "someone");
connection.rollback();
- Assert.assertTrue(AdHocExecutor.NO_GENERATED_KEY != id);
+ Assert.assertTrue(SqlRunner.NO_GENERATED_KEY != id);
Assert.assertEquals("someone", row.get("USERNAME"));
} finally {
ds.forceCloseAll();
@@ -58,12 +59,12 @@
@Test
public void shouldUpdateCategory() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
runScript(ds, JPETSTORE_DATA);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection);
+ SqlRunner exec = new SqlRunner(connection);
int count = exec.update("update product set category = ? where productid = ?", "DOGS", "FI-SW-01");
Map row = exec.selectOne("SELECT * FROM PRODUCT WHERE PRODUCTID = ?", "FI-SW-01");
Assert.assertEquals("DOGS", row.get("CATEGORY"));
@@ -75,12 +76,12 @@
@Test
public void shouldDeleteOne() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
runScript(ds, JPETSTORE_DATA);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection);
+ SqlRunner exec = new SqlRunner(connection);
int count = exec.delete("delete from item");
List rows = exec.selectAll("SELECT * FROM ITEM");
Assert.assertEquals(28, count);
@@ -92,10 +93,10 @@
@Test
public void shouldDemonstrateDDLThroughRunMethod() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
Connection connection = ds.getConnection();
try {
- AdHocExecutor exec = new AdHocExecutor(connection);
+ SqlRunner exec = new SqlRunner(connection);
exec.run("CREATE TABLE BLAH(ID INTEGER)");
exec.run("insert into BLAH values (1)");
List rows = exec.selectAll("SELECT * FROM BLAH");
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/adhoc/NullTest.java Sat Aug 30 12:03:51 2008
@@ -1,6 +1,7 @@
package org.apache.ibatis.adhoc;
import org.apache.ibatis.type.*;
+import org.apache.ibatis.migration.Null;
import org.junit.*;
public class NullTest {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java Sat Aug 30 12:03:51 2008
@@ -2,7 +2,7 @@
import domain.blog.*;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.SimpleDataSource;
+import org.apache.ibatis.jdbc.PooledDataSource;
import org.apache.ibatis.mapping.*;
import org.junit.*;
@@ -23,15 +23,15 @@
config.setDefaultStatementTimeout(5000);
}
- protected SimpleDataSource createBlogDataSource() throws IOException, SQLException {
- SimpleDataSource ds = createSimpleDataSource(BLOG_PROPERTIES);
+ protected PooledDataSource createBlogDataSource() throws IOException, SQLException {
+ PooledDataSource ds = createPooledDataSource(BLOG_PROPERTIES);
runScript(ds, BLOG_DDL);
runScript(ds, BLOG_DATA);
return ds;
}
- protected SimpleDataSource createJPetstoreDataSource() throws IOException, SQLException {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ protected PooledDataSource createJPetstoreDataSource() throws IOException, SQLException {
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
runScript(ds, JPETSTORE_DDL);
runScript(ds, JPETSTORE_DATA);
return ds;
@@ -39,7 +39,7 @@
@Test
public void shouldInsertNewAuthor() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -60,7 +60,7 @@
@Test
public void shouldSelectAllAuthorsAutoMapped() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -82,7 +82,7 @@
@Test
public void shouldInsertNewAuthorWithAutoKey() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
config.setGeneratedKeysEnabled(true);
try {
@@ -108,7 +108,7 @@
@Test
public void shouldInsertNewAuthorByProc() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -128,7 +128,7 @@
@Test
public void shouldInsertNewAuthorUsingSimpleNonPreparedStatements() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -149,7 +149,7 @@
@Test
public void shouldUpdateAuthor() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -170,7 +170,7 @@
@Test
public void shouldDeleteAuthor() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -190,7 +190,7 @@
@Test
public void shouldSelectDiscriminatedProduct() throws Exception {
- SimpleDataSource ds = createJPetstoreDataSource();
+ PooledDataSource ds = createJPetstoreDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -212,7 +212,7 @@
@Test
public void shouldSelect10DiscriminatedProducts() throws Exception {
- SimpleDataSource ds = createJPetstoreDataSource();
+ PooledDataSource ds = createJPetstoreDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -234,7 +234,7 @@
@Test
public void shouldSelectTwoSetsOfAuthorsViaProc() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
connection.setAutoCommit(false);
try {
@@ -261,7 +261,7 @@
@Test
public void shouldSelectAuthorViaOutParams() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
connection.setAutoCommit(false);
try {
@@ -282,7 +282,7 @@
@Test
public void shouldFetchPostsForBlog() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -303,7 +303,7 @@
@Test
public void shouldFetchOneOrphanedPostWithNoBlog() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -324,7 +324,7 @@
@Test
public void shouldFetchPostWithBlogWithCompositeKey() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -347,7 +347,7 @@
@Test
public void shouldFetchComplexBlogs() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
@@ -370,7 +370,7 @@
@Test
public void shouldMapConstructorResults() throws Exception {
- SimpleDataSource ds = createBlogDataSource();
+ PooledDataSource ds = createBlogDataSource();
Connection connection = ds.getConnection();
try {
Executor executor = createExecutor(connection);
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java (from r690527, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SimpleDataSourceTest.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SimpleDataSourceTest.java&r1=690527&r2=690554&rev=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SimpleDataSourceTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java Sat Aug 30 12:03:51 2008
@@ -6,11 +6,11 @@
import java.sql.Connection;
import java.util.*;
-public class SimpleDataSourceTest extends BaseDataTest {
+public class PooledDataSourceTest extends BaseDataTest {
@Test
public void shouldProperlyMaintainPoolOf3ActiveAnd2IdleConnections() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
try {
runScript(ds, JPETSTORE_DDL);
ds.setJdbcDefaultAutoCommit(false);
@@ -32,18 +32,18 @@
for (int i = 0; i < 3; i++) {
connections.add(ds.getConnection());
}
- Assert.assertEquals(3, ds.getActiveConnectionCount());
+ Assert.assertEquals(3, ds.getPoolState().getActiveConnectionCount());
for (Connection c : connections) {
c.close();
}
- Assert.assertEquals(2, ds.getIdleConnectionCount());
- Assert.assertEquals(4, ds.getRequestCount());
- Assert.assertEquals(0, ds.getBadConnectionCount());
- Assert.assertEquals(0, ds.getHadToWaitCount());
- Assert.assertEquals(0, ds.getAverageOverdueCheckoutTime());
- Assert.assertEquals(0, ds.getClaimedOverdueConnectionCount());
- Assert.assertEquals(0, ds.getAverageWaitTime());
- Assert.assertNotNull(ds.getStatus());
+ Assert.assertEquals(2, ds.getPoolState().getIdleConnectionCount());
+ Assert.assertEquals(4, ds.getPoolState().getRequestCount());
+ Assert.assertEquals(0, ds.getPoolState().getBadConnectionCount());
+ Assert.assertEquals(0, ds.getPoolState().getHadToWaitCount());
+ Assert.assertEquals(0, ds.getPoolState().getAverageOverdueCheckoutTime());
+ Assert.assertEquals(0, ds.getPoolState().getClaimedOverdueConnectionCount());
+ Assert.assertEquals(0, ds.getPoolState().getAverageWaitTime());
+ Assert.assertNotNull(ds.getPoolState().toString());
} finally {
ds.forceCloseAll();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/metadata/MetadataTest.java Sat Aug 30 12:03:51 2008
@@ -16,7 +16,7 @@
@Before
public void setup() throws Exception {
- dataSource = createSimpleDataSource(BaseDataTest.BLOG_PROPERTIES);
+ dataSource = createPooledDataSource(BaseDataTest.BLOG_PROPERTIES);
}
@Test
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Sat Aug 30 12:03:51 2008
@@ -1,8 +1,8 @@
package org.apache.ibatis.migration;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.adhoc.AdHocExecutor;
-import org.apache.ibatis.jdbc.SimpleDataSource;
+import org.apache.ibatis.migration.SqlRunner;
+import org.apache.ibatis.jdbc.PooledDataSource;
import org.apache.ibatis.io.Resources;
import org.junit.*;
@@ -24,9 +24,9 @@
buffer = new StringOutputStream();
System.setOut(new PrintStream(buffer));
- SimpleDataSource ds = createSimpleDataSource(BLOG_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(BLOG_PROPERTIES);
Connection conn = ds.getConnection();
- AdHocExecutor executor = new AdHocExecutor(conn);
+ SqlRunner executor = new SqlRunner(conn);
safeRun(executor, "DROP TABLE comment");
safeRun(executor, "DROP TABLE post_tag");
safeRun(executor, "DROP TABLE tag");
@@ -82,8 +82,6 @@
Migrator.main(args("--path="+f.getAbsolutePath(),"--help"));
Assert.assertTrue(buffer.toString().contains("--help"));
buffer.clear();
-
-
}
@@ -117,6 +115,7 @@
Assert.assertTrue(f.mkdir());
Assert.assertTrue(f.exists());
Assert.assertTrue(f.isDirectory());
+ f.deleteOnExit();
return f;
}
@@ -135,7 +134,7 @@
}
}
- private static void safeRun(AdHocExecutor executor, String sql) {
+ private static void safeRun(SqlRunner executor, String sql) {
try {
executor.run(sql);
} catch (Exception e) {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java?rev=690554&r1=690553&r2=690554&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/ScriptRunnerTest.java Sat Aug 30 12:03:51 2008
@@ -1,11 +1,12 @@
package org.apache.ibatis.migration;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.adhoc.AdHocExecutor;
+import org.apache.ibatis.migration.SqlRunner;
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.jdbc.SimpleDataSource;
+import org.apache.ibatis.jdbc.*;
import org.junit.*;
+import javax.sql.DataSource;
import java.io.IOException;
import java.sql.*;
import java.util.*;
@@ -14,9 +15,11 @@
@Test
public void shouldRunScriptsUsingConnection() throws Exception {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
Connection conn = ds.getConnection();
- ScriptRunner runner = new ScriptRunner(conn, true, false);
+ ScriptRunner runner = new ScriptRunner(conn);
+ runner.setAutoCommit(true);
+ runner.setStopOnError(false);
runner.setErrorLogWriter(null);
runner.setLogWriter(null);
runJPetStoreScripts(runner);
@@ -26,13 +29,14 @@
@Test
public void shouldRunScriptsUsingProperties() throws Exception {
Properties props = Resources.getResourceAsProperties(JPETSTORE_PROPERTIES);
- ScriptRunner runner = new ScriptRunner(
+ DataSource dataSource = new UnpooledDataSource(
props.getProperty("driver"),
props.getProperty("url"),
props.getProperty("username"),
- props.getProperty("password"),
- true,
- false);
+ props.getProperty("password"));
+ ScriptRunner runner = new ScriptRunner(dataSource.getConnection());
+ runner.setAutoCommit(true);
+ runner.setStopOnError(false);
runner.setErrorLogWriter(null);
runner.setLogWriter(null);
runJPetStoreScripts(runner);
@@ -45,10 +49,10 @@
}
private void assertProductsTableExistsAndLoaded() throws IOException, SQLException {
- SimpleDataSource ds = createSimpleDataSource(JPETSTORE_PROPERTIES);
+ PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
try {
Connection conn = ds.getConnection();
- AdHocExecutor executor = new AdHocExecutor(conn);
+ SqlRunner executor = new SqlRunner(conn);
List<Map<String, Object>> products = executor.selectAll("SELECT * FROM PRODUCT");
Assert.assertEquals(16, products.size());
} finally {