ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgbut...@apache.org
Subject svn commit: r678576 [2/4] - in /ibatis/trunk/java/tools/ibator/core: build/ devlib/ testJava5/ testJava5/ibatortest/ testJava5/ibatortest/execute/conditional/java2/ testJava5/ibatortest/execute/conditional/java5/ testJava5/ibatortest/execute/flat/java2...
Date Mon, 21 Jul 2008 21:30:07 GMT
Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/ConditionalJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/ConditionalJava5Tests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/ConditionalJava5Tests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/ConditionalJava5Tests.java Mon Jul 21 14:30:05 2008
@@ -16,27 +16,13 @@
 
 package ibatortest.execute.conditional.java5;
 
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.conditional.java5.dao.AwfulTableDAO;
-import ibatortest.generated.conditional.java5.dao.AwfulTableDAOImpl;
 import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO;
-import ibatortest.generated.conditional.java5.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO;
-import ibatortest.generated.conditional.java5.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkblobsDAO;
-import ibatortest.generated.conditional.java5.dao.PkblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkfieldsDAO;
-import ibatortest.generated.conditional.java5.dao.PkfieldsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAO;
-import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkonlyDAO;
-import ibatortest.generated.conditional.java5.dao.PkonlyDAOImpl;
 import ibatortest.generated.conditional.java5.model.AwfulTable;
 import ibatortest.generated.conditional.java5.model.AwfulTableExample;
 import ibatortest.generated.conditional.java5.model.Fieldsblobs;
@@ -55,20 +41,20 @@
 import ibatortest.generated.conditional.java5.model.PkonlyExample;
 import ibatortest.generated.conditional.java5.model.PkonlyKey;
 
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Jeff Butler
  * 
  */
