You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2010/05/05 22:13:19 UTC
svn commit: r941462 [3/5] - in /ibatis/java/ibator/trunk/core:
ibator-systests-common/src/main/java/ibatortest/util/
ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/
ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/cond...
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/UpdateByExampleTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/UpdateByExampleTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/UpdateByExampleTest.java Wed May 5 20:13:17 2010
@@ -40,6 +40,7 @@ import ibatortest.java2.generated.hierar
import ibatortest.java2.generated.hierarchical.java2.model.PkfieldsblobsWithBLOBs;
import ibatortest.java2.generated.hierarchical.java2.model.PkonlyExample;
import ibatortest.java2.generated.hierarchical.java2.model.PkonlyKey;
+import ibatortest.util.TestUtilities;
import java.sql.SQLException;
import java.util.List;
@@ -332,18 +333,18 @@ public class UpdateByExampleTest extends
try {
PkblobsWithBLOBs record = new PkblobsWithBLOBs();
record.setId(new Integer(3));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkblobsWithBLOBs();
record.setId(new Integer(6));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
PkblobsWithBLOBs newRecord = new PkblobsWithBLOBs();
- newRecord.setBlob1(generateRandomBlob());
+ newRecord.setBlob1(TestUtilities.generateRandomBlob());
PkblobsExample example = new PkblobsExample();
example.createCriteria().andIdGreaterThan(new Integer(4));
@@ -356,8 +357,8 @@ public class UpdateByExampleTest extends
PkblobsWithBLOBs returnedRecord = (PkblobsWithBLOBs) answer.get(0);
assertEquals(new Integer(6), returnedRecord.getId());
- assertTrue(blobsAreEqual(newRecord.getBlob1(), returnedRecord.getBlob1()));
- assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
+ assertTrue(TestUtilities.blobsAreEqual(newRecord.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
} catch (SQLException e) {
fail(e.getMessage());
}
@@ -369,14 +370,14 @@ public class UpdateByExampleTest extends
try {
PkblobsWithBLOBs record = new PkblobsWithBLOBs();
record.setId(new Integer(3));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkblobsWithBLOBs();
record.setId(new Integer(6));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
PkblobsKey newRecord = new PkblobsKey();
@@ -393,8 +394,8 @@ public class UpdateByExampleTest extends
PkblobsWithBLOBs returnedRecord = (PkblobsWithBLOBs) answer.get(0);
assertEquals(new Integer(8), returnedRecord.getId());
- assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
- assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
} catch (SQLException e) {
fail(e.getMessage());
}
@@ -406,14 +407,14 @@ public class UpdateByExampleTest extends
try {
PkblobsWithBLOBs record = new PkblobsWithBLOBs();
record.setId(new Integer(3));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkblobsWithBLOBs();
record.setId(new Integer(6));
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
PkblobsWithBLOBs newRecord = new PkblobsWithBLOBs();
@@ -446,7 +447,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(4));
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkfieldsblobsWithBLOBs();
@@ -454,7 +455,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(6));
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
PkfieldsblobsWithBLOBs newRecord = new PkfieldsblobsWithBLOBs();
@@ -473,7 +474,7 @@ public class UpdateByExampleTest extends
assertEquals(record.getId2(), returnedRecord.getId2());
assertEquals(newRecord.getFirstname(), returnedRecord.getFirstname());
assertEquals(record.getLastname(), returnedRecord.getLastname());
- assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
} catch (SQLException e) {
fail(e.getMessage());
@@ -489,7 +490,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(4));
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkfieldsblobsWithBLOBs();
@@ -497,7 +498,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(6));
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
Pkfieldsblobs newRecord = new Pkfieldsblobs();
@@ -518,7 +519,7 @@ public class UpdateByExampleTest extends
assertEquals(newRecord.getId2(), returnedRecord.getId2());
assertEquals(newRecord.getFirstname(), returnedRecord.getFirstname());
assertNull(returnedRecord.getLastname());
- assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
} catch (SQLException e) {
fail(e.getMessage());
@@ -534,7 +535,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(4));
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new PkfieldsblobsWithBLOBs();
@@ -542,7 +543,7 @@ public class UpdateByExampleTest extends
record.setId2(new Integer(6));
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
dao.insert(record);
PkfieldsblobsWithBLOBs newRecord = new PkfieldsblobsWithBLOBs();
@@ -577,15 +578,15 @@ public class UpdateByExampleTest extends
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new FieldsblobsWithBLOBs();
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
FieldsblobsWithBLOBs newRecord = new FieldsblobsWithBLOBs();
@@ -602,8 +603,8 @@ public class UpdateByExampleTest extends
assertEquals(record.getFirstname(), returnedRecord.getFirstname());
assertEquals(newRecord.getLastname(), returnedRecord.getLastname());
- assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
- assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
} catch (SQLException e) {
fail(e.getMessage());
}
@@ -616,15 +617,15 @@ public class UpdateByExampleTest extends
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new FieldsblobsWithBLOBs();
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
Fieldsblobs newRecord = new Fieldsblobs();
@@ -642,8 +643,8 @@ public class UpdateByExampleTest extends
assertEquals(newRecord.getFirstname(), returnedRecord.getFirstname());
assertEquals(newRecord.getLastname(), returnedRecord.getLastname());
- assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
- assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord.getBlob1()));
+ assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord.getBlob2()));
} catch (SQLException e) {
fail(e.getMessage());
}
@@ -656,15 +657,15 @@ public class UpdateByExampleTest extends
FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
record.setFirstname("Jeff");
record.setLastname("Smith");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
record = new FieldsblobsWithBLOBs();
record.setFirstname("Scott");
record.setLastname("Jones");
- record.setBlob1(generateRandomBlob());
- record.setBlob2(generateRandomBlob());
+ record.setBlob1(TestUtilities.generateRandomBlob());
+ record.setBlob2(TestUtilities.generateRandomBlob());
dao.insert(record);
FieldsblobsWithBLOBs newRecord = new FieldsblobsWithBLOBs();
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/MiscellaneousTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/MiscellaneousTest.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/MiscellaneousTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/MiscellaneousTest.java Wed May 5 20:13:17 2010
@@ -24,6 +24,7 @@ import ibatortest.java2.generated.miscel
import ibatortest.java2.generated.miscellaneous.model.MyObjectExample;
import ibatortest.java2.generated.miscellaneous.model.MyObjectKey;
import ibatortest.java2.generated.miscellaneous.model.Regexrename;
+import ibatortest.util.TestUtilities;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -68,7 +69,7 @@ public class MiscellaneousTest extends A
MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key);
assertNotNull(returnedRecord);
- assertTrue(datesAreEqual(record.getStartDate(), returnedRecord
+ assertTrue(TestUtilities.datesAreEqual(record.getStartDate(), returnedRecord
.getStartDate()));
assertEquals(record.getDecimal100field(), returnedRecord
.getDecimal100field());
@@ -157,7 +158,7 @@ public class MiscellaneousTest extends A
MyObject returnedRecord = dao.selectMyObjectByPrimaryKey(key);
- assertTrue(datesAreEqual(newRecord.getStartDate(), returnedRecord
+ assertTrue(TestUtilities.datesAreEqual(newRecord.getStartDate(), returnedRecord
.getStartDate()));
assertEquals(record.getDecimal100field(), returnedRecord
.getDecimal100field());
@@ -713,7 +714,7 @@ public class MiscellaneousTest extends A
assertEquals(1, results.size());
MyObject returnedRecord = (MyObject) results.get(0);
- assertTrue(datesAreEqual(record.getStartDate(), returnedRecord
+ assertTrue(TestUtilities.datesAreEqual(record.getStartDate(), returnedRecord
.getStartDate()));
assertEquals(record.getDecimal100field(), returnedRecord
.getDecimal100field());
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/AbstractTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/AbstractTest.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/AbstractTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/AbstractTest.java Wed May 5 20:13:17 2010
@@ -16,18 +16,14 @@
package ibatortest;
+import static ibatortest.util.TestUtilities.createDatabase;
+
import java.io.Reader;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.net.URL;
import java.util.Properties;
-import java.util.Random;
-import junit.framework.TestCase;
+import org.junit.Before;
-import com.ibatis.common.jdbc.ScriptRunner;
import com.ibatis.common.resources.Resources;
import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapClientBuilder;
@@ -36,11 +32,9 @@ import com.ibatis.sqlmap.client.SqlMapCl
* @author Jeff Butler
*
*/
-public abstract class AbstractTest extends TestCase {
+public abstract class AbstractTest {
private SqlMapClient sqlMapClient;
- private static DateFormat dateOnlyFormat = SimpleDateFormat.getDateInstance();
- private static DateFormat timeOnlyFormat = SimpleDateFormat.getTimeInstance();
protected void initSqlMapClient(String configFile, Properties props) throws Exception {
Reader reader = Resources.getResourceAsReader(configFile);
@@ -48,88 +42,11 @@ public abstract class AbstractTest exten
reader.close();
}
- @Override
- protected void setUp() throws Exception {
- Connection conn = null;
-
- try {
- Class.forName("org.hsqldb.jdbcDriver");
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:aname", "sa",
- "");
-
- Reader reader = Resources.getResourceAsReader("CreateDB.sql");
-
- ScriptRunner runner = new ScriptRunner(conn, true, false);
- runner.setLogWriter(null);
- runner.setErrorLogWriter(null);
- runner.runScript(reader);
- conn.commit();
-
- reader.close();
- } finally {
- if (conn != null) {
- conn.close();
- }
- }
- }
-
- protected byte[] generateRandomBlob() {
- Random random = new Random(System.currentTimeMillis());
-
- byte[] answer = new byte[256];
-
- random.nextBytes(answer);
-
- return answer;
- }
-
- protected boolean blobsAreEqual(byte[] blob1, byte[] blob2) {
- if (blob1 == null) {
- return blob2 == null;
- }
-
- if (blob2 == null) {
- return blob1 == null;
- }
-
- boolean rc = blob1.length == blob2.length;
-
- if (rc) {
- for (int i = 0; i < blob1.length; i++) {
- if (blob1[i] != blob2[i]) {
- rc = false;
- break;
- }
- }
- }
-
- return rc;
- }
-
- protected boolean datesAreEqual(Date date1, Date date2) {
- if (date1 == null) {
- return date2 == null;
- }
-
- if (date2 == null) {
- return date1 == null;
- }
-
- return dateOnlyFormat.format(date1).equals(dateOnlyFormat.format(date2));
-
- }
-
- protected boolean timesAreEqual(Date date1, Date date2) {
- if (date1 == null) {
- return date2 == null;
- }
-
- if (date2 == null) {
- return date1 == null;
- }
-
- return timeOnlyFormat.format(date1).equals(timeOnlyFormat.format(date2));
+ @Before
+ public void setUp() throws Exception {
+ URL url = AbstractTest.class.getClassLoader().getResource("CreateDB.sql");
+ createDatabase(url);
}
protected SqlMapClient getSqlMapClient() {
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/AbstractConditionalJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/AbstractConditionalJava2Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/AbstractConditionalJava2Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/AbstractConditionalJava2Test.java Wed May 5 20:13:17 2010
@@ -18,10 +18,6 @@ public abstract class AbstractConditiona
private BeanFactory factory;
- protected void setUp() throws Exception {
- super.setUp();
- }
-
public AbstractConditionalJava2Test() {
Resource res = new ClassPathResource("/ibatortest/execute/conditional/java2/SpringBeans.xml");
factory = new XmlBeanFactory(res);
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/ConditionalJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/ConditionalJava2Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/ConditionalJava2Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/ConditionalJava2Test.java Wed May 5 20:13:17 2010
@@ -16,6 +16,16 @@
package ibatortest.execute.conditional.java2;
+import static ibatortest.util.TestUtilities.blobsAreEqual;
+import static ibatortest.util.TestUtilities.datesAreEqual;
+import static ibatortest.util.TestUtilities.generateRandomBlob;
+import static ibatortest.util.TestUtilities.timesAreEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import ibatortest.generated.conditional.java2.dao.AwfulTableDAO;
import ibatortest.generated.conditional.java2.dao.FieldsblobsDAO;
import ibatortest.generated.conditional.java2.dao.FieldsonlyDAO;
@@ -46,6 +56,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.junit.Test;
+
/**
* @author Jeff Butler
*
@@ -53,6 +65,7 @@ import java.util.List;
public class ConditionalJava2Test extends AbstractConditionalJava2Test {
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyInsert() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -81,6 +94,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlySelectByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -118,6 +132,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlySelectByExampleNoCriteria() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -151,6 +166,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyDeleteByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -187,6 +203,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testFieldsOnlyCountByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -223,6 +240,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyInsert() {
PkonlyDAO dao = getPkonlyDAO();
@@ -245,6 +263,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyDeleteByPrimaryKey() {
PkonlyDAO dao = getPkonlyDAO();
@@ -277,6 +296,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyDeleteByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -310,6 +330,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlySelectByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -339,6 +360,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlySelectByExampleNoCriteria() {
PkonlyDAO dao = getPkonlyDAO();
@@ -367,6 +389,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKOnlyCountByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -399,6 +422,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsInsert() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -448,6 +472,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -481,6 +506,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKeySelective() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -534,6 +560,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKfieldsDeleteByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -562,6 +589,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsDeleteByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -598,6 +626,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsSelectByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -632,6 +661,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -698,6 +728,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleNotLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -764,6 +795,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleComplexLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -829,6 +861,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleIn() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -903,6 +936,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleBetween() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -961,6 +995,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleNoCriteria() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1019,6 +1054,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleEscapedFields() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1087,6 +1123,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsCountByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1120,6 +1157,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsInsert() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1145,6 +1183,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1172,6 +1211,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeySelective() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1200,6 +1240,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsDeleteByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1226,6 +1267,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsDeleteByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1259,6 +1301,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKBlobsSelectByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1286,6 +1329,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1318,6 +1362,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1345,6 +1390,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1376,6 +1422,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKBlobsCountByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1406,6 +1453,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsInsert() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1434,6 +1482,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1471,6 +1520,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1506,6 +1556,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1543,6 +1594,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsDeleteByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1582,6 +1634,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsDeleteByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1620,6 +1673,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1659,6 +1713,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1696,6 +1751,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1733,6 +1789,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1762,6 +1819,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testPKFieldsBlobsCountByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1796,6 +1854,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsInsert() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1825,6 +1884,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsDeleteByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1861,6 +1921,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithoutBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1894,6 +1955,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1929,6 +1991,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1956,6 +2019,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testFieldsBlobsCountByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1987,6 +2051,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableInsert() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2038,6 +2103,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableInsertSelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2087,6 +2153,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2141,6 +2208,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKeySelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2198,6 +2266,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableDeleteByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2231,6 +2300,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableDeleteByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2286,6 +2356,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableSelectByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2353,6 +2424,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2473,6 +2545,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleNotLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2593,6 +2666,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleComplexLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2711,6 +2785,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleIn() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2833,6 +2908,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleBetween() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2943,6 +3019,7 @@ public class ConditionalJava2Test extend
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleNoCriteria() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -3066,6 +3143,7 @@ public class ConditionalJava2Test extend
}
}
+ @Test
public void testAwfulTableCountByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/UpdateByExampleTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/UpdateByExampleTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java2/UpdateByExampleTest.java Wed May 5 20:13:17 2010
@@ -16,6 +16,12 @@
package ibatortest.execute.conditional.java2;
+import static ibatortest.util.TestUtilities.blobsAreEqual;
+import static ibatortest.util.TestUtilities.generateRandomBlob;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import ibatortest.generated.conditional.java2.dao.AwfulTableDAO;
import ibatortest.generated.conditional.java2.dao.FieldsblobsDAO;
import ibatortest.generated.conditional.java2.dao.FieldsonlyDAO;
@@ -41,6 +47,8 @@ import ibatortest.generated.conditional.
import java.util.List;
+import org.junit.Test;
+
/**
*
* @author Jeff Butler
@@ -49,6 +57,7 @@ import java.util.List;
public class UpdateByExampleTest extends AbstractConditionalJava2Test {
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyUpdateByExampleSelective() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -84,8 +93,8 @@ public class UpdateByExampleTest extends
List answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = (Fieldsonly) answer.get(0);
- assertEquals(record.getDoublefield(), 11.22);
- assertEquals(record.getFloatfield(), 33.44);
+ assertEquals(record.getDoublefield(), 11.22, 0.001);
+ assertEquals(record.getFloatfield(), 33.44, 0.001);
assertEquals(record.getIntegerfield().intValue(), 5);
example.clear();
@@ -93,8 +102,8 @@ public class UpdateByExampleTest extends
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = (Fieldsonly) answer.get(0);
- assertEquals(record.getDoublefield(), 99d);
- assertEquals(record.getFloatfield(), 66.77);
+ assertEquals(record.getDoublefield(), 99, 0.001);
+ assertEquals(record.getFloatfield(), 66.77, 0.001);
assertEquals(record.getIntegerfield().intValue(), 8);
example.clear();
@@ -102,8 +111,8 @@ public class UpdateByExampleTest extends
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = (Fieldsonly) answer.get(0);
- assertEquals(record.getDoublefield(), 99d);
- assertEquals(record.getFloatfield(), 100.111);
+ assertEquals(record.getDoublefield(), 99, 0.001);
+ assertEquals(record.getFloatfield(), 100.111, 0.001);
assertEquals(record.getIntegerfield().intValue(), 9);
} catch (Exception e) {
fail(e.getMessage());
@@ -111,6 +120,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyUpdateByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -154,6 +164,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKOnlyUpdateByExampleSelective() {
PkonlyDAO dao = getPkonlyDAO();
@@ -200,6 +211,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKOnlyUpdateByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -240,6 +252,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsUpdateByExampleSelective() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -280,6 +293,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsUpdateByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -326,6 +340,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsUpdateByExampleSelective() {
PkblobsDAO dao = getPkblobsDAO();
@@ -364,6 +379,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsUpdateByExampleWithoutBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -402,6 +418,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsUpdateByExampleWithBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -440,6 +457,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsUpdateByExampleSelective() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -484,6 +502,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -530,6 +549,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -576,6 +596,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsUpdateByExampleSelective() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -616,6 +637,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -657,6 +679,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsUpdateByExampleWithBLOBs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -698,6 +721,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableUpdateByExampleSelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -769,6 +793,7 @@ public class UpdateByExampleTest extends
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableUpdateByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/AbstractConditionalJava5Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/AbstractConditionalJava5Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/AbstractConditionalJava5Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/AbstractConditionalJava5Test.java Wed May 5 20:13:17 2010
@@ -18,7 +18,7 @@ import ibatortest.generated.conditional.
public abstract class AbstractConditionalJava5Test extends AbstractTest {
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
initSqlMapClient(
"ibatortest/execute/conditional/java5/SqlMapConfig.xml", null);
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java Wed May 5 20:13:17 2010
@@ -16,6 +16,16 @@
package ibatortest.execute.conditional.java5;
+import static ibatortest.util.TestUtilities.blobsAreEqual;
+import static ibatortest.util.TestUtilities.datesAreEqual;
+import static ibatortest.util.TestUtilities.generateRandomBlob;
+import static ibatortest.util.TestUtilities.timesAreEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import ibatortest.generated.conditional.java5.dao.AwfulTableDAO;
import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO;
import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO;
@@ -47,12 +57,15 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.junit.Test;
+
/**
* @author Jeff Butler
*
*/
public class ConditionalJava5Test extends AbstractConditionalJava5Test {
+ @Test
public void testFieldsOnlyInsert() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -80,6 +93,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsOnlySelectByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -116,6 +130,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsOnlySelectByExampleNoCriteria() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -148,6 +163,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsOnlyDeleteByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -184,6 +200,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsOnlyCountByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -219,6 +236,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlyInsert() {
PkonlyDAO dao = getPkonlyDAO();
@@ -240,6 +258,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlyDeleteByPrimaryKey() {
PkonlyDAO dao = getPkonlyDAO();
@@ -271,6 +290,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlyDeleteByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -303,6 +323,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlySelectByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -331,6 +352,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlySelectByExampleNoCriteria() {
PkonlyDAO dao = getPkonlyDAO();
@@ -359,6 +381,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKOnlyCountByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -391,6 +414,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsInsert() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -440,6 +464,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -473,6 +498,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKeySelective() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -525,6 +551,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKfieldsDeleteByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -552,6 +579,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsDeleteByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -588,6 +616,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -621,6 +650,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -686,6 +716,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleNotLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -751,6 +782,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleComplexLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -815,6 +847,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleIn() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -888,6 +921,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleBetween() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -945,6 +979,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleNoCriteria() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1002,6 +1037,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsSelectByExampleEscapedFields() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1070,6 +1106,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsCountByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1101,6 +1138,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsInsert() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1126,6 +1164,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1154,6 +1193,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeySelective() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1181,6 +1221,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsDeleteByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1206,6 +1247,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsDeleteByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1239,6 +1281,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsSelectByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1265,6 +1308,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1296,6 +1340,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1322,6 +1367,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsSelectByExampleWithBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1353,6 +1399,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKBlobsCountByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1382,6 +1429,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsInsert() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1410,6 +1458,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1447,6 +1496,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1482,6 +1532,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1518,6 +1569,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsDeleteByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1557,6 +1609,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsDeleteByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1595,6 +1648,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsSelectByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1634,6 +1688,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1671,6 +1726,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1707,6 +1763,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1736,6 +1793,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testPKFieldsBlobsCountByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1769,6 +1827,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsInsert() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1797,6 +1856,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsDeleteByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1832,6 +1892,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsSelectByExampleWithoutBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1864,6 +1925,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1898,6 +1960,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1925,6 +1988,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testFieldsBlobsCountByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1956,6 +2020,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableInsert() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2007,6 +2072,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableInsertSelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2056,6 +2122,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2110,6 +2177,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKeySelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2166,6 +2234,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableDeleteByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2198,6 +2267,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableDeleteByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2253,6 +2323,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2319,6 +2390,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2438,6 +2510,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleNotLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2557,6 +2630,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleComplexLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2674,6 +2748,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleIn() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2795,6 +2870,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleBetween() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2904,6 +2980,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableSelectByExampleNoCriteria() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -3027,6 +3104,7 @@ public class ConditionalJava5Test extend
}
}
+ @Test
public void testAwfulTableCountByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java Wed May 5 20:13:17 2010
@@ -16,6 +16,12 @@
package ibatortest.execute.conditional.java5;
+import static ibatortest.util.TestUtilities.blobsAreEqual;
+import static ibatortest.util.TestUtilities.generateRandomBlob;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import ibatortest.generated.conditional.java5.dao.AwfulTableDAO;
import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO;
import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO;
@@ -42,6 +48,7 @@ import ibatortest.generated.conditional.
import java.sql.SQLException;
import java.util.List;
+import org.junit.Test;
/**
*
* @author Jeff Butler
@@ -49,6 +56,7 @@ import java.util.List;
*/
public class UpdateByExampleTest extends AbstractConditionalJava5Test {
+ @Test
public void testFieldsOnlyUpdateByExampleSelective() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -84,8 +92,8 @@ public class UpdateByExampleTest extends
List<Fieldsonly> answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = answer.get(0);
- assertEquals(record.getDoublefield(), 11.22);
- assertEquals(record.getFloatfield(), 33.44);
+ assertEquals(record.getDoublefield(), 11.22, 0.001);
+ assertEquals(record.getFloatfield(), 33.44, 0.001);
assertEquals(record.getIntegerfield().intValue(), 5);
example.clear();
@@ -93,8 +101,8 @@ public class UpdateByExampleTest extends
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = (Fieldsonly) answer.get(0);
- assertEquals(record.getDoublefield(), 99d);
- assertEquals(record.getFloatfield(), 66.77);
+ assertEquals(record.getDoublefield(), 99, 0.001);
+ assertEquals(record.getFloatfield(), 66.77, 0.001);
assertEquals(record.getIntegerfield().intValue(), 8);
example.clear();
@@ -102,14 +110,15 @@ public class UpdateByExampleTest extends
answer = dao.selectByExample(example);
assertEquals(1, answer.size());
record = (Fieldsonly) answer.get(0);
- assertEquals(record.getDoublefield(), 99d);
- assertEquals(record.getFloatfield(), 100.111);
+ assertEquals(record.getDoublefield(), 99, 0.001);
+ assertEquals(record.getFloatfield(), 100.111, 0.001);
assertEquals(record.getIntegerfield().intValue(), 9);
} catch (SQLException e) {
fail(e.getMessage());
}
}
+ @Test
public void testFieldsOnlyUpdateByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -153,6 +162,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKOnlyUpdateByExampleSelective() {
PkonlyDAO dao = getPkonlyDAO();
@@ -199,6 +209,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKOnlyUpdateByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -239,6 +250,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsUpdateByExampleSelective() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -279,6 +291,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsUpdateByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -324,6 +337,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKBlobsUpdateByExampleSelective() {
PkblobsDAO dao = getPkblobsDAO();
@@ -361,6 +375,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKBlobsUpdateByExampleWithoutBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -398,6 +413,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKBlobsUpdateByExampleWithBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -435,6 +451,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsBlobsUpdateByExampleSelective() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -478,6 +495,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -523,6 +541,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -568,6 +587,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testFieldsBlobsUpdateByExampleSelective() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -607,6 +627,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -647,6 +668,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testFieldsBlobsUpdateByExampleWithBLOBs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -687,6 +709,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testAwfulTableUpdateByExampleSelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -757,6 +780,7 @@ public class UpdateByExampleTest extends
}
}
+ @Test
public void testAwfulTableUpdateByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/AbstractFlatJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/AbstractFlatJava2Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/AbstractFlatJava2Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/AbstractFlatJava2Test.java Wed May 5 20:13:17 2010
@@ -17,7 +17,8 @@ import ibatortest.generated.flat.java2.d
import ibatortest.generated.flat.java2.dao.PkonlyDAOImpl;
public abstract class AbstractFlatJava2Test extends AbstractTest {
- protected void setUp() throws Exception {
+
+ public void setUp() throws Exception {
super.setUp();
initSqlMapClient("ibatortest/execute/flat/java2/SqlMapConfig.xml", null);
}
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/FlatJava2Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/FlatJava2Test.java?rev=941462&r1=941461&r2=941462&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/FlatJava2Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/FlatJava2Test.java Wed May 5 20:13:17 2010
@@ -16,6 +16,15 @@
package ibatortest.execute.flat.java2;
+import static ibatortest.util.TestUtilities.blobsAreEqual;
+import static ibatortest.util.TestUtilities.datesAreEqual;
+import static ibatortest.util.TestUtilities.generateRandomBlob;
+import static ibatortest.util.TestUtilities.timesAreEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import ibatortest.generated.flat.java2.dao.AwfulTableDAO;
import ibatortest.generated.flat.java2.dao.FieldsblobsDAO;
import ibatortest.generated.flat.java2.dao.FieldsonlyDAO;
@@ -44,6 +53,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.junit.Test;
/**
* @author Jeff Butler
*
@@ -51,6 +61,7 @@ import java.util.List;
public class FlatJava2Test extends AbstractFlatJava2Test {
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyInsert() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -79,6 +90,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlySelectByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -116,6 +128,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlySelectByExampleDistinct() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -156,6 +169,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlySelectByExampleNoCriteria() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -192,6 +206,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsOnlyDeleteByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -228,6 +243,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testFieldsOnlyCountByExample() {
FieldsonlyDAO dao = getFieldsonlyDAO();
@@ -265,6 +281,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyInsert() {
PkonlyDAO dao = getPkonlyDAO();
@@ -287,6 +304,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyDeleteByPrimaryKey() {
PkonlyDAO dao = getPkonlyDAO();
@@ -316,6 +334,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlyDeleteByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -349,6 +368,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlySelectByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -378,6 +398,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKOnlySelectByExampleNoCriteria() {
PkonlyDAO dao = getPkonlyDAO();
@@ -406,6 +427,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKOnlyCountByExample() {
PkonlyDAO dao = getPkonlyDAO();
@@ -438,6 +460,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsInsert() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -483,6 +506,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -512,6 +536,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsUpdateByPrimaryKeySelective() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -561,6 +586,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKfieldsDeleteByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -585,6 +611,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsDeleteByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -621,6 +648,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsSelectByPrimaryKey() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -652,6 +680,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -718,6 +747,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleNotLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -784,6 +814,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleComplexLike() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -849,6 +880,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleIn() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -923,6 +955,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleBetween() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -981,6 +1014,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleNoCriteria() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1039,6 +1073,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsSelectByExampleEscapedFields() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1107,6 +1142,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsCountByExample() {
PkfieldsDAO dao = getPkfieldsDAO();
@@ -1140,6 +1176,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsInsert() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1165,6 +1202,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeyWithBLOBs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1193,6 +1231,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKBlobsUpdateByPrimaryKeySelective() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1221,6 +1260,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsDeleteByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1247,6 +1287,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsDeleteByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1280,6 +1321,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKBlobsSelectByPrimaryKey() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1307,6 +1349,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1339,6 +1382,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1366,6 +1410,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKBlobsSelectByExampleWithBlobs() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1397,6 +1442,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKBlobsCountByExample() {
PkblobsDAO dao = getPkblobsDAO();
@@ -1427,6 +1473,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsInsert() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1455,6 +1502,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1489,6 +1537,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeyWithoutBLOBs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1521,6 +1570,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsBlobsUpdateByPrimaryKeySelective() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1555,6 +1605,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsDeleteByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1591,6 +1642,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsDeleteByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1629,6 +1681,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByPrimaryKey() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1665,6 +1718,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1702,6 +1756,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobs() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1739,6 +1794,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1768,6 +1824,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testPKFieldsBlobsCountByExample() {
PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
@@ -1802,6 +1859,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsInsert() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1830,6 +1888,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsDeleteByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1866,6 +1925,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithoutBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1900,6 +1960,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobs() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1934,6 +1995,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1961,6 +2023,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testFieldsBlobsCountByExample() {
FieldsblobsDAO dao = getFieldsblobsDAO();
@@ -1988,6 +2051,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableInsert() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2039,6 +2103,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableInsertSelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2088,6 +2153,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2142,6 +2208,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableUpdateByPrimaryKeySelective() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2199,6 +2266,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableDeleteByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2232,6 +2300,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableDeleteByExample() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2287,6 +2356,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableSelectByPrimaryKey() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2354,6 +2424,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2474,6 +2545,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleNotLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2594,6 +2666,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleComplexLike() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2712,6 +2785,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleIn() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2834,6 +2908,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleBetween() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -2944,6 +3019,7 @@ public class FlatJava2Test extends Abstr
}
@SuppressWarnings("unchecked")
+ @Test
public void testAwfulTableSelectByExampleNoCriteria() {
AwfulTableDAO dao = getAwfulTableDAO();
@@ -3067,6 +3143,7 @@ public class FlatJava2Test extends Abstr
}
}
+ @Test
public void testAwfulTableCountByExample() {
AwfulTableDAO dao = getAwfulTableDAO();