Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/miscellaneous/MiscellaneousTests.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/miscellaneous/MiscellaneousTests.java?view=diff&rev=503987&r1=503986&r2=503987 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/miscellaneous/MiscellaneousTests.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/miscellaneous/MiscellaneousTests.java Mon Feb 5 21:06:29 2007 @@ -16,656 +16,725 @@ package abatortest.java2.execute.miscellaneous; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; import java.util.List; import abatortest.java2.BaseTest; import abatortest.java2.generated.miscellaneous.dao.MyObjectDAO; +import abatortest.java2.generated.miscellaneous.dao.MyObjectDAOImpl; import abatortest.java2.generated.miscellaneous.model.MyObject; import abatortest.java2.generated.miscellaneous.model.MyObjectExample; import abatortest.java2.generated.miscellaneous.model.MyObjectKey; /** * @author Jeff Butler - * + * */ public class MiscellaneousTests extends BaseTest { protected void setUp() throws Exception { super.setUp(); - initDaoManager("abatortest/java2/execute/miscellaneous/dao.xml", null); + initSqlMapClient( + "abatortest/java2/execute/miscellaneous/SqlMapConfig.xml", null); } public void testMyObjectinsertMyObject() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - record.setStartDate(new Date()); - record.setDecimal100field(new Long(10L)); - record.setDecimal155field(new Double(15.12345)); - record.setDecimal60field(6); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - record.setLastname("Butler"); - - MyTime myTime = new MyTime(); - myTime.setHours(12); - myTime.setMinutes(34); - myTime.setSeconds(05); - record.setTimefield(myTime); - record.setTimestampfield(new Date()); - - dao.insertMyObject(record); - - MyObjectKey key = new MyObjectKey(); - key.setId1(new Integer(1)); - key.setId2(new Integer(2)); - - MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key); - assertNotNull(returnedRecord); - - assertTrue(datesAreEqual(record.getStartDate(), returnedRecord.getStartDate())); - assertEquals(record.getDecimal100field(), returnedRecord.getDecimal100field()); - assertEquals(record.getDecimal155field(), returnedRecord.getDecimal155field()); - assertEquals(record.getDecimal60field(), returnedRecord.getDecimal60field()); - assertEquals(record.getFirstname(), returnedRecord.getFirstname()); - assertEquals(record.getId1(), returnedRecord.getId1()); - assertEquals(record.getId2(), returnedRecord.getId2()); - assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertEquals(record.getTimefield(), returnedRecord.getTimefield()); - assertEquals(record.getTimestampfield(), returnedRecord.getTimestampfield()); + try { + MyObject record = new MyObject(); + record.setStartDate(new Date()); + record.setDecimal100field(new Long(10L)); + record.setDecimal155field(new Double(15.12345)); + record.setDecimal60field(6); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + record.setLastname("Butler"); + + MyTime myTime = new MyTime(); + myTime.setHours(12); + myTime.setMinutes(34); + myTime.setSeconds(05); + record.setTimefield(myTime); + record.setTimestampfield(new Date()); + + dao.insertMyObject(record); + + MyObjectKey key = new MyObjectKey(); + key.setId1(new Integer(1)); + key.setId2(new Integer(2)); + + MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key); + assertNotNull(returnedRecord); + + assertTrue(datesAreEqual(record.getStartDate(), returnedRecord + .getStartDate())); + assertEquals(record.getDecimal100field(), returnedRecord + .getDecimal100field()); + assertEquals(record.getDecimal155field(), returnedRecord + .getDecimal155field()); + assertEquals(record.getDecimal60field(), returnedRecord + .getDecimal60field()); + assertEquals(record.getFirstname(), returnedRecord.getFirstname()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getLastname(), returnedRecord.getLastname()); + assertEquals(record.getTimefield(), returnedRecord.getTimefield()); + assertEquals(record.getTimestampfield(), returnedRecord + .getTimestampfield()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectUpdateByPrimaryKey() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setLastname("Smith"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - - dao.insertMyObject(record); - - fn = new FirstName(); - fn.setValue("Scott"); - record.setFirstname(fn); - record.setLastname("Jones"); - - int rows = dao.updateMyObjectByPrimaryKey(record); - assertEquals(1, rows); - - MyObjectKey key = new MyObjectKey(); - key.setId1(new Integer(1)); - key.setId2(new Integer(2)); - - MyObject record2 = dao.selectMyObjectByPrimaryKey(key); - - assertEquals(record.getFirstname(), record2.getFirstname()); - assertEquals(record.getLastname(), record2.getLastname()); - assertEquals(record.getId1(), record2.getId1()); - assertEquals(record.getId2(), record2.getId2()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setLastname("Smith"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + + dao.insertMyObject(record); + + fn = new FirstName(); + fn.setValue("Scott"); + record.setFirstname(fn); + record.setLastname("Jones"); + + int rows = dao.updateMyObjectByPrimaryKey(record); + assertEquals(1, rows); + + MyObjectKey key = new MyObjectKey(); + key.setId1(new Integer(1)); + key.setId2(new Integer(2)); + + MyObject record2 = dao.selectMyObjectByPrimaryKey(key); + + assertEquals(record.getFirstname(), record2.getFirstname()); + assertEquals(record.getLastname(), record2.getLastname()); + assertEquals(record.getId1(), record2.getId1()); + assertEquals(record.getId2(), record2.getId2()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectUpdateByPrimaryKeySelective() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setLastname("Smith"); - record.setDecimal60field(5); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - - dao.insertMyObject(record); - - MyObject newRecord = new MyObject(); - newRecord.setId1(new Integer(1)); - newRecord.setId2(new Integer(2)); - fn = new FirstName(); - fn.setValue("Scott"); - newRecord.setFirstname(fn); - record.setStartDate(new Date()); - - int rows = dao.updateMyObjectByPrimaryKeySelective(newRecord); - assertEquals(1, rows); - - MyObjectKey key = new MyObjectKey(); - key.setId1(new Integer(1)); - key.setId2(new Integer(2)); - - MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key); - - assertTrue(datesAreEqual(newRecord.getStartDate(), returnedRecord.getStartDate())); - assertEquals(record.getDecimal100field(), returnedRecord.getDecimal100field()); - assertEquals(record.getDecimal155field(), returnedRecord.getDecimal155field()); - - // with columns mapped to primitive types, the column is always updated - assertEquals(newRecord.getDecimal60field(), returnedRecord.getDecimal60field()); - - assertEquals(newRecord.getFirstname(), returnedRecord.getFirstname()); - assertEquals(record.getId1(), returnedRecord.getId1()); - assertEquals(record.getId2(), returnedRecord.getId2()); - assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertEquals(record.getTimefield(), returnedRecord.getTimefield()); - assertEquals(record.getTimestampfield(), returnedRecord.getTimestampfield()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setLastname("Smith"); + record.setDecimal60field(5); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + + dao.insertMyObject(record); + + MyObject newRecord = new MyObject(); + newRecord.setId1(new Integer(1)); + newRecord.setId2(new Integer(2)); + fn = new FirstName(); + fn.setValue("Scott"); + newRecord.setFirstname(fn); + record.setStartDate(new Date()); + + int rows = dao.updateMyObjectByPrimaryKeySelective(newRecord); + assertEquals(1, rows); + + MyObjectKey key = new MyObjectKey(); + key.setId1(new Integer(1)); + key.setId2(new Integer(2)); + + MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key); + + assertTrue(datesAreEqual(newRecord.getStartDate(), returnedRecord + .getStartDate())); + assertEquals(record.getDecimal100field(), returnedRecord + .getDecimal100field()); + assertEquals(record.getDecimal155field(), returnedRecord + .getDecimal155field()); + + // with columns mapped to primitive types, the column is always + // updated + assertEquals(newRecord.getDecimal60field(), returnedRecord + .getDecimal60field()); + + assertEquals(newRecord.getFirstname(), returnedRecord + .getFirstname()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getLastname(), returnedRecord.getLastname()); + assertEquals(record.getTimefield(), returnedRecord.getTimefield()); + assertEquals(record.getTimestampfield(), returnedRecord + .getTimestampfield()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectDeleteByPrimaryKey() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setLastname("Smith"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - - dao.insertMyObject(record); - - MyObjectKey key = new MyObjectKey(); - key.setId1(new Integer(1)); - key.setId2(new Integer(2)); - - int rows = dao.deleteMyObjectByPrimaryKey(key); - assertEquals(1, rows); - - MyObjectExample example = new MyObjectExample(); - List answer = dao.selectMyObjectByExample(example); - assertEquals(0, answer.size()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setLastname("Smith"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + + dao.insertMyObject(record); + + MyObjectKey key = new MyObjectKey(); + key.setId1(new Integer(1)); + key.setId2(new Integer(2)); + + int rows = dao.deleteMyObjectByPrimaryKey(key); + assertEquals(1, rows); + + MyObjectExample example = new MyObjectExample(); + List answer = dao.selectMyObjectByExample(example); + assertEquals(0, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectDeleteByExample() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setLastname("Smith"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bob"); - record.setFirstname(fn); - record.setLastname("Jones"); - record.setId1(new Integer(3)); - record.setId2(new Integer(4)); - - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - List answer = dao.selectMyObjectByExample(example); - assertEquals(2, answer.size()); - - example = new MyObjectExample(); - example.createCriteria().andLastnameLike("J%"); - int rows = dao.deleteMyObjectByExample(example); - assertEquals(1, rows); - - example = new MyObjectExample(); - answer = dao.selectMyObjectByExample(example); - assertEquals(1, answer.size()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setLastname("Smith"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bob"); + record.setFirstname(fn); + record.setLastname("Jones"); + record.setId1(new Integer(3)); + record.setId2(new Integer(4)); + + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + List answer = dao.selectMyObjectByExample(example); + assertEquals(2, answer.size()); + + example = new MyObjectExample(); + example.createCriteria().andLastnameLike("J%"); + int rows = dao.deleteMyObjectByExample(example); + assertEquals(1, rows); + + example = new MyObjectExample(); + answer = dao.selectMyObjectByExample(example); + assertEquals(1, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByPrimaryKey() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setLastname("Smith"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bob"); - record.setFirstname(fn); - record.setLastname("Jones"); - record.setId1(new Integer(3)); - record.setId2(new Integer(4)); - dao.insertMyObject(record); - - MyObjectKey key = new MyObjectKey(); - key.setId1(new Integer(3)); - key.setId2(new Integer(4)); - MyObject newRecord = dao.selectMyObjectByPrimaryKey(key); - - assertNotNull(newRecord); - assertEquals(record.getFirstname(), newRecord.getFirstname()); - assertEquals(record.getLastname(), newRecord.getLastname()); - assertEquals(record.getId1(), newRecord.getId1()); - assertEquals(record.getId2(), newRecord.getId2()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setLastname("Smith"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bob"); + record.setFirstname(fn); + record.setLastname("Jones"); + record.setId1(new Integer(3)); + record.setId2(new Integer(4)); + dao.insertMyObject(record); + + MyObjectKey key = new MyObjectKey(); + key.setId1(new Integer(3)); + key.setId2(new Integer(4)); + MyObject newRecord = dao.selectMyObjectByPrimaryKey(key); + + assertNotNull(newRecord); + assertEquals(record.getFirstname(), newRecord.getFirstname()); + assertEquals(record.getLastname(), newRecord.getLastname()); + assertEquals(record.getId1(), newRecord.getId1()); + assertEquals(record.getId2(), newRecord.getId2()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleLike() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Fred"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Wilma"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Pebbles"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Barney"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Betty"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bamm Bamm"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - fn = new FirstName(); - fn.setValue("B%"); - example.createCriteria().andFirstnameLike(fn); - example.setOrderByClause("ID1, ID2"); - List answer = dao.selectMyObjectByExample(example); - assertEquals(3, answer.size()); - MyObject returnedRecord = (MyObject) answer.get(0); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(1, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(1); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(2, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(2); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(3, returnedRecord.getId2().intValue()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Fred"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Wilma"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Pebbles"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Barney"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Betty"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bamm Bamm"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + fn = new FirstName(); + fn.setValue("B%"); + example.createCriteria().andFirstnameLike(fn); + example.setOrderByClause("ID1, ID2"); + List answer = dao.selectMyObjectByExample(example); + assertEquals(3, answer.size()); + MyObject returnedRecord = (MyObject) answer.get(0); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(1, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(1); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(2, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(2); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(3, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleNotLike() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Fred"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Wilma"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Pebbles"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Barney"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Betty"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bamm Bamm"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - fn = new FirstName(); - fn.setValue("B%"); - example.createCriteria().andFirstnameNotLike(fn); - example.setOrderByClause("ID1, ID2"); - List answer = dao.selectMyObjectByExample(example); - assertEquals(3, answer.size()); - MyObject returnedRecord = (MyObject) answer.get(0); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(1, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(1); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(2, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(2); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(3, returnedRecord.getId2().intValue()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Fred"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Wilma"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Pebbles"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Barney"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Betty"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bamm Bamm"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + fn = new FirstName(); + fn.setValue("B%"); + example.createCriteria().andFirstnameNotLike(fn); + example.setOrderByClause("ID1, ID2"); + List answer = dao.selectMyObjectByExample(example); + assertEquals(3, answer.size()); + MyObject returnedRecord = (MyObject) answer.get(0); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(1, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(1); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(2, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(2); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(3, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleComplexLike() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Fred"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Wilma"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Pebbles"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Barney"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Betty"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bamm Bamm"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - fn = new FirstName(); - fn.setValue("B%"); - example.createCriteria().andFirstnameLike(fn) - .andId2EqualTo(new Integer(3)); - fn = new FirstName(); - fn.setValue("W%"); - example.or(example.createCriteria().andFirstnameLike(fn)); - - example.setOrderByClause("ID1, ID2"); - List answer = dao.selectMyObjectByExample(example); - assertEquals(2, answer.size()); - MyObject returnedRecord = (MyObject) answer.get(0); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(2, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(1); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(3, returnedRecord.getId2().intValue()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Fred"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Wilma"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Pebbles"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Barney"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Betty"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bamm Bamm"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + fn = new FirstName(); + fn.setValue("B%"); + example.createCriteria().andFirstnameLike(fn).andId2EqualTo( + new Integer(3)); + fn = new FirstName(); + fn.setValue("W%"); + example.or(example.createCriteria().andFirstnameLike(fn)); + + example.setOrderByClause("ID1, ID2"); + List answer = dao.selectMyObjectByExample(example); + assertEquals(2, answer.size()); + MyObject returnedRecord = (MyObject) answer.get(0); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(2, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(1); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(3, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleIn() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Fred"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Wilma"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Pebbles"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Barney"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Betty"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bamm Bamm"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - List ids = new ArrayList(); - ids.add(new Integer(1)); - ids.add(new Integer(3)); - - MyObjectExample example = new MyObjectExample(); - example.createCriteria().andId2In(ids); - - example.setOrderByClause("ID1, ID2"); - List answer = dao.selectMyObjectByExample(example); - assertEquals(4, answer.size()); - MyObject returnedRecord = (MyObject) answer.get(0); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(1, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(1); - assertEquals(1, returnedRecord.getId1().intValue()); - assertEquals(3, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(2); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(1, returnedRecord.getId2().intValue()); - returnedRecord = (MyObject) answer.get(3); - assertEquals(2, returnedRecord.getId1().intValue()); - assertEquals(3, returnedRecord.getId2().intValue()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Fred"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Wilma"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Pebbles"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Barney"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Betty"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bamm Bamm"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + List ids = new ArrayList(); + ids.add(new Integer(1)); + ids.add(new Integer(3)); + + MyObjectExample example = new MyObjectExample(); + example.createCriteria().andId2In(ids); + + example.setOrderByClause("ID1, ID2"); + List answer = dao.selectMyObjectByExample(example); + assertEquals(4, answer.size()); + MyObject returnedRecord = (MyObject) answer.get(0); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(1, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(1); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(3, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(2); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(1, returnedRecord.getId2().intValue()); + returnedRecord = (MyObject) answer.get(3); + assertEquals(2, returnedRecord.getId1().intValue()); + assertEquals(3, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleBetween() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - FirstName fn = new FirstName(); - fn.setValue("Fred"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Wilma"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Pebbles"); - record.setFirstname(fn); - record.setLastname("Flintstone"); - record.setId1(new Integer(1)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Barney"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(1)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Betty"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(2)); - dao.insertMyObject(record); - - record = new MyObject(); - fn = new FirstName(); - fn.setValue("Bamm Bamm"); - record.setFirstname(fn); - record.setLastname("Rubble"); - record.setId1(new Integer(2)); - record.setId2(new Integer(3)); - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - example.createCriteria().andId2Between(new Integer(1), new Integer(3)); - - example.setOrderByClause("ID1, ID2"); - List answer = dao.selectMyObjectByExample(example); - assertEquals(6, answer.size()); + try { + MyObject record = new MyObject(); + FirstName fn = new FirstName(); + fn.setValue("Fred"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Wilma"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Pebbles"); + record.setFirstname(fn); + record.setLastname("Flintstone"); + record.setId1(new Integer(1)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Barney"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(1)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Betty"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(2)); + dao.insertMyObject(record); + + record = new MyObject(); + fn = new FirstName(); + fn.setValue("Bamm Bamm"); + record.setFirstname(fn); + record.setLastname("Rubble"); + record.setId1(new Integer(2)); + record.setId2(new Integer(3)); + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + example.createCriteria().andId2Between(new Integer(1), + new Integer(3)); + + example.setOrderByClause("ID1, ID2"); + List answer = dao.selectMyObjectByExample(example); + assertEquals(6, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testMyObjectSelectByExampleTimeEquals() { - MyObjectDAO dao = (MyObjectDAO) daoManager.getDao(MyObjectDAO.class); + MyObjectDAO dao = new MyObjectDAOImpl(sqlMapClient); - MyObject record = new MyObject(); - record.setStartDate(new Date()); - record.setDecimal100field(new Long(10L)); - record.setDecimal155field(new Double(15.12345)); - record.setDecimal60field(6); - FirstName fn = new FirstName(); - fn.setValue("Jeff"); - record.setFirstname(fn); - record.setId1(new Integer(1)); - record.setId2(new Integer(2)); - record.setLastname("Butler"); - - MyTime myTime = new MyTime(); - myTime.setHours(12); - myTime.setMinutes(34); - myTime.setSeconds(05); - record.setTimefield(myTime); - record.setTimestampfield(new Date()); - - dao.insertMyObject(record); - - MyObjectExample example = new MyObjectExample(); - example.createCriteria().andTimefieldEqualTo(myTime); - List results = dao.selectMyObjectByExample(example); - assertEquals(1, results.size()); - MyObject returnedRecord = (MyObject) results.get(0); - - assertTrue(datesAreEqual(record.getStartDate(), returnedRecord.getStartDate())); - assertEquals(record.getDecimal100field(), returnedRecord.getDecimal100field()); - assertEquals(record.getDecimal155field(), returnedRecord.getDecimal155field()); - assertEquals(record.getDecimal60field(), returnedRecord.getDecimal60field()); - assertEquals(record.getFirstname(), returnedRecord.getFirstname()); - assertEquals(record.getId1(), returnedRecord.getId1()); - assertEquals(record.getId2(), returnedRecord.getId2()); - assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertEquals(record.getTimefield(), returnedRecord.getTimefield()); - assertEquals(record.getTimestampfield(), returnedRecord.getTimestampfield()); + try { + MyObject record = new MyObject(); + record.setStartDate(new Date()); + record.setDecimal100field(new Long(10L)); + record.setDecimal155field(new Double(15.12345)); + record.setDecimal60field(6); + FirstName fn = new FirstName(); + fn.setValue("Jeff"); + record.setFirstname(fn); + record.setId1(new Integer(1)); + record.setId2(new Integer(2)); + record.setLastname("Butler"); + + MyTime myTime = new MyTime(); + myTime.setHours(12); + myTime.setMinutes(34); + myTime.setSeconds(05); + record.setTimefield(myTime); + record.setTimestampfield(new Date()); + + dao.insertMyObject(record); + + MyObjectExample example = new MyObjectExample(); + example.createCriteria().andTimefieldEqualTo(myTime); + List results = dao.selectMyObjectByExample(example); + assertEquals(1, results.size()); + MyObject returnedRecord = (MyObject) results.get(0); + + assertTrue(datesAreEqual(record.getStartDate(), returnedRecord + .getStartDate())); + assertEquals(record.getDecimal100field(), returnedRecord + .getDecimal100field()); + assertEquals(record.getDecimal155field(), returnedRecord + .getDecimal155field()); + assertEquals(record.getDecimal60field(), returnedRecord + .getDecimal60field()); + assertEquals(record.getFirstname(), returnedRecord.getFirstname()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getLastname(), returnedRecord.getLastname()); + assertEquals(record.getTimefield(), returnedRecord.getTimefield()); + assertEquals(record.getTimestampfield(), returnedRecord + .getTimestampfield()); + } catch (SQLException e) { + fail(e.getMessage()); + } } public void testFieldIgnored() {
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/BaseTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/BaseTest.java?view=diff&rev=503987&r1=503986&r2=503987 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/BaseTest.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/BaseTest.java Mon Feb 5 21:06:29 2007 @@ -25,12 +25,12 @@ import java.util.Properties; import java.util.Random; +import junit.framework.TestCase; + import com.ibatis.common.jdbc.ScriptRunner; import com.ibatis.common.resources.Resources; -import com.ibatis.dao.client.DaoManager; -import com.ibatis.dao.client.DaoManagerBuilder; - -import junit.framework.TestCase; +import com.ibatis.sqlmap.client.SqlMapClient; +import com.ibatis.sqlmap.client.SqlMapClientBuilder; /** * @author Jeff Butler @@ -38,13 +38,13 @@ */ public abstract class BaseTest extends TestCase { - protected static DaoManager daoManager; + protected static SqlMapClient sqlMapClient; private static DateFormat dateOnlyFormat = SimpleDateFormat.getDateInstance(); private static DateFormat timeOnlyFormat = SimpleDateFormat.getTimeInstance(); - protected static void initDaoManager(String configFile, Properties props) throws Exception { + protected static void initSqlMapClient(String configFile, Properties props) throws Exception { Reader reader = Resources.getResourceAsReader(configFile); - daoManager = DaoManagerBuilder.buildDaoManager(reader, props); + sqlMapClient = SqlMapClientBuilder.buildSqlMapClient(reader, props); reader.close(); } Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml?view=diff&rev=503987&r1=503986&r2=503987 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml Mon Feb 5 21:06:29 2007 @@ -21,7 +21,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.flat.java5.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.flat.java5.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -49,7 +49,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.flat.java2.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.flat.java2.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -77,7 +77,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.flat.legacy.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.flat.legacy.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -103,7 +103,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.hierarchical.java5.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.hierarchical.java5.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -131,7 +131,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.hierarchical.java2.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.hierarchical.java2.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -159,7 +159,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.hierarchical.legacy.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.hierarchical.legacy.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -185,7 +185,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.conditional.java5.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.conditional.java5.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -213,7 +213,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.conditional.java2.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.conditional.java2.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -241,7 +241,7 @@ <property name="enableSubPackages" value="true" /> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.conditional.legacy.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.conditional.legacy.dao" targetProject="${generated.source.dir.java5}"> <property name="enableSubPackages" value="true" /> </daoGenerator> @@ -266,7 +266,7 @@ <sqlMapGenerator targetPackage="abatortest.generated.miscellaneous.xml" targetProject="${generated.source.dir.java5}"> </sqlMapGenerator> - <daoGenerator type="IBATIS" targetPackage="abatortest.generated.miscellaneous.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="abatortest.generated.miscellaneous.dao" targetProject="${generated.source.dir.java5}"> <property name="rootInterface" value="abatortest.execute.miscellaneous.BaseInterface" /> <property name="methodNameCalculator" value="EXTENDED"/> </daoGenerator>