-public class ConditionalJava5Tests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient(
-                "ibatortest/execute/conditional/java5/SqlMapConfig.xml", null);
-    }
+public class ConditionalJava5Tests extends BaseConditionalJava5Test {
 
     public void testFieldsOnlyInsert() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -95,7 +81,7 @@
     }
 
     public void testFieldsOnlySelectByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -131,7 +117,7 @@
     }
 
     public void testFieldsOnlySelectByExampleNoCriteria() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -163,7 +149,7 @@
     }
 
     public void testFieldsOnlyDeleteByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -199,7 +185,7 @@
     }
 
     public void testFieldsOnlyCountByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -234,7 +220,7 @@
     }
 
     public void testPKOnlyInsert() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -255,7 +241,7 @@
     }
 
     public void testPKOnlyDeleteByPrimaryKey() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -286,7 +272,7 @@
     }
 
     public void testPKOnlyDeleteByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -318,7 +304,7 @@
     }
 
     public void testPKOnlySelectByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -346,7 +332,7 @@
     }
 
     public void testPKOnlySelectByExampleNoCriteria() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -374,7 +360,7 @@
     }
 
     public void testPKOnlyCountByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -406,7 +392,7 @@
     }
 
     public void testPKFieldsInsert() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -455,7 +441,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -488,7 +474,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKeySelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -540,7 +526,7 @@
     }
 
     public void testPKfieldsDeleteByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -567,7 +553,7 @@
     }
 
     public void testPKFieldsDeleteByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -603,7 +589,7 @@
     }
 
     public void testPKFieldsSelectByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -636,7 +622,7 @@
     }
 
     public void testPKFieldsSelectByExampleLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -701,7 +687,7 @@
     }
 
     public void testPKFieldsSelectByExampleNotLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -766,7 +752,7 @@
     }
 
     public void testPKFieldsSelectByExampleComplexLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -830,7 +816,7 @@
     }
 
     public void testPKFieldsSelectByExampleIn() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -903,7 +889,7 @@
     }
 
     public void testPKFieldsSelectByExampleBetween() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -960,7 +946,7 @@
     }
 
     public void testPKFieldsSelectByExampleNoCriteria() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1017,7 +1003,7 @@
     }
 
     public void testPKFieldsSelectByExampleEscapedFields() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1085,7 +1071,7 @@
     }
 
     public void testPKFieldsCountByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1116,7 +1102,7 @@
     }
 
     public void testPKBlobsInsert() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1141,7 +1127,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1169,7 +1155,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeySelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1196,7 +1182,7 @@
     }
 
     public void testPKBlobsDeleteByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1221,7 +1207,7 @@
     }
 
     public void testPKBlobsDeleteByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1254,7 +1240,7 @@
     }
 
     public void testPKBlobsSelectByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1280,7 +1266,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1311,7 +1297,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1337,7 +1323,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1368,7 +1354,7 @@
     }
 
     public void testPKBlobsCountByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1397,7 +1383,7 @@
     }
 
     public void testPKFieldsBlobsInsert() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1425,7 +1411,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1462,7 +1448,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1497,7 +1483,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1533,7 +1519,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1572,7 +1558,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1610,7 +1596,7 @@
     }
 
     public void testPKFieldsBlobsSelectByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1649,7 +1635,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1686,7 +1672,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1722,7 +1708,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1751,7 +1737,7 @@
     }
 
     public void testPKFieldsBlobsCountByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1784,7 +1770,7 @@
     }
 
     public void testFieldsBlobsInsert() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1812,7 +1798,7 @@
     }
 
     public void testFieldsBlobsDeleteByExample() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1847,7 +1833,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithoutBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1879,7 +1865,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1913,7 +1899,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1940,7 +1926,7 @@
     }
 
     public void testFieldsBlobsCountByExample() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -1971,7 +1957,7 @@
     }
 
     public void testAwfulTableInsert() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2022,7 +2008,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2076,7 +2062,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKeySelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2132,7 +2118,7 @@
     }
 
     public void testAwfulTableDeleteByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2164,7 +2150,7 @@
     }
 
     public void testAwfulTableDeleteByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2219,7 +2205,7 @@
     }
 
     public void testAwfulTableSelectByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2285,7 +2271,7 @@
     }
 
     public void testAwfulTableSelectByExampleLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2404,7 +2390,7 @@
     }
 
     public void testAwfulTableSelectByExampleNotLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2523,7 +2509,7 @@
     }
     
     public void testAwfulTableSelectByExampleComplexLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2640,7 +2626,7 @@
     }
 
     public void testAwfulTableSelectByExampleIn() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2761,7 +2747,7 @@
     }
 
     public void testAwfulTableSelectByExampleBetween() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2870,7 +2856,7 @@
     }
 
     public void testAwfulTableSelectByExampleNoCriteria() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2993,7 +2979,7 @@
     }
 
     public void testAwfulTableCountByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java Mon Jul 21 14:30:05 2008
@@ -16,24 +16,13 @@
 
 package ibatortest.execute.conditional.java5;
 
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.conditional.java5.dao.AwfulTableDAO;
-import ibatortest.generated.conditional.java5.dao.AwfulTableDAOImpl;
 import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO;
-import ibatortest.generated.conditional.java5.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO;
-import ibatortest.generated.conditional.java5.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkblobsDAO;
-import ibatortest.generated.conditional.java5.dao.PkblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkfieldsDAO;
-import ibatortest.generated.conditional.java5.dao.PkfieldsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAO;
-import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.conditional.java5.dao.PkonlyDAO;
-import ibatortest.generated.conditional.java5.dao.PkonlyDAOImpl;
 import ibatortest.generated.conditional.java5.model.AwfulTable;
 import ibatortest.generated.conditional.java5.model.AwfulTableExample;
 import ibatortest.generated.conditional.java5.model.Fieldsblobs;
@@ -50,22 +39,18 @@
 import ibatortest.generated.conditional.java5.model.PkonlyExample;
 import ibatortest.generated.conditional.java5.model.PkonlyKey;
 
+import java.sql.SQLException;
+import java.util.List;
+
 /**
  * 
  * @author Jeff Butler
  *
  */
-public class UpdateByExampleTests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient(
-                "ibatortest/execute/conditional/java5/SqlMapConfig.xml",
-                null);
-    }
+public class UpdateByExampleTests extends BaseConditionalJava5Test {
 
     public void testFieldsOnlyUpdateByExampleSelective() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -126,7 +111,7 @@
     }
 
     public void testFieldsOnlyUpdateByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -169,7 +154,7 @@
     }
 
     public void testPKOnlyUpdateByExampleSelective() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -215,7 +200,7 @@
     }
 
     public void testPKOnlyUpdateByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             PkonlyKey key = new PkonlyKey();
