Return-Path: Delivered-To: apmail-ibatis-commits-archive@www.apache.org Received: (qmail 32886 invoked from network); 5 May 2010 20:14:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 May 2010 20:14:14 -0000 Received: (qmail 5108 invoked by uid 500); 5 May 2010 20:14:14 -0000 Delivered-To: apmail-ibatis-commits-archive@ibatis.apache.org Received: (qmail 5070 invoked by uid 500); 5 May 2010 20:14:14 -0000 Mailing-List: contact commits-help@ibatis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ibatis.apache.org Delivered-To: mailing list commits@ibatis.apache.org Received: (qmail 5062 invoked by uid 99); 5 May 2010 20:14:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 20:14:14 +0000 X-ASF-Spam-Status: No, hits=-1334.2 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 20:14:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 108B5238897F; Wed, 5 May 2010 20:13:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941462 [2/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... Date: Wed, 05 May 2010 20:13:19 -0000 To: commits@ibatis.apache.org From: jgbutler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100505201320.108B5238897F@eris.apache.org> Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/FlatJava2Test.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/FlatJava2Test.java?rev=941462&r1=941461&r2=941462&view=diff ============================================================================== --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/FlatJava2Test.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/FlatJava2Test.java Wed May 5 20:13:17 2010 @@ -37,6 +37,7 @@ import ibatortest.java2.generated.flat.j import ibatortest.java2.generated.flat.java2.model.PkfieldsblobsExample; import ibatortest.java2.generated.flat.java2.model.Pkonly; import ibatortest.java2.generated.flat.java2.model.PkonlyExample; +import ibatortest.util.TestUtilities; import java.math.BigDecimal; import java.sql.SQLException; @@ -451,7 +452,7 @@ public class FlatJava2Test extends Abstr new Integer(2)); assertNotNull(returnedRecord); - assertTrue(datesAreEqual(record.getDatefield(), returnedRecord + assertTrue(TestUtilities.datesAreEqual(record.getDatefield(), returnedRecord .getDatefield())); assertEquals(record.getDecimal100field(), returnedRecord .getDecimal100field()); @@ -465,7 +466,7 @@ public class FlatJava2Test extends Abstr assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(timesAreEqual(record.getTimefield(), returnedRecord + assertTrue(TestUtilities.timesAreEqual(record.getTimefield(), returnedRecord .getTimefield())); assertEquals(record.getTimestampfield(), returnedRecord .getTimestampfield()); @@ -529,7 +530,7 @@ public class FlatJava2Test extends Abstr Pkfields returnedRecord = dao.selectByPrimaryKey(new Integer(1), new Integer(2)); - assertTrue(datesAreEqual(record.getDatefield(), returnedRecord + assertTrue(TestUtilities.datesAreEqual(record.getDatefield(), returnedRecord .getDatefield())); assertEquals(record.getDecimal100field(), returnedRecord .getDecimal100field()); @@ -544,7 +545,7 @@ public class FlatJava2Test extends Abstr assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(timesAreEqual(record.getTimefield(), returnedRecord + assertTrue(TestUtilities.timesAreEqual(record.getTimefield(), returnedRecord .getTimefield())); assertEquals(record.getTimestampfield(), returnedRecord .getTimestampfield()); @@ -1132,8 +1133,8 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1142,9 +1143,9 @@ public class FlatJava2Test extends Abstr Pkblobs returnedRecord = (Pkblobs) answer.get(0); assertEquals(record.getId(), returnedRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1157,14 +1158,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); int rows = dao.updateByPrimaryKey(record); assertEquals(1, rows); @@ -1172,8 +1173,8 @@ public class FlatJava2Test extends Abstr assertNotNull(newRecord); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1185,21 +1186,21 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); Pkblobs newRecord = new Pkblobs(); newRecord.setId(new Integer(3)); - newRecord.setBlob2(generateRandomBlob()); + newRecord.setBlob2(TestUtilities.generateRandomBlob()); dao.updateByPrimaryKeySelective(newRecord); Pkblobs returnedRecord = dao.selectByPrimaryKey(new Integer(3)); assertNotNull(returnedRecord); assertEquals(record.getId(), returnedRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(newRecord.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(newRecord.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1212,8 +1213,8 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1237,14 +1238,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1270,21 +1271,21 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(6)); assertNotNull(newRecord); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1296,14 +1297,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1327,14 +1328,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1353,14 +1354,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1371,8 +1372,8 @@ public class FlatJava2Test extends Abstr Pkblobs newRecord = (Pkblobs) answer.get(0); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1384,14 +1385,14 @@ public class FlatJava2Test extends Abstr try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); PkblobsExample example = new PkblobsExample(); @@ -1416,7 +1417,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1428,7 +1429,7 @@ public class FlatJava2Test extends Abstr assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getFirstname(), returnedRecord.getFirstname()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1444,7 +1445,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); Pkfieldsblobs updateRecord = new Pkfieldsblobs(); @@ -1452,7 +1453,7 @@ public class FlatJava2Test extends Abstr updateRecord.setId2(new Integer(4)); updateRecord.setFirstname("Scott"); updateRecord.setLastname("Jones"); - updateRecord.setBlob1(generateRandomBlob()); + updateRecord.setBlob1(TestUtilities.generateRandomBlob()); int rows = dao.updateByPrimaryKeyWithBLOBs(updateRecord); assertEquals(1, rows); @@ -1463,7 +1464,7 @@ public class FlatJava2Test extends Abstr assertEquals(updateRecord.getLastname(), newRecord.getLastname()); assertEquals(record.getId1(), newRecord.getId1()); assertEquals(record.getId2(), newRecord.getId2()); - assertTrue(blobsAreEqual(updateRecord.getBlob1(), newRecord + assertTrue(TestUtilities.blobsAreEqual(updateRecord.getBlob1(), newRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1479,7 +1480,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); Pkfieldsblobs updateRecord = new Pkfieldsblobs(); @@ -1497,7 +1498,7 @@ public class FlatJava2Test extends Abstr assertEquals(updateRecord.getLastname(), newRecord.getLastname()); assertEquals(record.getId1(), newRecord.getId1()); assertEquals(record.getId2(), newRecord.getId2()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1512,7 +1513,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); Pkfieldsblobs updateRecord = new Pkfieldsblobs(); @@ -1530,7 +1531,7 @@ public class FlatJava2Test extends Abstr .getLastname()); assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1546,7 +1547,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1554,7 +1555,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1581,7 +1582,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1589,7 +1590,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1618,7 +1619,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1626,7 +1627,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1639,7 +1640,7 @@ public class FlatJava2Test extends Abstr assertEquals(record.getId2(), newRecord.getId2()); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1654,7 +1655,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1662,7 +1663,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1690,7 +1691,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1698,7 +1699,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1711,7 +1712,7 @@ public class FlatJava2Test extends Abstr assertEquals(record.getId2(), newRecord.getId2()); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1726,7 +1727,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1734,7 +1735,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1755,7 +1756,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkfieldsblobs(); @@ -1763,7 +1764,7 @@ public class FlatJava2Test extends Abstr record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1786,8 +1787,8 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); @@ -1797,9 +1798,9 @@ public class FlatJava2Test extends Abstr Fieldsblobs returnedRecord = (Fieldsblobs) answer.get(0); assertEquals(record.getFirstname(), returnedRecord.getFirstname()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1813,15 +1814,15 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); @@ -1848,15 +1849,15 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); @@ -1881,15 +1882,15 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); @@ -1900,8 +1901,8 @@ public class FlatJava2Test extends Abstr Fieldsblobs newRecord = (Fieldsblobs) answer.get(0); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1914,15 +1915,15 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); @@ -1941,15 +1942,15 @@ public class FlatJava2Test extends Abstr Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); FieldsblobsExample example = new FieldsblobsExample(); Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/UpdateByExampleTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/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/flat/java2/UpdateByExampleTest.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/UpdateByExampleTest.java Wed May 5 20:13:17 2010 @@ -37,6 +37,7 @@ import ibatortest.java2.generated.flat.j import ibatortest.java2.generated.flat.java2.model.PkfieldsblobsExample; import ibatortest.java2.generated.flat.java2.model.Pkonly; import ibatortest.java2.generated.flat.java2.model.PkonlyExample; +import ibatortest.util.TestUtilities; import java.sql.SQLException; import java.util.List; @@ -329,18 +330,18 @@ public class UpdateByExampleTest extends try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); Pkblobs newRecord = new Pkblobs(); - newRecord.setBlob1(generateRandomBlob()); + newRecord.setBlob1(TestUtilities.generateRandomBlob()); PkblobsExample example = new PkblobsExample(); example.createCriteria().andIdGreaterThan(new Integer(4)); @@ -353,8 +354,8 @@ public class UpdateByExampleTest extends Pkblobs returnedRecord = (Pkblobs) 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()); } @@ -366,14 +367,14 @@ public class UpdateByExampleTest extends try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); Pkblobs newRecord = new Pkblobs(); @@ -390,8 +391,8 @@ public class UpdateByExampleTest extends Pkblobs returnedRecord = (Pkblobs) 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()); } @@ -403,14 +404,14 @@ public class UpdateByExampleTest extends try { Pkblobs record = new Pkblobs(); record.setId(new Integer(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); record = new Pkblobs(); record.setId(new Integer(6)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); dao.insert(record); Pkblobs newRecord = new Pkblobs(); @@ -443,7 +444,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 Pkfieldsblobs(); @@ -451,7 +452,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(); @@ -470,7 +471,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()); @@ -486,7 +487,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 Pkfieldsblobs(); @@ -494,7 +495,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(); @@ -515,7 +516,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()); @@ -531,7 +532,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 Pkfieldsblobs(); @@ -539,7 +540,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(); @@ -574,15 +575,15 @@ public class UpdateByExampleTest extends Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); 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(); @@ -599,8 +600,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()); } @@ -613,15 +614,15 @@ public class UpdateByExampleTest extends Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); 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(); @@ -639,8 +640,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()); } @@ -653,15 +654,15 @@ public class UpdateByExampleTest extends Fieldsblobs record = new Fieldsblobs(); 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 Fieldsblobs(); 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(); Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/HierarchicalJava2Test.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/HierarchicalJava2Test.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/HierarchicalJava2Test.java (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/hierarchical/java2/HierarchicalJava2Test.java Wed May 5 20:13:17 2010 @@ -43,6 +43,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.math.BigDecimal; import java.sql.SQLException; @@ -420,7 +421,7 @@ public class HierarchicalJava2Test exten Pkfields returnedRecord = dao.selectByPrimaryKey(key); assertNotNull(returnedRecord); - assertTrue(datesAreEqual(record.getDatefield(), returnedRecord + assertTrue(TestUtilities.datesAreEqual(record.getDatefield(), returnedRecord .getDatefield())); assertEquals(record.getDecimal100field(), returnedRecord .getDecimal100field()); @@ -434,7 +435,7 @@ public class HierarchicalJava2Test exten assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(timesAreEqual(record.getTimefield(), returnedRecord + assertTrue(TestUtilities.timesAreEqual(record.getTimefield(), returnedRecord .getTimefield())); assertEquals(record.getTimestampfield(), returnedRecord .getTimestampfield()); @@ -504,7 +505,7 @@ public class HierarchicalJava2Test exten Pkfields returnedRecord = dao.selectByPrimaryKey(key); - assertTrue(datesAreEqual(record.getDatefield(), returnedRecord + assertTrue(TestUtilities.datesAreEqual(record.getDatefield(), returnedRecord .getDatefield())); assertEquals(record.getDecimal100field(), returnedRecord .getDecimal100field()); @@ -519,7 +520,7 @@ public class HierarchicalJava2Test exten assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(timesAreEqual(record.getTimefield(), returnedRecord + assertTrue(TestUtilities.timesAreEqual(record.getTimefield(), returnedRecord .getTimefield())); assertEquals(record.getTimestampfield(), returnedRecord .getTimestampfield()); @@ -1113,8 +1114,8 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1123,9 +1124,9 @@ public class HierarchicalJava2Test exten PkblobsWithBLOBs returnedRecord = (PkblobsWithBLOBs) answer.get(0); assertEquals(record.getId(), returnedRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1138,14 +1139,14 @@ public class HierarchicalJava2Test exten 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(3)); - record.setBlob1(generateRandomBlob()); - record.setBlob2(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); + record.setBlob2(TestUtilities.generateRandomBlob()); int rows = dao.updateByPrimaryKey(record); assertEquals(1, rows); @@ -1156,8 +1157,8 @@ public class HierarchicalJava2Test exten assertNotNull(newRecord); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1169,13 +1170,13 @@ public class HierarchicalJava2Test exten 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); PkblobsWithBLOBs newRecord = new PkblobsWithBLOBs(); newRecord.setId(new Integer(3)); - newRecord.setBlob2(generateRandomBlob()); + newRecord.setBlob2(TestUtilities.generateRandomBlob()); dao.updateByPrimaryKeySelective(newRecord); PkblobsKey key = new PkblobsKey(); @@ -1184,9 +1185,9 @@ public class HierarchicalJava2Test exten PkblobsWithBLOBs returnedRecord = dao.selectByPrimaryKey(key); assertNotNull(returnedRecord); assertEquals(record.getId(), returnedRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(newRecord.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(newRecord.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1199,8 +1200,8 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1226,14 +1227,14 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1259,14 +1260,14 @@ public class HierarchicalJava2Test exten 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 key = new PkblobsKey(); @@ -1274,8 +1275,8 @@ public class HierarchicalJava2Test exten PkblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key); assertNotNull(newRecord); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1287,14 +1288,14 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1317,14 +1318,14 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1343,14 +1344,14 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1361,8 +1362,8 @@ public class HierarchicalJava2Test exten PkblobsWithBLOBs newRecord = (PkblobsWithBLOBs) answer.get(0); assertEquals(record.getId(), newRecord.getId()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1374,14 +1375,14 @@ public class HierarchicalJava2Test exten 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); PkblobsExample example = new PkblobsExample(); @@ -1406,7 +1407,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1419,7 +1420,7 @@ public class HierarchicalJava2Test exten assertEquals(record.getId2(), returnedRecord.getId2()); assertEquals(record.getFirstname(), returnedRecord.getFirstname()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1435,7 +1436,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs(); @@ -1443,7 +1444,7 @@ public class HierarchicalJava2Test exten updateRecord.setId2(new Integer(4)); updateRecord.setFirstname("Scott"); updateRecord.setLastname("Jones"); - updateRecord.setBlob1(generateRandomBlob()); + updateRecord.setBlob1(TestUtilities.generateRandomBlob()); int rows = dao.updateByPrimaryKey(updateRecord); assertEquals(1, rows); @@ -1456,7 +1457,7 @@ public class HierarchicalJava2Test exten assertEquals(updateRecord.getLastname(), newRecord.getLastname()); assertEquals(record.getId1(), newRecord.getId1()); assertEquals(record.getId2(), newRecord.getId2()); - assertTrue(blobsAreEqual(updateRecord.getBlob1(), newRecord + assertTrue(TestUtilities.blobsAreEqual(updateRecord.getBlob1(), newRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1472,7 +1473,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); Pkfieldsblobs updateRecord = new Pkfieldsblobs(); @@ -1492,7 +1493,7 @@ public class HierarchicalJava2Test exten assertEquals(updateRecord.getLastname(), newRecord.getLastname()); assertEquals(record.getId1(), newRecord.getId1()); assertEquals(record.getId2(), newRecord.getId2()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1507,7 +1508,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs(); @@ -1527,7 +1528,7 @@ public class HierarchicalJava2Test exten .getLastname()); assertEquals(record.getId1(), returnedRecord.getId1()); assertEquals(record.getId2(), returnedRecord.getId2()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); } catch (SQLException e) { fail(e.getMessage()); @@ -1543,7 +1544,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1551,7 +1552,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1581,7 +1582,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1589,7 +1590,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1618,7 +1619,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1626,7 +1627,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1641,7 +1642,7 @@ public class HierarchicalJava2Test exten assertEquals(record.getId2(), newRecord.getId2()); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1656,7 +1657,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1664,7 +1665,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1692,7 +1693,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1700,7 +1701,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1714,7 +1715,7 @@ public class HierarchicalJava2Test exten assertEquals(record.getId2(), newRecord.getId2()); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1729,7 +1730,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1737,7 +1738,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1758,7 +1759,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(4)); record.setFirstname("Jeff"); record.setLastname("Smith"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); record = new PkfieldsblobsWithBLOBs(); @@ -1766,7 +1767,7 @@ public class HierarchicalJava2Test exten record.setId2(new Integer(6)); record.setFirstname("Scott"); record.setLastname("Jones"); - record.setBlob1(generateRandomBlob()); + record.setBlob1(TestUtilities.generateRandomBlob()); dao.insert(record); PkfieldsblobsExample example = new PkfieldsblobsExample(); @@ -1789,8 +1790,8 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample(); @@ -1801,9 +1802,9 @@ public class HierarchicalJava2Test exten .get(0); assertEquals(record.getFirstname(), returnedRecord.getFirstname()); assertEquals(record.getLastname(), returnedRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), returnedRecord .getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), returnedRecord .getBlob2())); } catch (SQLException e) { fail(e.getMessage()); @@ -1817,15 +1818,15 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample(); @@ -1852,15 +1853,15 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample(); @@ -1884,15 +1885,15 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample(); @@ -1904,8 +1905,8 @@ public class HierarchicalJava2Test exten .get(0); assertEquals(record.getFirstname(), newRecord.getFirstname()); assertEquals(record.getLastname(), newRecord.getLastname()); - assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); - assertTrue(blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob1(), newRecord.getBlob1())); + assertTrue(TestUtilities.blobsAreEqual(record.getBlob2(), newRecord.getBlob2())); } catch (SQLException e) { fail(e.getMessage()); } @@ -1918,15 +1919,15 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample(); @@ -1945,15 +1946,15 @@ public class HierarchicalJava2Test exten 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); FieldsblobsExample example = new FieldsblobsExample();