You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2008/07/22 03:46:35 UTC
svn commit: r678614 [1/2] - in /ibatis/trunk/java/tools/ibator/core: build/
testJava2/ testJava2/ibatortest/java2/
testJava2/ibatortest/java2/execute/conditional/java2/
testJava2/ibatortest/java2/execute/flat/java2/
testJava2/ibatortest/java2/execute/h...
Author: jgbutler
Date: Mon Jul 21 18:46:34 2008
New Revision: 678614
URL: http://svn.apache.org/viewvc?rev=678614&view=rev
Log:
Ibator: further test refactoring for Spring
Added:
ibatis/trunk/java/tools/ibator/core/testJava2/commons-logging.properties
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/BaseConditionalJava2Test.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SpringBeans.xml
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/BaseFlatJava2Test.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/hierarchical/java2/BaseHierarchicalJava2Test.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/miscellaneous/BaseMiscellaneousTest.java
Modified:
ibatis/trunk/java/tools/ibator/core/build/build.xml
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/BaseTest.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/CountByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByPrimaryKeyTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByPrimaryKeyTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByPrimaryKeyTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/FlatJava2Tests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/UpdateByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/hierarchical/java2/HierarchicalJava2Tests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/hierarchical/java2/UpdateByExampleTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/miscellaneous/MiscellaneousTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
Modified: ibatis/trunk/java/tools/ibator/core/build/build.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/build.xml?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/build.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/build/build.xml Mon Jul 21 18:46:34 2008
@@ -334,6 +334,12 @@
<pathelement location="${generated.bin.dir.java2}"/>
<pathelement location="${basedir}/../devlib/ibatis-2.3.3.720.jar" />
<pathelement location="${basedir}/../devlib/hsqldb1.8.0.7.jar" />
+ <pathelement location="${basedir}/../devlib/commons-logging-1.1.1.jar" />
+ <pathelement location="${basedir}/../devlib/spring-beans-2.5.5.jar" />
+ <pathelement location="${basedir}/../devlib/spring-core-2.5.5.jar" />
+ <pathelement location="${basedir}/../devlib/spring-jdbc-2.5.5.jar" />
+ <pathelement location="${basedir}/../devlib/spring-orm-2.5.5.jar" />
+ <pathelement location="${basedir}/../devlib/spring-tx-2.5.5.jar" />
</classpath>
</junit>
</target>
Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Jul 21 18:46:34 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Mon Jul 21 16:20:16 CDT 2008
+#Mon Jul 21 20:40:21 CDT 2008
version=1.2.0
-buildNum=566
+buildNum=570
Added: ibatis/trunk/java/tools/ibator/core/testJava2/commons-logging.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/commons-logging.properties?rev=678614&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/commons-logging.properties (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/commons-logging.properties Mon Jul 21 18:46:34 2008
@@ -0,0 +1,2 @@
+/* turn off logging from Spring */
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/BaseTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/BaseTest.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/BaseTest.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/BaseTest.java Mon Jul 21 18:46:34 2008
@@ -38,11 +38,11 @@
*/
public abstract class BaseTest extends TestCase {
- protected static SqlMapClient sqlMapClient;
+ private SqlMapClient sqlMapClient;
private static DateFormat dateOnlyFormat = SimpleDateFormat.getDateInstance();
private static DateFormat timeOnlyFormat = SimpleDateFormat.getTimeInstance();
- protected static void initSqlMapClient(String configFile, Properties props) throws Exception {
+ protected void initSqlMapClient(String configFile, Properties props) throws Exception {
Reader reader = Resources.getResourceAsReader(configFile);
sqlMapClient = SqlMapClientBuilder.buildSqlMapClient(reader, props);
reader.close();
@@ -129,4 +129,8 @@
return timeOnlyFormat.format(date1).equals(timeOnlyFormat.format(date2));
}
+
+ protected SqlMapClient getSqlMapClient() {
+ return sqlMapClient;
+ }
}
Added: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/BaseConditionalJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/BaseConditionalJava2Test.java?rev=678614&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/BaseConditionalJava2Test.java (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/BaseConditionalJava2Test.java Mon Jul 21 18:46:34 2008
@@ -0,0 +1,64 @@
+package ibatortest.java2.execute.conditional.java2;
+
+import ibatortest.java2.BaseTest;
+import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
+import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
+import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
+import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
+import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
+import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
+import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+public class BaseConditionalJava2Test extends BaseTest {
+
+ private BeanFactory factory;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public BaseConditionalJava2Test() {
+ Resource res = new ClassPathResource("/ibatortest/java2/execute/conditional/java2/SpringBeans.xml");
+ factory = new XmlBeanFactory(res);
+ }
+
+ protected FieldsonlyDAO getFieldsonlyDAO() {
+ FieldsonlyDAO dao = (FieldsonlyDAO) factory.getBean("FieldsonlyDAO");
+ return dao;
+ }
+
+ protected PkonlyDAO getPkonlyDAO() {
+ PkonlyDAO dao = (PkonlyDAO) factory.getBean("PkonlyDAO");
+ return dao;
+ }
+
+ protected PkfieldsDAO getPkfieldsDAO() {
+ PkfieldsDAO dao = (PkfieldsDAO) factory.getBean("PkfieldsDAO");
+ return dao;
+ }
+
+ protected PkblobsDAO getPkblobsDAO() {
+ PkblobsDAO dao = (PkblobsDAO) factory.getBean("PkblobsDAO");
+ return dao;
+ }
+
+ protected PkfieldsblobsDAO getPkfieldsblobsDAO() {
+ PkfieldsblobsDAO dao = (PkfieldsblobsDAO) factory.getBean("PkfieldsblobsDAO");
+ return dao;
+ }
+
+ protected FieldsblobsDAO getFieldsblobsDAO() {
+ FieldsblobsDAO dao = (FieldsblobsDAO) factory.getBean("FieldsblobsDAO");
+ return dao;
+ }
+
+ protected AwfulTableDAO getAwfulTableDAO() {
+ AwfulTableDAO dao = (AwfulTableDAO) factory.getBean("AwfulTableDAO");
+ return dao;
+ }
+}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/CountByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/CountByExampleTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/CountByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/CountByExampleTests.java Mon Jul 21 18:46:34 2008
@@ -1,22 +1,12 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.AwfulTableExample;
import ibatortest.java2.generated.conditional.java2.model.FieldsblobsExample;
@@ -32,17 +22,10 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
-public class CountByExampleTests extends BaseTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class CountByExampleTests extends BaseConditionalJava2Test {
public void testFieldsOnlyCountByExample() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -72,13 +55,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(3, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyCountByExample() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -104,13 +87,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(3, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsCountByExample() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -137,13 +120,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(2, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsCountByExample() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -169,13 +152,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(2, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsCountByExample() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -198,13 +181,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(2, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsCountByExample() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -229,13 +212,13 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(2, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableCountByExample() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -280,7 +263,7 @@
example.clear();
rows = dao.countByExample(example);
assertEquals(2, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByExampleTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByExampleTests.java Mon Jul 21 18:46:34 2008
@@ -1,23 +1,12 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.AwfulTableExample;
import ibatortest.java2.generated.conditional.java2.model.FieldsblobsExample;
@@ -33,17 +22,12 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
-public class DeleteByExampleTests extends BaseTest {
+import java.util.List;
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class DeleteByExampleTests extends BaseConditionalJava2Test {
public void testFieldsOnlyDeleteByExample() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -73,13 +57,13 @@
example = new FieldsonlyExample();
List answer = dao.selectByExample(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyDeleteByExample() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -105,13 +89,13 @@
example = new PkonlyExample();
List answer = dao.selectByExample(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsDeleteByExample() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -141,13 +125,13 @@
example = new PkfieldsExample();
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsDeleteByExample() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -174,13 +158,13 @@
example = new PkblobsExample();
answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsDeleteByExample() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -211,13 +195,13 @@
example = new PkfieldsblobsExample();
answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsDeleteByExample() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -246,13 +230,13 @@
example = new FieldsblobsExample();
answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableDeleteByExample() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -301,9 +285,8 @@
example.clear();
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
-
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByPrimaryKeyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByPrimaryKeyTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByPrimaryKeyTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/DeleteByPrimaryKeyTests.java Mon Jul 21 18:46:34 2008
@@ -1,19 +1,10 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.AwfulTableExample;
import ibatortest.java2.generated.conditional.java2.model.Pkblobs;
@@ -27,17 +18,12 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
-public class DeleteByPrimaryKeyTests extends BaseTest {
+import java.util.List;
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class DeleteByPrimaryKeyTests extends BaseConditionalJava2Test {
public void testPKOnlyDeleteByPrimaryKey() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -62,13 +48,13 @@
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKfieldsDeleteByPrimaryKey() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -89,13 +75,13 @@
PkfieldsExample example = new PkfieldsExample();
List answer = dao.selectByExample(example);
assertEquals(0, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsDeleteByPrimaryKey() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -114,13 +100,13 @@
example = new PkblobsExample();
answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(0, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsDeleteByPrimaryKey() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -152,13 +138,13 @@
example = new PkfieldsblobsExample();
answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(1, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableDeleteByPrimaryKey() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -184,9 +170,8 @@
AwfulTableExample example = new AwfulTableExample();
List answer = dao.selectByExample(example);
assertEquals(0, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
-
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java Mon Jul 21 18:46:34 2008
@@ -1,25 +1,12 @@
package ibatortest.java2.execute.conditional.java2;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.FieldsblobsExample;
import ibatortest.java2.generated.conditional.java2.model.FieldsblobsWithBLOBs;
@@ -34,17 +21,14 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
-public class InsertTests extends BaseTest {
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class InsertTests extends BaseConditionalJava2Test {
public void testFieldsOnlyInsert() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -65,13 +49,13 @@
assertEquals(record.getDoublefield(), returnedRecord
.getDoublefield());
assertEquals(record.getFloatfield(), returnedRecord.getFloatfield());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyInsert() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -86,13 +70,13 @@
PkonlyKey returnedRecord = (PkonlyKey) answer.get(0);
assertEquals(key.getId(), returnedRecord.getId());
assertEquals(key.getSeqNum(), returnedRecord.getSeqNum());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsInsert() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -135,13 +119,13 @@
.getTimefield()));
assertEquals(record.getTimestampfield(), returnedRecord
.getTimestampfield());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsInsert() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -160,13 +144,13 @@
.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord
.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsInsert() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -188,13 +172,13 @@
assertEquals(record.getLastname(), returnedRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsInsert() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -216,13 +200,13 @@
.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord
.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableInsert() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -267,9 +251,8 @@
.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord
.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
-
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByExampleTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByExampleTests.java Mon Jul 21 18:46:34 2008
@@ -1,24 +1,12 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.AwfulTableExample;
import ibatortest.java2.generated.conditional.java2.model.Fieldsblobs;
@@ -35,17 +23,13 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
-public class SelectByExampleTests extends BaseTest {
+import java.util.ArrayList;
+import java.util.List;
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class SelectByExampleTests extends BaseConditionalJava2Test {
public void testFieldsOnlySelectByExample() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -75,13 +59,13 @@
example = new FieldsonlyExample();
answer = dao.selectByExample(example);
assertEquals(3, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsOnlySelectByExampleNoCriteria() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -107,13 +91,13 @@
List answer = dao.selectByExample(example);
assertEquals(3, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlySelectByExample() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -135,13 +119,13 @@
example.createCriteria().andIdGreaterThan(new Integer(4));
List answer = dao.selectByExample(example);
assertEquals(2, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlySelectByExampleNoCriteria() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -163,13 +147,13 @@
example.createCriteria();
List answer = dao.selectByExample(example);
assertEquals(3, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleLike() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -228,13 +212,13 @@
returnedRecord = (Pkfields) answer.get(2);
assertEquals(2, returnedRecord.getId1().intValue());
assertEquals(3, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleNotLike() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -293,13 +277,13 @@
returnedRecord = (Pkfields) answer.get(2);
assertEquals(1, returnedRecord.getId1().intValue());
assertEquals(3, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleComplexLike() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -358,13 +342,13 @@
returnedRecord = (Pkfields) answer.get(1);
assertEquals(2, returnedRecord.getId1().intValue());
assertEquals(3, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleIn() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -431,13 +415,13 @@
returnedRecord = (Pkfields) answer.get(3);
assertEquals(2, returnedRecord.getId1().intValue());
assertEquals(3, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleBetween() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -489,13 +473,13 @@
example.setOrderByClause("ID1, ID2");
List answer = dao.selectByExample(example);
assertEquals(6, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleNoCriteria() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -546,13 +530,13 @@
example.setOrderByClause("ID1, ID2");
List answer = dao.selectByExample(example);
assertEquals(6, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsSelectByExampleEscapedFields() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -614,13 +598,13 @@
example.setOrderByClause("ID1, ID2");
List answer = dao.selectByExample(example);
assertEquals(2, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsSelectByExampleWithoutBlobs() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -645,13 +629,13 @@
assertEquals(6, key.getId().intValue());
assertNull(key.getBlob1());
assertNull(key.getBlob2());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -671,13 +655,13 @@
List answer = dao.selectByExampleWithoutBLOBs(example);
assertEquals(2, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsSelectByExampleWithBlobs() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -702,13 +686,13 @@
assertEquals(record.getId(), newRecord.getId());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -738,13 +722,13 @@
assertEquals(record.getFirstname(), newRecord.getFirstname());
assertEquals(record.getLastname(), newRecord.getLastname());
assertNull(newRecord.getBlob1());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsSelectByExampleWithBlobs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -774,13 +758,13 @@
assertEquals(record.getFirstname(), newRecord.getFirstname());
assertEquals(record.getLastname(), newRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -803,13 +787,13 @@
example.createCriteria();
List answer = dao.selectByExampleWithBLOBs(example);
assertEquals(2, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsSelectByExampleWithoutBlobs() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -835,13 +819,13 @@
assertFalse(newRecord instanceof FieldsblobsWithBLOBs);
assertEquals(record.getFirstname(), newRecord.getFirstname());
assertEquals(record.getLastname(), newRecord.getLastname());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsSelectByExampleWithBlobs() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -869,13 +853,13 @@
assertEquals(record.getLastname(), newRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -896,13 +880,13 @@
example.createCriteria();
List answer = dao.selectByExampleWithBLOBs(example);
assertEquals(2, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleLike() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1015,13 +999,13 @@
returnedRecord = (AwfulTable) answer.get(2);
assertEquals(111111, returnedRecord.getId1().intValue());
assertEquals(222222, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleNotLike() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1134,13 +1118,13 @@
returnedRecord = (AwfulTable) answer.get(2);
assertEquals(111, returnedRecord.getId1().intValue());
assertEquals(222, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleComplexLike() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1251,13 +1235,13 @@
returnedRecord = (AwfulTable) answer.get(1);
assertEquals(111111, returnedRecord.getId1().intValue());
assertEquals(222222, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleIn() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1372,13 +1356,13 @@
returnedRecord = (AwfulTable) answer.get(1);
assertEquals(11, returnedRecord.getId1().intValue());
assertEquals(22, returnedRecord.getId2().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleBetween() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1481,13 +1465,13 @@
example.createCriteria().andId1Between(new Integer(1), new Integer(1000));
List answer = dao.selectByExample(example);
assertEquals(3, answer.size());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByExampleNoCriteria() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -1604,7 +1588,7 @@
assertEquals(11, returnedRecord.getId1().intValue());
returnedRecord = (AwfulTable) answer.get(5);
assertEquals(1, returnedRecord.getId1().intValue());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByPrimaryKeyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByPrimaryKeyTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByPrimaryKeyTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SelectByPrimaryKeyTests.java Mon Jul 21 18:46:34 2008
@@ -1,17 +1,9 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.Pkblobs;
import ibatortest.java2.generated.conditional.java2.model.Pkfields;
@@ -20,17 +12,12 @@
import ibatortest.java2.generated.conditional.java2.model.PkfieldsblobsExample;
import ibatortest.java2.generated.conditional.java2.model.PkfieldsblobsKey;
-public class SelectByPrimaryKeyTests extends BaseTest {
+import java.util.List;
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class SelectByPrimaryKeyTests extends BaseConditionalJava2Test {
public void testPKFieldsSelectByPrimaryKey() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -57,13 +44,13 @@
assertEquals(record.getLastname(), newRecord.getLastname());
assertEquals(record.getId1(), newRecord.getId1());
assertEquals(record.getId2(), newRecord.getId2());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsSelectByPrimaryKey() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -83,13 +70,13 @@
assertEquals(record.getId(), newRecord.getId());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsSelectByPrimaryKey() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -121,13 +108,13 @@
assertEquals(record.getFirstname(), newRecord.getFirstname());
assertEquals(record.getLastname(), newRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableSelectByPrimaryKey() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -187,9 +174,8 @@
.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord
.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
-
}
Added: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SpringBeans.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SpringBeans.xml?rev=678614&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SpringBeans.xml (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SpringBeans.xml Mon Jul 21 18:46:34 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean id="dataSource" class="com.ibatis.common.jdbc.SimpleDataSource">
+ <constructor-arg>
+ <map>
+ <entry key="JDBC.Driver"><value>org.hsqldb.jdbcDriver</value></entry>
+ <entry key="JDBC.ConnectionURL"><value>jdbc:hsqldb:mem:aname</value></entry>
+ <entry key="JDBC.Username"><value>sa</value></entry>
+ <entry key="JDBC.Password"><value></value></entry>
+ <entry key="JDBC.DefaultAutoCommit"><value>true</value></entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
+ <property name="configLocation" value="classpath:/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml"/>
+ <property name="dataSource" ref="dataSource"/>
+ </bean>
+
+ <bean id="FieldsonlyDAO" class="ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="PkonlyDAO" class="ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="PkfieldsDAO" class="ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="PkblobsDAO" class="ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="PkfieldsblobsDAO" class="ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="FieldsblobsDAO" class="ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+ <bean id="AwfulTableDAO" class="ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl">
+ <property name="sqlMapClient" ref="sqlMapClient" />
+ </bean>
+
+</beans>
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml Mon Jul 21 18:46:34 2008
@@ -7,16 +7,6 @@
<settings useStatementNamespaces="true" />
- <transactionManager type="JDBC">
- <dataSource type="SIMPLE">
- <property name="JDBC.Driver" value="org.hsqldb.jdbcDriver"/>
- <property name="JDBC.ConnectionURL" value="jdbc:hsqldb:mem:aname"/>
- <property name="JDBC.Username" value="sa"/>
- <property name="JDBC.Password" value=""/>
- <property name="JDBC.DefaultAutoCommit" value="true"/>
- </dataSource>
- </transactionManager>
-
<sqlMap resource="ibatortest/java2/generated/conditional/java2/xml/FIELDSBLOBS_SqlMap.xml" />
<sqlMap resource="ibatortest/java2/generated/conditional/java2/xml/FIELDSONLY_SqlMap.xml" />
<sqlMap resource="ibatortest/java2/generated/conditional/java2/xml/PKBLOBS_SqlMap.xml" />
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByExampleTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByExampleTests.java Mon Jul 21 18:46:34 2008
@@ -16,24 +16,13 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.FieldsonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkonlyDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.AwfulTableExample;
import ibatortest.java2.generated.conditional.java2.model.Fieldsblobs;
@@ -50,22 +39,17 @@
import ibatortest.java2.generated.conditional.java2.model.PkonlyExample;
import ibatortest.java2.generated.conditional.java2.model.PkonlyKey;
+import java.util.List;
+
/**
*
* @author Jeff Butler
*
*/
-public class UpdateByExampleTests extends BaseTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class UpdateByExampleTests extends BaseConditionalJava2Test {
public void testFieldsOnlyUpdateByExampleSelective() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -120,13 +104,13 @@
assertEquals(record.getDoublefield(), new Double(99));
assertEquals(record.getFloatfield(), new Double(100.111));
assertEquals(record.getIntegerfield(), new Integer(9));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsOnlyUpdateByExample() {
- FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+ FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -163,13 +147,13 @@
assertNull(record.getDoublefield());
assertNull(record.getFloatfield());
assertEquals(record.getIntegerfield(), new Integer(22));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyUpdateByExampleSelective() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -209,13 +193,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyUpdateByExample() {
- PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+ PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -249,13 +233,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsUpdateByExampleSelective() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -289,13 +273,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsUpdateByExample() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -334,13 +318,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsUpdateByExampleSelective() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -371,13 +355,13 @@
assertEquals(new Integer(6), returnedRecord.getId());
assertTrue(blobsAreEqual(newRecord.getBlob1(), returnedRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsUpdateByExampleWithoutBLOBs() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -408,13 +392,13 @@
assertEquals(new Integer(8), returnedRecord.getId());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsUpdateByExampleWithBLOBs() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -445,13 +429,13 @@
assertEquals(new Integer(8), returnedRecord.getId());
assertNull(returnedRecord.getBlob1());
assertNull(returnedRecord.getBlob2());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByExampleSelective() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -488,13 +472,13 @@
assertEquals(record.getLastname(), returnedRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -533,13 +517,13 @@
assertNull(returnedRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -578,13 +562,13 @@
assertNull(returnedRecord.getLastname());
assertNull(returnedRecord.getBlob1());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsUpdateByExampleSelective() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -617,13 +601,13 @@
assertEquals(newRecord.getLastname(), returnedRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -657,13 +641,13 @@
assertEquals(newRecord.getLastname(), returnedRecord.getLastname());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsBlobsUpdateByExampleWithBLOBs() {
- FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+ FieldsblobsDAO dao = getFieldsblobsDAO();
try {
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -697,13 +681,13 @@
assertEquals(newRecord.getLastname(), returnedRecord.getLastname());
assertNull(returnedRecord.getBlob1());
assertNull(returnedRecord.getBlob2());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableUpdateByExampleSelective() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -767,13 +751,13 @@
assertEquals(record.getSecondFirstName(), returnedRecord.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableUpdateByExample() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -844,7 +828,7 @@
assertNull(returnedRecord.getSecondCustomerId());
assertNull(returnedRecord.getSecondFirstName());
assertNull(returnedRecord.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
Modified: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByPrimaryKeyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByPrimaryKeyTests.java?rev=678614&r1=678613&r2=678614&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByPrimaryKeyTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/UpdateByPrimaryKeyTests.java Mon Jul 21 18:46:34 2008
@@ -1,16 +1,9 @@
package ibatortest.java2.execute.conditional.java2;
-import java.sql.SQLException;
-
-import ibatortest.java2.BaseTest;
import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAO;
-import ibatortest.java2.generated.conditional.java2.dao.AwfulTableDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsDAOImpl;
import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAO;
-import ibatortest.java2.generated.conditional.java2.dao.PkfieldsblobsDAOImpl;
import ibatortest.java2.generated.conditional.java2.model.AwfulTable;
import ibatortest.java2.generated.conditional.java2.model.Pkblobs;
import ibatortest.java2.generated.conditional.java2.model.Pkfields;
@@ -18,17 +11,10 @@
import ibatortest.java2.generated.conditional.java2.model.Pkfieldsblobs;
import ibatortest.java2.generated.conditional.java2.model.PkfieldsblobsKey;
-public class UpdateByPrimaryKeyTests extends BaseTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- initSqlMapClient(
- "ibatortest/java2/execute/conditional/java2/SqlMapConfig.xml",
- null);
- }
+public class UpdateByPrimaryKeyTests extends BaseConditionalJava2Test {
public void testPKFieldsUpdateByPrimaryKey() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -55,13 +41,13 @@
assertEquals(record.getLastname(), record2.getLastname());
assertEquals(record.getId1(), record2.getId1());
assertEquals(record.getId2(), record2.getId2());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsUpdateByPrimaryKeySelective() {
- PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+ PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -107,13 +93,13 @@
.getTimefield()));
assertEquals(record.getTimestampfield(), returnedRecord
.getTimestampfield());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -134,13 +120,13 @@
assertEquals(record.getId(), newRecord.getId());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKBlobsUpdateByPrimaryKeySelective() {
- PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+ PkblobsDAO dao = getPkblobsDAO();
try {
Pkblobs record = new Pkblobs();
@@ -161,13 +147,13 @@
.getBlob1()));
assertTrue(blobsAreEqual(newRecord.getBlob2(), returnedRecord
.getBlob2()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -198,13 +184,13 @@
assertEquals(record.getId2(), newRecord.getId2());
assertTrue(blobsAreEqual(updateRecord.getBlob1(), newRecord
.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -233,13 +219,13 @@
assertEquals(record.getId1(), newRecord.getId1());
assertEquals(record.getId2(), newRecord.getId2());
assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
- PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+ PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
try {
Pkfieldsblobs record = new Pkfieldsblobs();
@@ -269,13 +255,13 @@
assertEquals(record.getId2(), returnedRecord.getId2());
assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
.getBlob1()));
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableUpdateByPrimaryKey() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -323,13 +309,13 @@
.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord
.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
public void testAwfulTableUpdateByPrimaryKeySelective() {
- AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+ AwfulTableDAO dao = getAwfulTableDAO();
try {
AwfulTable record = new AwfulTable();
@@ -379,9 +365,8 @@
.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord
.getThirdFirstName());
- } catch (SQLException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
-
}
Added: ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/BaseFlatJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/BaseFlatJava2Test.java?rev=678614&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/BaseFlatJava2Test.java (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/flat/java2/BaseFlatJava2Test.java Mon Jul 21 18:46:34 2008
@@ -0,0 +1,66 @@
+package ibatortest.java2.execute.flat.java2;
+
+import ibatortest.java2.BaseTest;
+import ibatortest.java2.generated.flat.java2.dao.AwfulTableDAO;
+import ibatortest.java2.generated.flat.java2.dao.AwfulTableDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.FieldsblobsDAO;
+import ibatortest.java2.generated.flat.java2.dao.FieldsblobsDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.FieldsonlyDAO;
+import ibatortest.java2.generated.flat.java2.dao.FieldsonlyDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.PkblobsDAO;
+import ibatortest.java2.generated.flat.java2.dao.PkblobsDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.PkfieldsDAO;
+import ibatortest.java2.generated.flat.java2.dao.PkfieldsDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.PkfieldsblobsDAO;
+import ibatortest.java2.generated.flat.java2.dao.PkfieldsblobsDAOImpl;
+import ibatortest.java2.generated.flat.java2.dao.PkonlyDAO;
+import ibatortest.java2.generated.flat.java2.dao.PkonlyDAOImpl;
+
+public class BaseFlatJava2Test extends BaseTest {
+ protected void setUp() throws Exception {
+ super.setUp();
+ initSqlMapClient("ibatortest/java2/execute/flat/java2/SqlMapConfig.xml", null);
+ }
+
+ protected FieldsonlyDAO getFieldsonlyDAO() {
+ FieldsonlyDAOImpl dao = new FieldsonlyDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected PkonlyDAO getPkonlyDAO() {
+ PkonlyDAOImpl dao = new PkonlyDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected PkfieldsDAO getPkfieldsDAO() {
+ PkfieldsDAOImpl dao = new PkfieldsDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected PkblobsDAO getPkblobsDAO() {
+ PkblobsDAOImpl dao = new PkblobsDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected PkfieldsblobsDAO getPkfieldsblobsDAO() {
+ PkfieldsblobsDAOImpl dao = new PkfieldsblobsDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected FieldsblobsDAO getFieldsblobsDAO() {
+ FieldsblobsDAOImpl dao = new FieldsblobsDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+
+ protected AwfulTableDAO getAwfulTableDAO() {
+ AwfulTableDAOImpl dao = new AwfulTableDAOImpl();
+ dao.setSqlMapClient(getSqlMapClient());
+ return dao;
+ }
+}