@@ -255,7 +240,7 @@
     }
 
     public void testPKFieldsUpdateByExampleSelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -295,7 +280,7 @@
     }
 
     public void testPKFieldsUpdateByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -340,7 +325,7 @@
     }
 
     public void testPKBlobsUpdateByExampleSelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -377,7 +362,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithoutBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -414,7 +399,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -451,7 +436,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleSelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -494,7 +479,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -539,7 +524,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -584,7 +569,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleSelective() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -623,7 +608,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -663,7 +648,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
@@ -703,7 +688,7 @@
     }
 
     public void testAwfulTableUpdateByExampleSelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();
@@ -773,7 +758,7 @@
     }
 
     public void testAwfulTableUpdateByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();

Added: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/BaseFlatJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/BaseFlatJava2Test.java?rev=678576&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/BaseFlatJava2Test.java (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/BaseFlatJava2Test.java Mon Jul 21 14:30:05 2008
@@ -0,0 +1,66 @@
+package ibatortest.execute.flat.java2;
+
+import ibatortest.BaseTest;
+import ibatortest.generated.flat.java2.dao.AwfulTableDAO;
+import ibatortest.generated.flat.java2.dao.AwfulTableDAOImpl;
+import ibatortest.generated.flat.java2.dao.FieldsblobsDAO;
+import ibatortest.generated.flat.java2.dao.FieldsblobsDAOImpl;
+import ibatortest.generated.flat.java2.dao.FieldsonlyDAO;
+import ibatortest.generated.flat.java2.dao.FieldsonlyDAOImpl;
+import ibatortest.generated.flat.java2.dao.PkblobsDAO;
+import ibatortest.generated.flat.java2.dao.PkblobsDAOImpl;
+import ibatortest.generated.flat.java2.dao.PkfieldsDAO;
+import ibatortest.generated.flat.java2.dao.PkfieldsDAOImpl;
+import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAO;
+import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAOImpl;
+import ibatortest.generated.flat.java2.dao.PkonlyDAO;
+import ibatortest.generated.flat.java2.dao.PkonlyDAOImpl;
+
+public class BaseFlatJava2Test extends BaseTest {
+    protected void setUp() throws Exception {
+        super.setUp();
+        initSqlMapClient("ibatortest/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;
+    }
+}

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java Mon Jul 21 14:30:05 2008
@@ -16,27 +16,13 @@
 
 package ibatortest.execute.flat.java2;
 
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.flat.java2.dao.AwfulTableDAO;
-import ibatortest.generated.flat.java2.dao.AwfulTableDAOImpl;
 import ibatortest.generated.flat.java2.dao.FieldsblobsDAO;
-import ibatortest.generated.flat.java2.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.FieldsonlyDAO;
-import ibatortest.generated.flat.java2.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkblobsDAO;
-import ibatortest.generated.flat.java2.dao.PkblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkfieldsDAO;
-import ibatortest.generated.flat.java2.dao.PkfieldsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAO;
-import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkonlyDAO;
-import ibatortest.generated.flat.java2.dao.PkonlyDAOImpl;
 import ibatortest.generated.flat.java2.model.AwfulTable;
 import ibatortest.generated.flat.java2.model.AwfulTableExample;
 import ibatortest.generated.flat.java2.model.Fieldsblobs;
@@ -52,19 +38,20 @@
 import ibatortest.generated.flat.java2.model.Pkonly;
 import ibatortest.generated.flat.java2.model.PkonlyExample;
 
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Jeff Butler
  * 
  */
-public class FlatJava2Tests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient("ibatortest/execute/flat/java2/SqlMapConfig.xml", null);
-    }
+public class FlatJava2Tests extends BaseFlatJava2Test {
 
     public void testFieldsOnlyInsert() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -91,7 +78,7 @@
     }
 
     public void testFieldsOnlySelectByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -127,7 +114,7 @@
     }
 
     public void testFieldsOnlySelectByExampleNoCriteria() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -159,7 +146,7 @@
     }
 
     public void testFieldsOnlyDeleteByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -195,7 +182,7 @@
     }
 
     public void testFieldsOnlyCountByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -231,7 +218,7 @@
     }
 
     public void testPKOnlyInsert() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -252,7 +239,7 @@
     }
 
     public void testPKOnlyDeleteByPrimaryKey() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -280,7 +267,7 @@
     }
 
     public void testPKOnlyDeleteByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -312,7 +299,7 @@
     }
 
     public void testPKOnlySelectByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -340,7 +327,7 @@
     }
 
     public void testPKOnlySelectByExampleNoCriteria() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -368,7 +355,7 @@
     }
 
     public void testPKOnlyCountByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -400,7 +387,7 @@
     }
 
     public void testPKFieldsInsert() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -445,7 +432,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -474,7 +461,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKeySelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -522,7 +509,7 @@
     }
 
     public void testPKfieldsDeleteByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -545,7 +532,7 @@
     }
 
     public void testPKFieldsDeleteByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -581,7 +568,7 @@
     }
 
     public void testPKFieldsSelectByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -611,7 +598,7 @@
     }
 
     public void testPKFieldsSelectByExampleLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -676,7 +663,7 @@
     }
 
     public void testPKFieldsSelectByExampleNotLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -741,7 +728,7 @@
     }
 
     public void testPKFieldsSelectByExampleComplexLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -805,7 +792,7 @@
     }
 
     public void testPKFieldsSelectByExampleIn() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -878,7 +865,7 @@
     }
 
     public void testPKFieldsSelectByExampleBetween() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -935,7 +922,7 @@
     }
 
     public void testPKFieldsSelectByExampleNoCriteria() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -992,7 +979,7 @@
     }
 
     public void testPKFieldsSelectByExampleEscapedFields() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1060,7 +1047,7 @@
     }
 
     public void testPKFieldsCountByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1092,7 +1079,7 @@
     }
 
     public void testPKBlobsInsert() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1117,7 +1104,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1145,7 +1132,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeySelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1172,7 +1159,7 @@
     }
 
     public void testPKBlobsDeleteByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1197,7 +1184,7 @@
     }
 
     public void testPKBlobsDeleteByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1230,7 +1217,7 @@
     }
 
     public void testPKBlobsSelectByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1256,7 +1243,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1287,7 +1274,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1313,7 +1300,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1344,7 +1331,7 @@
     }
 
     public void testPKBlobsCountByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1373,7 +1360,7 @@
     }
 
     public void testPKFieldsBlobsInsert() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1401,7 +1388,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1435,7 +1422,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1467,7 +1454,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1500,7 +1487,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1535,7 +1522,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1572,7 +1559,7 @@
     }
 
     public void testPKFieldsBlobsSelectByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1607,7 +1594,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1643,7 +1630,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1679,7 +1666,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1708,7 +1695,7 @@
     }
 
     public void testPKFieldsBlobsCountByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1741,7 +1728,7 @@
     }
 
     public void testFieldsBlobsInsert() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1768,7 +1755,7 @@
     }
 
     public void testFieldsBlobsDeleteByExample() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1803,7 +1790,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithoutBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1836,7 +1823,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1869,7 +1856,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1896,7 +1883,7 @@
     }
 
     public void testFieldsBlobsCountByExample() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1923,7 +1910,7 @@
     }
 
     public void testAwfulTableInsert() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -1974,7 +1961,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2028,7 +2015,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKeySelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2084,7 +2071,7 @@
     }
 
     public void testAwfulTableDeleteByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2116,7 +2103,7 @@
     }
 
     public void testAwfulTableDeleteByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2171,7 +2158,7 @@
     }
 
     public void testAwfulTableSelectByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2237,7 +2224,7 @@
     }
 
     public void testAwfulTableSelectByExampleLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2356,7 +2343,7 @@
     }
 
     public void testAwfulTableSelectByExampleNotLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2475,7 +2462,7 @@
     }
     
     public void testAwfulTableSelectByExampleComplexLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2592,7 +2579,7 @@
     }
 
     public void testAwfulTableSelectByExampleIn() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2713,7 +2700,7 @@
     }
 
     public void testAwfulTableSelectByExampleBetween() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2822,7 +2809,7 @@
     }
 
     public void testAwfulTableSelectByExampleNoCriteria() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2945,7 +2932,7 @@
     }
 
     public void testAwfulTableCountByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/UpdateByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/UpdateByExampleTests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/UpdateByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/UpdateByExampleTests.java Mon Jul 21 14:30:05 2008
