Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java?rev=678576&r1=678575&r2=678576&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java Mon Jul 21 14:30:05 2008 @@ -16,24 +16,13 @@ package ibatortest.execute.hierarchical.java5; -import java.sql.SQLException; -import java.util.List; - -import ibatortest.BaseTest; import ibatortest.generated.hierarchical.java5.dao.AwfulTableDAO; -import ibatortest.generated.hierarchical.java5.dao.AwfulTableDAOImpl; import ibatortest.generated.hierarchical.java5.dao.FieldsblobsDAO; -import ibatortest.generated.hierarchical.java5.dao.FieldsblobsDAOImpl; import ibatortest.generated.hierarchical.java5.dao.FieldsonlyDAO; -import ibatortest.generated.hierarchical.java5.dao.FieldsonlyDAOImpl; import ibatortest.generated.hierarchical.java5.dao.PkblobsDAO; -import ibatortest.generated.hierarchical.java5.dao.PkblobsDAOImpl; import ibatortest.generated.hierarchical.java5.dao.PkfieldsDAO; -import ibatortest.generated.hierarchical.java5.dao.PkfieldsDAOImpl; import ibatortest.generated.hierarchical.java5.dao.PkfieldsblobsDAO; -import ibatortest.generated.hierarchical.java5.dao.PkfieldsblobsDAOImpl; import ibatortest.generated.hierarchical.java5.dao.PkonlyDAO; -import ibatortest.generated.hierarchical.java5.dao.PkonlyDAOImpl; import ibatortest.generated.hierarchical.java5.model.AwfulTable; import ibatortest.generated.hierarchical.java5.model.AwfulTableExample; import ibatortest.generated.hierarchical.java5.model.Fieldsblobs; @@ -52,22 +41,17 @@ import ibatortest.generated.hierarchical.java5.model.PkonlyExample; import ibatortest.generated.hierarchical.java5.model.PkonlyKey; +import java.util.List; + /** * * @author Jeff Butler * */ -public class UpdateByExampleTests extends BaseTest { - - protected void setUp() throws Exception { - super.setUp(); - initSqlMapClient( - "ibatortest/execute/hierarchical/java5/SqlMapConfig.xml", - null); - } +public class UpdateByExampleTests extends BaseHierarchicalJava5Test { public void testFieldsOnlyUpdateByExampleSelective() { - FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient); + FieldsonlyDAO dao = getFieldsonlyDAO(); try { Fieldsonly record = new Fieldsonly(); @@ -122,13 +106,13 @@ assertEquals(record.getDoublefield(), 99d); assertEquals(record.getFloatfield(), 100.111); assertEquals(record.getIntegerfield().intValue(), 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(); @@ -165,13 +149,13 @@ assertNull(record.getDoublefield()); assertNull(record.getFloatfield()); assertEquals(record.getIntegerfield().intValue(), 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(); @@ -211,13 +195,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(); @@ -251,13 +235,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(); @@ -291,13 +275,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(); @@ -336,13 +320,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 { PkblobsWithBLOBs record = new PkblobsWithBLOBs(); @@ -373,13 +357,13 @@ assertEquals(6, returnedRecord.getId().intValue()); 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 { PkblobsWithBLOBs record = new PkblobsWithBLOBs(); @@ -410,13 +394,13 @@ assertEquals(8, returnedRecord.getId().intValue()); 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 { PkblobsWithBLOBs record = new PkblobsWithBLOBs(); @@ -447,13 +431,13 @@ assertEquals(8, returnedRecord.getId().intValue()); 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 { PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs(); @@ -490,13 +474,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 { PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs(); @@ -535,13 +519,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 { PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs(); @@ -580,13 +564,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(); @@ -619,13 +603,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(); @@ -659,13 +643,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(); @@ -699,13 +683,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(); @@ -769,13 +753,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(); @@ -846,7 +830,7 @@ assertNull(returnedRecord.getSecondCustomerId()); assertNull(returnedRecord.getSecondFirstName()); assertNull(returnedRecord.getThirdFirstName()); - } catch (SQLException e) { + } catch (Exception e) { fail(e.getMessage()); } }
Added: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java?rev=678576&view=auto ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java (added) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java Mon Jul 21 14:30:05 2008 @@ -0,0 +1,26 @@ +package ibatortest.execute.miscellaneous; + +import ibatortest.BaseTest; +import ibatortest.generated.miscellaneous.dao.MyObjectDAO; +import ibatortest.generated.miscellaneous.dao.MyObjectDAOImpl; +import ibatortest.generated.miscellaneous.dao.RegexrenameDAO; +import ibatortest.generated.miscellaneous.dao.RegexrenameDAOImpl; + +public class BaseMiscellaneousTest extends BaseTest { + + protected void setUp() throws Exception { + super.setUp(); + initSqlMapClient("ibatortest/execute/miscellaneous/SqlMapConfig.xml", + null); + } + + protected MyObjectDAO getMyObjectDAO() { + MyObjectDAOImpl dao = new MyObjectDAOImpl(getSqlMapClient()); + return dao; + } + + protected RegexrenameDAO getRegexrenameDAO() { + RegexrenameDAOImpl dao = new RegexrenameDAOImpl(getSqlMapClient()); + return dao; + } +} Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java?rev=678576&r1=678575&r2=678576&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java Mon Jul 21 14:30:05 2008 @@ -31,27 +31,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import ibatortest.BaseTest; import ibatortest.generated.miscellaneous.dao.MyObjectDAO; -import ibatortest.generated.miscellaneous.dao.MyObjectDAOImpl; import ibatortest.generated.miscellaneous.dao.RegexrenameDAO; -import ibatortest.generated.miscellaneous.dao.RegexrenameDAOImpl; import ibatortest.generated.miscellaneous.model.MyObject; import ibatortest.generated.miscellaneous.model.MyObjectExample; import ibatortest.generated.miscellaneous.model.MyObjectKey; import ibatortest.generated.miscellaneous.model.Regexrename; -import ibatortest.execute.miscellaneous.FirstName; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * @author Jeff Butler * */ -public class MiscellaneousTests extends BaseTest { +public class MiscellaneousTests extends BaseMiscellaneousTest { protected void setUp() throws Exception { super.setUp(); @@ -60,7 +56,7 @@ } public void testMyObjectinsertMyObject() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -112,7 +108,7 @@ } public void testMyObjectUpdateByPrimaryKey() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -149,7 +145,7 @@ } public void testMyObjectUpdateByPrimaryKeySelective() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -206,7 +202,7 @@ } public void testMyObjectDeleteByPrimaryKey() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -235,7 +231,7 @@ } public void testMyObjectDeleteByExample() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -275,7 +271,7 @@ } public void testMyObjectSelectByPrimaryKey() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -312,7 +308,7 @@ } public void testMyObjectSelectByExampleLike() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -391,7 +387,7 @@ } public void testMyObjectSelectByExampleNotLike() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -470,7 +466,7 @@ } public void testMyObjectSelectByExampleComplexLike() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -550,7 +546,7 @@ } public void testMyObjectSelectByExampleIn() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -642,7 +638,7 @@ } public void testMyObjectSelectByExampleBetween() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -711,7 +707,7 @@ } public void testMyObjectSelectByExampleTimeEquals() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -771,7 +767,7 @@ } public void testMyObjectUpdateByExampleSelective() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -818,7 +814,7 @@ } public void testMyObjectUpdateByExample() { - MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); + MyObjectDAO dao = getMyObjectDAO(); try { MyObject record = new MyObject(); @@ -867,7 +863,7 @@ } public void testRegexRenameInsert() { - RegexrenameDAO dao = new RegexrenameDAOImpl(sqlMapClient); + RegexrenameDAO dao = getRegexrenameDAO(); try { Regexrename record = new Regexrename(); Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml?rev=678576&r1=678575&r2=678576&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml Mon Jul 21 14:30:05 2008 @@ -69,7 +69,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.flat.java2.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-SI" targetPackage="ibatortest.generated.flat.java2.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -108,7 +108,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.hierarchical.java5.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="SPRING" targetPackage="ibatortest.generated.hierarchical.java5.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -189,7 +189,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.conditional.java5.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-SI" targetPackage="ibatortest.generated.conditional.java5.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -230,7 +230,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.conditional.java2.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="SPRING" targetPackage="ibatortest.generated.conditional.java2.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator>
