Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java Sat Oct 10 05:45:06 2009 @@ -1,6 +1,13 @@ package org.apache.ibatis.submitted.nested; +import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import static org.junit.Assert.assertEquals; +import org.junit.BeforeClass; +import org.junit.Test; import java.io.PrintWriter; import java.io.Reader; @@ -9,111 +16,103 @@ import java.util.List; import java.util.Map; -import org.apache.ibatis.io.Resources; -import org.apache.ibatis.jdbc.ScriptRunner; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.ibatis.session.SqlSessionFactoryBuilder; -import org.junit.BeforeClass; -import org.junit.Test; - public class NestedForEachTest { - protected static SqlSessionFactory sqlSessionFactory; + protected static SqlSessionFactory sqlSessionFactory; - @BeforeClass - public static void setUp() throws Exception { - Connection conn = null; - - try { - Class.forName("org.hsqldb.jdbcDriver"); - conn = DriverManager.getConnection("jdbc:hsqldb:mem:cname", "sa", - ""); - - Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/nested/CreateDB.sql"); - - ScriptRunner runner = new ScriptRunner(conn); - runner.setLogWriter(null); - runner.setErrorLogWriter(new PrintWriter(System.err)); - runner.runScript(reader); - conn.commit(); - reader.close(); - - reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/nested/MapperConfig.xml"); - sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); - reader.close(); - } finally { - if (conn != null) { - conn.close(); - } - } + @BeforeClass + public static void setUp() throws Exception { + Connection conn = null; + + try { + Class.forName("org.hsqldb.jdbcDriver"); + conn = DriverManager.getConnection("jdbc:hsqldb:mem:cname", "sa", + ""); + + Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/nested/CreateDB.sql"); + + ScriptRunner runner = new ScriptRunner(conn); + runner.setLogWriter(null); + runner.setErrorLogWriter(new PrintWriter(System.err)); + runner.runScript(reader); + conn.commit(); + reader.close(); + + reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/nested/MapperConfig.xml"); + sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); + reader.close(); + } finally { + if (conn != null) { + conn.close(); + } } + } - @Test - @SuppressWarnings("unchecked") - public void testSimpleSelect() { - SqlSession sqlSession = sqlSessionFactory.openSession(); - try { - Name name = new Name(); - name.setLastName("Flintstone"); - Parameter parameter = new Parameter(); - parameter.addName(name); - - List<Map<String, Object>> answer = - sqlSession.selectList("org.apache.ibatis.submitted.nested.simpleSelect", parameter); - - assertEquals(3, answer.size()); - } finally { - sqlSession.close(); - } + @Test + @SuppressWarnings("unchecked") + public void testSimpleSelect() { + SqlSession sqlSession = sqlSessionFactory.openSession(); + try { + Name name = new Name(); + name.setLastName("Flintstone"); + Parameter parameter = new Parameter(); + parameter.addName(name); + + List<Map<String, Object>> answer = + sqlSession.selectList("org.apache.ibatis.submitted.nested.simpleSelect", parameter); + + assertEquals(3, answer.size()); + } finally { + sqlSession.close(); } + } - @Test - @SuppressWarnings("unchecked") - public void testNestedSelect() { - SqlSession sqlSession = sqlSessionFactory.openSession(); - try { - Name name = new Name(); - name.setLastName("Flintstone"); - name.addFirstName("Fred"); - name.addFirstName("Wilma"); - - Parameter parameter = new Parameter(); - parameter.addName(name); - - List<Map<String, Object>> answer = - sqlSession.selectList("org.apache.ibatis.submitted.nested.nestedSelect", parameter); - - assertEquals(2, answer.size()); - } finally { - sqlSession.close(); - } + @Test + @SuppressWarnings("unchecked") + public void testNestedSelect() { + SqlSession sqlSession = sqlSessionFactory.openSession(); + try { + Name name = new Name(); + name.setLastName("Flintstone"); + name.addFirstName("Fred"); + name.addFirstName("Wilma"); + + Parameter parameter = new Parameter(); + parameter.addName(name); + + List<Map<String, Object>> answer = + sqlSession.selectList("org.apache.ibatis.submitted.nested.nestedSelect", parameter); + + assertEquals(2, answer.size()); + } finally { + sqlSession.close(); } + } - @Test - @SuppressWarnings("unchecked") - public void testNestedSelect2() { - SqlSession sqlSession = sqlSessionFactory.openSession(); - try { - Name name = new Name(); - name.setLastName("Flintstone"); - name.addFirstName("Fred"); - name.addFirstName("Wilma"); - - Parameter parameter = new Parameter(); - parameter.addName(name); - - name = new Name(); - name.setLastName("Rubble"); - name.addFirstName("Betty"); - parameter.addName(name); - - List<Map<String, Object>> answer = - sqlSession.selectList("org.apache.ibatis.submitted.nested.nestedSelect", parameter); - - assertEquals(3, answer.size()); - } finally { - sqlSession.close(); - } + @Test + @SuppressWarnings("unchecked") + public void testNestedSelect2() { + SqlSession sqlSession = sqlSessionFactory.openSession(); + try { + Name name = new Name(); + name.setLastName("Flintstone"); + name.addFirstName("Fred"); + name.addFirstName("Wilma"); + + Parameter parameter = new Parameter(); + parameter.addName(name); + + name = new Name(); + name.setLastName("Rubble"); + name.addFirstName("Betty"); + parameter.addName(name); + + List<Map<String, Object>> answer = + sqlSession.selectList("org.apache.ibatis.submitted.nested.nestedSelect", parameter); + + assertEquals(3, answer.size()); + } finally { + sqlSession.close(); } + } }
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Parameter.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Parameter.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Parameter.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Parameter.java Sat Oct 10 05:45:06 2009 @@ -4,14 +4,17 @@ import java.util.List; public class Parameter { - private List<Name> names; - public Parameter() { - names = new ArrayList<Name>(); - } - public List<Name> getNames() { - return names; - } - public void addName(Name name) { - names.add(name); - } + private List<Name> names; + + public Parameter() { + names = new ArrayList<Name>(); + } + + public List<Name> getNames() { + return names; + } + + public void addName(Name name) { + names.add(name); + } } Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java Sat Oct 10 05:45:06 2009 @@ -1,19 +1,14 @@ package org.apache.ibatis.submitted.null_associations; import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactoryBuilder; -import org.apache.ibatis.jdbc.SqlRunner; -import org.apache.ibatis.jdbc.ScriptRunner; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.*; -import java.sql.Connection; import java.io.Reader; +import java.sql.Connection; public class FooMapperTest { Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/IbatisConfig.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/IbatisConfig.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/IbatisConfig.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/IbatisConfig.java Sat Oct 10 05:45:06 2009 @@ -1,12 +1,12 @@ package org.apache.ibatis.submitted.primitive_result_type; -import java.io.Reader; - import org.apache.ibatis.io.Resources; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactoryBuilder; +import java.io.Reader; + public class IbatisConfig { private static SqlSessionFactory sqlSessionFactory; Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java Sat Oct 10 05:45:06 2009 @@ -1,16 +1,16 @@ package org.apache.ibatis.submitted.primitive_result_type; -import org.junit.Test; -import static org.junit.Assert.*; -import org.junit.BeforeClass; -import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSession; +import static org.junit.Assert.assertTrue; +import org.junit.BeforeClass; +import org.junit.Test; -import java.util.List; -import java.sql.Connection; import java.io.Reader; import java.math.BigDecimal; +import java.sql.Connection; +import java.util.List; public class PrimitiveResultTypeTest { Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/ProductDAO.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/ProductDAO.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/ProductDAO.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/primitive_result_type/ProductDAO.java Sat Oct 10 05:45:06 2009 @@ -1,10 +1,10 @@ package org.apache.ibatis.submitted.primitive_result_type; -import java.util.List; -import java.math.BigDecimal; - import org.apache.ibatis.session.SqlSession; +import java.math.BigDecimal; +import java.util.List; + public class ProductDAO { public static List<Integer> selectProductCodes() { Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql Sat Oct 10 05:45:06 2009 @@ -1,9 +1,9 @@ create table table1 ( - id int generated by default as identity (start with 11) not null, - name varchar(20) +id int generated by default as identity (start with 11) not null, +name varchar(20) ); create table table2 ( - id int generated by default as identity (start with 22) not null, - name varchar(20) +id int generated by default as identity (start with 22) not null, +name varchar(20) ); Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml Sat Oct 10 05:45:06 2009 @@ -17,7 +17,7 @@ </dataSource> </environment> </environments> - + <mappers> <mapper resource="org/apache/ibatis/submitted/selectkey/Table1.xml"/> <mapper resource="org/apache/ibatis/submitted/selectkey/Table2.xml"/> Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java Sat Oct 10 05:45:06 2009 @@ -2,11 +2,11 @@ import org.apache.ibatis.io.Resources; import org.apache.ibatis.jdbc.ScriptRunner; -import org.apache.ibatis.session.*; - -import static org.junit.Assert.assertNotNull; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import static org.junit.Assert.assertEquals; - +import static org.junit.Assert.assertNotNull; import org.junit.BeforeClass; import org.junit.Test; @@ -19,36 +19,36 @@ public class SelectKeyTest { - protected static SqlSessionFactory sqlSessionFactory; - - @BeforeClass - public static void setUp() throws Exception { - Connection conn = null; - - try { - Class.forName("org.hsqldb.jdbcDriver"); - conn = DriverManager.getConnection("jdbc:hsqldb:mem:lname", "sa", - ""); - - Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/selectkey/CreateDB.sql"); - - ScriptRunner runner = new ScriptRunner(conn); - runner.setLogWriter(null); - runner.setErrorLogWriter(new PrintWriter(System.err)); - runner.runScript(reader); - conn.commit(); - reader.close(); - - reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/selectkey/MapperConfig.xml"); - sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); - reader.close(); - } finally { - if (conn != null) { - conn.close(); - } - } + protected static SqlSessionFactory sqlSessionFactory; + + @BeforeClass + public static void setUp() throws Exception { + Connection conn = null; + + try { + Class.forName("org.hsqldb.jdbcDriver"); + conn = DriverManager.getConnection("jdbc:hsqldb:mem:lname", "sa", + ""); + + Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/selectkey/CreateDB.sql"); + + ScriptRunner runner = new ScriptRunner(conn); + runner.setLogWriter(null); + runner.setErrorLogWriter(new PrintWriter(System.err)); + runner.runScript(reader); + conn.commit(); + reader.close(); + + reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/selectkey/MapperConfig.xml"); + sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); + reader.close(); + } finally { + if (conn != null) { + conn.close(); + } } - + } + @Test public void testSelectKey() throws Exception { // this test checks to make sure that we can have select keys with the same @@ -59,37 +59,37 @@ SqlSessionFactory sqlMapper = builder.build(reader); assertNotNull(sqlMapper); } - + @Test public void testInsertTable1() { - SqlSession sqlSession = sqlSessionFactory.openSession(); - - try { - Map parms = new HashMap(); - parms.put("name", "Fred"); - int rows = sqlSession.insert("org.apache.ibatis.submitted.selectkey.Table1.insert", parms); - assertEquals(1, rows); - assertEquals(11, parms.get("id")); - - } finally { - sqlSession.close(); - } + SqlSession sqlSession = sqlSessionFactory.openSession(); + + try { + Map parms = new HashMap(); + parms.put("name", "Fred"); + int rows = sqlSession.insert("org.apache.ibatis.submitted.selectkey.Table1.insert", parms); + assertEquals(1, rows); + assertEquals(11, parms.get("id")); + + } finally { + sqlSession.close(); + } } - + @Test public void testInsertTable2() { - SqlSession sqlSession = sqlSessionFactory.openSession(); - - try { - Map parms = new HashMap(); - parms.put("name", "Fred"); - int rows = sqlSession.insert("org.apache.ibatis.submitted.selectkey.Table2.insert", parms); - assertEquals(1, rows); - assertEquals(22, parms.get("id")); - - } finally { - sqlSession.close(); - } + SqlSession sqlSession = sqlSessionFactory.openSession(); + + try { + Map parms = new HashMap(); + parms.put("name", "Fred"); + int rows = sqlSession.insert("org.apache.ibatis.submitted.selectkey.Table2.insert", parms); + assertEquals(1, rows); + assertEquals(22, parms.get("id")); + + } finally { + sqlSession.close(); + } } - + } Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryTest.java Sat Oct 10 05:45:06 2009 @@ -1,7 +1,8 @@ package org.apache.ibatis.transaction.managed; import org.apache.ibatis.BaseDataTest; -import org.apache.ibatis.transaction.*; +import org.apache.ibatis.transaction.Transaction; +import org.apache.ibatis.transaction.TransactionFactory; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; import static org.junit.Assert.assertEquals; Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/BaseTypeHandlerTest.java Sat Oct 10 05:45:06 2009 @@ -3,7 +3,9 @@ import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public abstract class BaseTypeHandlerTest { Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java?rev=823796&r1=823795&r2=823796&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/type/SimpleTypeRegistryTest.java Sat Oct 10 05:45:06 2009 @@ -1,7 +1,8 @@ package org.apache.ibatis.type; import domain.misc.RichType; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; public class SimpleTypeRegistryTest {