@@ -16,24 +16,13 @@
 
 package ibatortest.execute.flat.java2;
 
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.flat.java2.dao.AwfulTableDAO;
-import ibatortest.generated.flat.java2.dao.AwfulTableDAOImpl;
 import ibatortest.generated.flat.java2.dao.FieldsblobsDAO;
-import ibatortest.generated.flat.java2.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.FieldsonlyDAO;
-import ibatortest.generated.flat.java2.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkblobsDAO;
-import ibatortest.generated.flat.java2.dao.PkblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkfieldsDAO;
-import ibatortest.generated.flat.java2.dao.PkfieldsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAO;
-import ibatortest.generated.flat.java2.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.flat.java2.dao.PkonlyDAO;
-import ibatortest.generated.flat.java2.dao.PkonlyDAOImpl;
 import ibatortest.generated.flat.java2.model.AwfulTable;
 import ibatortest.generated.flat.java2.model.AwfulTableExample;
 import ibatortest.generated.flat.java2.model.Fieldsblobs;
@@ -49,22 +38,18 @@
 import ibatortest.generated.flat.java2.model.Pkonly;
 import ibatortest.generated.flat.java2.model.PkonlyExample;
 
+import java.sql.SQLException;
+import java.util.List;
+
 /**
  * 
  * @author Jeff Butler
  *
  */
