Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/AbstractTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/AbstractTest.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/AbstractTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/AbstractTest.java Wed May 5 20:13:17 2010 @@ -16,115 +16,34 @@ package ibatortest; +import static ibatortest.util.TestUtilities.createDatabase; + import java.io.Reader; -import java.sql.Connection; -import java.sql.DriverManager; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Random; +import java.net.URL; import org.apache.ibatis.io.Resources; -import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.junit.Before; /** * @author Jeff Butler - * + * */ public abstract class AbstractTest { protected SqlSessionFactory sqlSessionFactory; - protected static DateFormat dateOnlyFormat = SimpleDateFormat.getDateInstance(); - protected static DateFormat timeOnlyFormat = SimpleDateFormat.getTimeInstance(); @Before public void setUp() throws Exception { - Connection conn = null; - - try { - Class.forName("org.hsqldb.jdbcDriver"); - conn = DriverManager.getConnection("jdbc:hsqldb:mem:aname", "sa", - ""); - - Reader reader = Resources.getResourceAsReader("CreateDB.sql"); - - ScriptRunner runner = new ScriptRunner(conn); - runner.setLogWriter(null); - runner.setErrorLogWriter(null); - runner.runScript(reader); - conn.commit(); - - reader.close(); - - reader = Resources.getResourceAsReader("ibatortest/MapperConfig.xml"); - sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); - reader.close(); - } finally { - if (conn != null) { - conn.close(); - } - } - } - - protected byte[] generateRandomBlob() { - Random random = new Random(System.currentTimeMillis()); - - byte[] answer = new byte[256]; + URL url = AbstractTest.class.getClassLoader().getResource("CreateDB.sql"); - random.nextBytes(answer); - - return answer; - } + createDatabase(url); - protected boolean blobsAreEqual(byte[] blob1, byte[] blob2) { - if (blob1 == null) { - return blob2 == null; - } - - if (blob2 == null) { - return blob1 == null; - } - - boolean rc = blob1.length == blob2.length; - - if (rc) { - for (int i = 0; i < blob1.length; i++) { - if (blob1[i] != blob2[i]) { - rc = false; - break; - } - } - } - - return rc; - } - - protected boolean datesAreEqual(Date date1, Date date2) { - if (date1 == null) { - return date2 == null; - } - - if (date2 == null) { - return date1 == null; - } - - return dateOnlyFormat.format(date1).equals(dateOnlyFormat.format(date2)); - - } - - protected boolean timesAreEqual(Date date1, Date date2) { - if (date1 == null) { - return date2 == null; - } - - if (date2 == null) { - return date1 == null; - } - - return timeOnlyFormat.format(date1).equals(timeOnlyFormat.format(date2)); - + Reader reader = Resources + .getResourceAsReader("ibatortest/MapperConfig.xml"); + sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); + reader.close(); + reader.close(); } }
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java Wed May 5 20:13:17 2010 @@ -16,6 +16,10 @@ package ibatortest.execute.conditional.java5; +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.datesAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; +import static ibatortest.util.TestUtilities.timesAreEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java Wed May 5 20:13:17 2010 @@ -16,6 +16,8 @@ package ibatortest.execute.conditional.java5; +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.java Wed May 5 20:13:17 2010 @@ -16,8 +16,15 @@ package ibatortest.execute.flat.java5; -import static org.junit.Assert.*; - +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.datesAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; +import static ibatortest.util.TestUtilities.timesAreEqual; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import ibatortest.AbstractTest; import ibatortest.generated.flat.java5.dao.AwfulTableMapper; import ibatortest.generated.flat.java5.dao.FieldsblobsMapper; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/UpdateByExampleTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/UpdateByExampleTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/UpdateByExampleTest.java Wed May 5 20:13:17 2010 @@ -16,8 +16,11 @@ package ibatortest.execute.flat.java5; -import static org.junit.Assert.*; - +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import ibatortest.AbstractTest; import ibatortest.generated.flat.java5.dao.AwfulTableMapper; import ibatortest.generated.flat.java5.dao.FieldsblobsMapper; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/HierarchicalJava5Test.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/HierarchicalJava5Test.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/HierarchicalJava5Test.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/HierarchicalJava5Test.java Wed May 5 20:13:17 2010 @@ -16,6 +16,10 @@ package ibatortest.execute.hierarchical.java5; +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.datesAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; +import static ibatortest.util.TestUtilities.timesAreEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/UpdateByExampleTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/UpdateByExampleTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/hierarchical/java5/UpdateByExampleTest.java Wed May 5 20:13:17 2010 @@ -16,6 +16,8 @@ package ibatortest.execute.hierarchical.java5; +import static ibatortest.util.TestUtilities.blobsAreEqual; +import static ibatortest.util.TestUtilities.generateRandomBlob; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java Wed May 5 20:13:17 2010 @@ -15,6 +15,7 @@ */ package ibatortest.execute.miscellaneous; +import static ibatortest.util.TestUtilities.datesAreEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull;