-public class UpdateByExampleTests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient(
-                "ibatortest/execute/flat/java2/SqlMapConfig.xml",
-                null);
-    }
+public class UpdateByExampleTests extends BaseFlatJava2Test {
 
     public void testFieldsOnlyUpdateByExampleSelective() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -125,7 +110,7 @@
     }
 
     public void testFieldsOnlyUpdateByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -168,7 +153,7 @@
     }
 
     public void testPKOnlyUpdateByExampleSelective() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -214,7 +199,7 @@
     }
 
     public void testPKOnlyUpdateByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -254,7 +239,7 @@
     }
 
     public void testPKFieldsUpdateByExampleSelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -294,7 +279,7 @@
     }
 
     public void testPKFieldsUpdateByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -339,7 +324,7 @@
     }
 
     public void testPKBlobsUpdateByExampleSelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -376,7 +361,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithoutBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -413,7 +398,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -450,7 +435,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleSelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -493,7 +478,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -538,7 +523,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -583,7 +568,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleSelective() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -622,7 +607,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -662,7 +647,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -702,7 +687,7 @@
     }
 
     public void testAwfulTableUpdateByExampleSelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();
@@ -772,7 +757,7 @@
     }
 
     public void testAwfulTableUpdateByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();

Added: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/BaseFlatJava5Test.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/BaseFlatJava5Test.java?rev=678576&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/BaseFlatJava5Test.java (added)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/BaseFlatJava5Test.java Mon Jul 21 14:30:05 2008
@@ -0,0 +1,60 @@
+package ibatortest.execute.flat.java5;
+
+import ibatortest.BaseTest;
+import ibatortest.generated.flat.java5.dao.AwfulTableDAO;
+import ibatortest.generated.flat.java5.dao.AwfulTableDAOImpl;
+import ibatortest.generated.flat.java5.dao.FieldsblobsDAO;
+import ibatortest.generated.flat.java5.dao.FieldsblobsDAOImpl;
+import ibatortest.generated.flat.java5.dao.FieldsonlyDAO;
+import ibatortest.generated.flat.java5.dao.FieldsonlyDAOImpl;
+import ibatortest.generated.flat.java5.dao.PkblobsDAO;
+import ibatortest.generated.flat.java5.dao.PkblobsDAOImpl;
+import ibatortest.generated.flat.java5.dao.PkfieldsDAO;
+import ibatortest.generated.flat.java5.dao.PkfieldsDAOImpl;
+import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAO;
+import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAOImpl;
+import ibatortest.generated.flat.java5.dao.PkonlyDAO;
+import ibatortest.generated.flat.java5.dao.PkonlyDAOImpl;
+
+public class BaseFlatJava5Test extends BaseTest {
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        initSqlMapClient("ibatortest/execute/flat/java5/SqlMapConfig.xml", null);
+    }
+
+    protected FieldsonlyDAO getFieldsonlyDAO() {
+        FieldsonlyDAOImpl dao = new FieldsonlyDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected PkonlyDAO getPkonlyDAO() {
+        PkonlyDAOImpl dao = new PkonlyDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected PkfieldsDAO getPkfieldsDAO() {
+        PkfieldsDAOImpl dao = new PkfieldsDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected PkblobsDAO getPkblobsDAO() {
+        PkblobsDAOImpl dao = new PkblobsDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected PkfieldsblobsDAO getPkfieldsblobsDAO() {
+        PkfieldsblobsDAOImpl dao = new PkfieldsblobsDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected FieldsblobsDAO getFieldsblobsDAO() {
+        FieldsblobsDAOImpl dao = new FieldsblobsDAOImpl(getSqlMapClient());
+        return dao;
+    }
+
+    protected AwfulTableDAO getAwfulTableDAO() {
+        AwfulTableDAOImpl dao = new AwfulTableDAOImpl(getSqlMapClient());
+        return dao;
+    }
+}

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java Mon Jul 21 14:30:05 2008
@@ -16,27 +16,13 @@
 
 package ibatortest.execute.flat.java5;
 
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.flat.java5.dao.AwfulTableDAO;
-import ibatortest.generated.flat.java5.dao.AwfulTableDAOImpl;
 import ibatortest.generated.flat.java5.dao.FieldsblobsDAO;
-import ibatortest.generated.flat.java5.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.FieldsonlyDAO;
-import ibatortest.generated.flat.java5.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkblobsDAO;
-import ibatortest.generated.flat.java5.dao.PkblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkfieldsDAO;
-import ibatortest.generated.flat.java5.dao.PkfieldsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAO;
-import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkonlyDAO;
-import ibatortest.generated.flat.java5.dao.PkonlyDAOImpl;
 import ibatortest.generated.flat.java5.model.AwfulTable;
 import ibatortest.generated.flat.java5.model.AwfulTableExample;
 import ibatortest.generated.flat.java5.model.Fieldsblobs;
@@ -52,19 +38,20 @@
 import ibatortest.generated.flat.java5.model.Pkonly;
 import ibatortest.generated.flat.java5.model.PkonlyExample;
 
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Jeff Butler
  * 
  */
-public class FlatJava5Tests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient("ibatortest/execute/flat/java5/SqlMapConfig.xml", null);
-    }
+public class FlatJava5Tests extends BaseFlatJava5Test {
 
     public void testFieldsOnlyInsert() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -91,7 +78,7 @@
     }
 
     public void testFieldsOnlySelectByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -127,7 +114,7 @@
     }
 
     public void testFieldsOnlySelectByExampleNoCriteria() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -159,7 +146,7 @@
     }
 
     public void testFieldsOnlyDeleteByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -195,7 +182,7 @@
     }
 
     public void testFieldsOnlyCountByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -230,7 +217,7 @@
     }
 
     public void testPKOnlyInsert() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -251,7 +238,7 @@
     }
 
     public void testPKOnlyDeleteByPrimaryKey() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -279,7 +266,7 @@
     }
 
     public void testPKOnlyDeleteByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -311,7 +298,7 @@
     }
 
     public void testPKOnlySelectByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -339,7 +326,7 @@
     }
 
     public void testPKOnlySelectByExampleNoCriteria() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -367,7 +354,7 @@
     }
 
     public void testPKOnlyCountByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -399,7 +386,7 @@
     }
 
     public void testPKFieldsInsert() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -444,7 +431,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -473,7 +460,7 @@
     }
 
     public void testPKFieldsUpdateByPrimaryKeySelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -521,7 +508,7 @@
     }
 
     public void testPKfieldsDeleteByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -544,7 +531,7 @@
     }
 
     public void testPKFieldsDeleteByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -580,7 +567,7 @@
     }
 
     public void testPKFieldsSelectByPrimaryKey() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -610,7 +597,7 @@
     }
 
     public void testPKFieldsSelectByExampleLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -675,7 +662,7 @@
     }
 
     public void testPKFieldsSelectByExampleNotLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -740,7 +727,7 @@
     }
 
     public void testPKFieldsSelectByExampleComplexLike() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -804,7 +791,7 @@
     }
 
     public void testPKFieldsSelectByExampleIn() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -877,7 +864,7 @@
     }
 
     public void testPKFieldsSelectByExampleBetween() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -934,7 +921,7 @@
     }
 
     public void testPKFieldsSelectByExampleNoCriteria() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -991,7 +978,7 @@
     }
 
     public void testPKFieldsSelectByExampleEscapedFields() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1059,7 +1046,7 @@
     }
 
     public void testPKFieldsCountByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
 
         try {
             Pkfields record = new Pkfields();
@@ -1090,7 +1077,7 @@
     }
 
     public void testPKBlobsInsert() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1115,7 +1102,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1143,7 +1130,7 @@
     }
 
     public void testPKBlobsUpdateByPrimaryKeySelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1170,7 +1157,7 @@
     }
 
     public void testPKBlobsDeleteByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1195,7 +1182,7 @@
     }
 
     public void testPKBlobsDeleteByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1228,7 +1215,7 @@
     }
 
     public void testPKBlobsSelectByPrimaryKey() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1254,7 +1241,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1285,7 +1272,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1311,7 +1298,7 @@
     }
 
     public void testPKBlobsSelectByExampleWithBlobs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1342,7 +1329,7 @@
     }
 
     public void testPKBlobsCountByExample() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
 
         try {
             Pkblobs record = new Pkblobs();
@@ -1371,7 +1358,7 @@
     }
 
     public void testPKFieldsBlobsInsert() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1399,7 +1386,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1433,7 +1420,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1465,7 +1452,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1498,7 +1485,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1534,7 +1521,7 @@
     }
 
     public void testPKFieldsBlobsDeleteByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1572,7 +1559,7 @@
     }
 
     public void testPKFieldsBlobsSelectByPrimaryKey() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1608,7 +1595,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1645,7 +1632,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1681,7 +1668,7 @@
     }
 
     public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1710,7 +1697,7 @@
     }
 
     public void testFieldsBlobsInsert() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1737,7 +1724,7 @@
     }
 
     public void testFieldsBlobsDeleteByExample() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1772,7 +1759,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithoutBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1805,7 +1792,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1838,7 +1825,7 @@
     }
 
     public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
 
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -1865,7 +1852,7 @@
     }
 
     public void testPKFieldsBlobsCountByExample() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -1898,7 +1885,7 @@
     }
 
     public void testAwfulTableInsert() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -1949,7 +1936,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2003,7 +1990,7 @@
     }
 
     public void testAwfulTableUpdateByPrimaryKeySelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2059,7 +2046,7 @@
     }
 
     public void testAwfulTableDeleteByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2091,7 +2078,7 @@
     }
 
     public void testAwfulTableDeleteByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2146,7 +2133,7 @@
     }
 
     public void testAwfulTableSelectByPrimaryKey() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2212,7 +2199,7 @@
     }
 
     public void testAwfulTableSelectByExampleLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2331,7 +2318,7 @@
     }
 
     public void testAwfulTableSelectByExampleNotLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2450,7 +2437,7 @@
     }
     
     public void testAwfulTableSelectByExampleComplexLike() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2567,7 +2554,7 @@
     }
 
     public void testAwfulTableSelectByExampleIn() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2688,7 +2675,7 @@
     }
 
     public void testAwfulTableSelectByExampleBetween() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2797,7 +2784,7 @@
     }
 
     public void testAwfulTableSelectByExampleNoCriteria() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();
@@ -2920,7 +2907,7 @@
     }
 
     public void testAwfulTableCountByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
 
         try {
             AwfulTable record = new AwfulTable();

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/UpdateByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/UpdateByExampleTests.java?rev=678576&r1=678575&r2=678576&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/UpdateByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/UpdateByExampleTests.java Mon Jul 21 14:30:05 2008
@@ -16,24 +16,13 @@
 
 package ibatortest.execute.flat.java5;
 
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.BaseTest;
 import ibatortest.generated.flat.java5.dao.AwfulTableDAO;
-import ibatortest.generated.flat.java5.dao.AwfulTableDAOImpl;
 import ibatortest.generated.flat.java5.dao.FieldsblobsDAO;
-import ibatortest.generated.flat.java5.dao.FieldsblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.FieldsonlyDAO;
-import ibatortest.generated.flat.java5.dao.FieldsonlyDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkblobsDAO;
-import ibatortest.generated.flat.java5.dao.PkblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkfieldsDAO;
-import ibatortest.generated.flat.java5.dao.PkfieldsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAO;
-import ibatortest.generated.flat.java5.dao.PkfieldsblobsDAOImpl;
 import ibatortest.generated.flat.java5.dao.PkonlyDAO;
-import ibatortest.generated.flat.java5.dao.PkonlyDAOImpl;
 import ibatortest.generated.flat.java5.model.AwfulTable;
 import ibatortest.generated.flat.java5.model.AwfulTableExample;
 import ibatortest.generated.flat.java5.model.Fieldsblobs;
@@ -49,22 +38,18 @@
 import ibatortest.generated.flat.java5.model.Pkonly;
 import ibatortest.generated.flat.java5.model.PkonlyExample;
 
+import java.sql.SQLException;
+import java.util.List;
+
 /**
  * 
  * @author Jeff Butler
  *
  */
-public class UpdateByExampleTests extends BaseTest {
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        initSqlMapClient(
-                "ibatortest/execute/flat/java5/SqlMapConfig.xml",
-                null);
-    }
+public class UpdateByExampleTests extends BaseFlatJava5Test {
 
     public void testFieldsOnlyUpdateByExampleSelective() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -125,7 +110,7 @@
     }
 
     public void testFieldsOnlyUpdateByExample() {
-        FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+        FieldsonlyDAO dao = getFieldsonlyDAO();
 
         try {
             Fieldsonly record = new Fieldsonly();
@@ -168,7 +153,7 @@
     }
 
     public void testPKOnlyUpdateByExampleSelective() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -214,7 +199,7 @@
     }
 
     public void testPKOnlyUpdateByExample() {
-        PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+        PkonlyDAO dao = getPkonlyDAO();
 
         try {
             Pkonly key = new Pkonly();
@@ -254,7 +239,7 @@
     }
 
     public void testPKFieldsUpdateByExampleSelective() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -294,7 +279,7 @@
     }
 
     public void testPKFieldsUpdateByExample() {
-        PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+        PkfieldsDAO dao = getPkfieldsDAO();
     
         try {
             Pkfields record = new Pkfields();
@@ -339,7 +324,7 @@
     }
 
     public void testPKBlobsUpdateByExampleSelective() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -376,7 +361,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithoutBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -413,7 +398,7 @@
     }
 
     public void testPKBlobsUpdateByExampleWithBLOBs() {
-        PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+        PkblobsDAO dao = getPkblobsDAO();
     
         try {
             Pkblobs record = new Pkblobs();
@@ -450,7 +435,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleSelective() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -493,7 +478,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -538,7 +523,7 @@
     }
 
     public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
-        PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+        PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
@@ -583,7 +568,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleSelective() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -622,7 +607,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -662,7 +647,7 @@
     }
 
     public void testFieldsBlobsUpdateByExampleWithBLOBs() {
-        FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+        FieldsblobsDAO dao = getFieldsblobsDAO();
     
         try {
             Fieldsblobs record = new Fieldsblobs();
@@ -702,7 +687,7 @@
     }
 
     public void testAwfulTableUpdateByExampleSelective() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();
@@ -772,7 +757,7 @@
     }
 
     public void testAwfulTableUpdateByExample() {
-        AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+        AwfulTableDAO dao = getAwfulTableDAO();
     
         try {
             AwfulTable record = new AwfulTable();



Mime
View raw message