You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/10/10 20:17:10 UTC
svn commit: r454859 -
/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/
Author: aadamchik
Date: Tue Oct 10 11:17:09 2006
New Revision: 454859
URL: http://svn.apache.org/viewvc?view=rev&rev=454859
Log:
refactoring itests for better support of JPA vs. Cayenne POJO tests
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_1_PeristentFieldsAndPropertiesTest.java Tue Oct 10 11:17:09 2006
@@ -21,7 +21,6 @@
import java.util.Collections;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.CollectionFieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.FieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.HelperEntity1;
@@ -35,13 +34,13 @@
public void testFieldBasedPersistence() throws Exception {
- ItestDBUtils.deleteAll("FieldPersistenceEntity");
+ getDbHelper().deleteAll("FieldPersistenceEntity");
FieldPersistenceEntity o1 = new FieldPersistenceEntity();
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals(FieldPersistenceEntity.INITIAL_VALUE, ItestDBUtils.getObject(
+ assertEquals(FieldPersistenceEntity.INITIAL_VALUE, getDbHelper().getObject(
"FieldPersistenceEntity",
"property1"));
}
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_4_PrimaryKeyAndIdentityTest.java Tue Oct 10 11:17:09 2006
@@ -21,7 +21,6 @@
import javax.persistence.PersistenceException;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedIdEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.FieldPersistenceEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.IdClassEntity;
@@ -63,7 +62,7 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals("p1", ItestDBUtils.getObject("IdClassEntity", "property1"));
+ assertEquals("p1", getDbHelper().getObject("IdClassEntity", "property1"));
}
// TODO: andrus 8/10/2006 - fails
@@ -73,6 +72,6 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals("p1", ItestDBUtils.getObject("EmbeddedIdEntity", "property1"));
+ assertEquals("p1", getDbHelper().getObject("EmbeddedIdEntity", "property1"));
}
}
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_5_EmbeddableTest.java Tue Oct 10 11:17:09 2006
@@ -19,14 +19,13 @@
package org.apache.cayenne.jpa.itest.ch2;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.Embeddable1;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedEntity;
public class _2_1_5_EmbeddableTest extends EntityManagerCase {
public void testEmbeddable() throws Exception {
- ItestDBUtils.deleteAll("EmbeddedEntity");
+ getDbHelper().deleteAll("EmbeddedEntity");
EmbeddedEntity o1 = new EmbeddedEntity();
Embeddable1 o2 = new Embeddable1();
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_6_MappingDefaultsNonRelationshipTest.java Tue Oct 10 11:17:09 2006
@@ -28,7 +28,6 @@
import java.util.GregorianCalendar;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.Embeddable1;
import org.apache.cayenne.jpa.itest.ch2.entity.EmbeddedImpliedEntity;
import org.apache.cayenne.jpa.itest.ch2.entity.EnumType;
@@ -42,7 +41,7 @@
// TODO: andrus 8/10/2006 - fails
public void _testEmbeddedDefault() throws Exception {
- ItestDBUtils.deleteAll("EmbeddedImpliedEntity");
+ getDbHelper().deleteAll("EmbeddedImpliedEntity");
EmbeddedImpliedEntity o1 = new EmbeddedImpliedEntity();
Embeddable1 o2 = new Embeddable1();
@@ -52,11 +51,11 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals("p1", ItestDBUtils.getObject("EmbeddedImpliedEntity", "property1"));
+ assertEquals("p1", getDbHelper().getObject("EmbeddedImpliedEntity", "property1"));
}
public void testPrimitiveWrapperDefaults() throws Exception {
- ItestDBUtils.deleteAll("PropertyDefaultsWrapperEntity");
+ getDbHelper().deleteAll("PropertyDefaultsWrapperEntity");
PropertyDefaultsWrapperEntity o1 = new PropertyDefaultsWrapperEntity();
@@ -72,33 +71,34 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertTrue(ItestDBUtils.getBoolean(
+ assertTrue(getDbHelper().getBoolean(
"PropertyDefaultsWrapperEntity",
"booleanWrapper"));
- assertEquals(2, ItestDBUtils.getInt(
+ assertEquals(2, getDbHelper().getInt(
"PropertyDefaultsWrapperEntity",
"shortWrapper"));
- assertEquals(3, ItestDBUtils.getInt(
+ assertEquals(3, getDbHelper().getInt(
"PropertyDefaultsWrapperEntity",
"byteWrapper"));
- assertEquals(4, ItestDBUtils
- .getInt("PropertyDefaultsWrapperEntity", "intWrapper"));
- assertEquals("a", ItestDBUtils.getObject(
+ assertEquals(4, getDbHelper().getInt(
+ "PropertyDefaultsWrapperEntity",
+ "intWrapper"));
+ assertEquals("a", getDbHelper().getObject(
"PropertyDefaultsWrapperEntity",
"charWrapper"));
- assertEquals(1234567890l, ItestDBUtils.getLong(
+ assertEquals(1234567890l, getDbHelper().getLong(
"PropertyDefaultsWrapperEntity",
"longWrapper"));
- assertEquals(5.5d, ItestDBUtils.getDouble(
+ assertEquals(5.5d, getDbHelper().getDouble(
"PropertyDefaultsWrapperEntity",
"floatWrapper"));
- assertEquals(6.5d, ItestDBUtils.getDouble(
+ assertEquals(6.5d, getDbHelper().getDouble(
"PropertyDefaultsWrapperEntity",
"doubleWrapper"));
}
public void testPrimitiveDefaults() throws Exception {
- ItestDBUtils.deleteAll("PropertyDefaultsPrimitiveEntity");
+ getDbHelper().deleteAll("PropertyDefaultsPrimitiveEntity");
PropertyDefaultsPrimitiveEntity o1 = new PropertyDefaultsPrimitiveEntity();
o1.setPrimitiveBoolean(true);
@@ -114,34 +114,34 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertTrue(ItestDBUtils.getBoolean(
+ assertTrue(getDbHelper().getBoolean(
"PropertyDefaultsPrimitiveEntity",
"primitiveBoolean"));
- assertEquals(2, ItestDBUtils.getInt(
+ assertEquals(2, getDbHelper().getInt(
"PropertyDefaultsPrimitiveEntity",
"primitiveShort"));
- assertEquals(3, ItestDBUtils.getInt(
+ assertEquals(3, getDbHelper().getInt(
"PropertyDefaultsPrimitiveEntity",
"primitiveByte"));
- assertEquals(4, ItestDBUtils.getInt(
+ assertEquals(4, getDbHelper().getInt(
"PropertyDefaultsPrimitiveEntity",
"primitiveInt"));
- assertEquals("a", ItestDBUtils.getObject(
+ assertEquals("a", getDbHelper().getObject(
"PropertyDefaultsPrimitiveEntity",
"primitiveChar"));
- assertEquals(1234567890l, ItestDBUtils.getLong(
+ assertEquals(1234567890l, getDbHelper().getLong(
"PropertyDefaultsPrimitiveEntity",
"primitiveLong"));
- assertEquals(5.5d, ItestDBUtils.getDouble(
+ assertEquals(5.5d, getDbHelper().getDouble(
"PropertyDefaultsPrimitiveEntity",
"primitiveFloat"));
- assertEquals(6.5d, ItestDBUtils.getDouble(
+ assertEquals(6.5d, getDbHelper().getDouble(
"PropertyDefaultsPrimitiveEntity",
"primitiveDouble"));
}
public void testDatesDefaults() throws Exception {
- ItestDBUtils.deleteAll("PropertyDefaultsDatesEntity");
+ getDbHelper().deleteAll("PropertyDefaultsDatesEntity");
java.util.Date utilDate = new java.util.Date(System.currentTimeMillis() - 1000);
java.util.Calendar calendar = new java.util.GregorianCalendar();
@@ -167,23 +167,24 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals(utilDate, ItestDBUtils.getUtilDate(
+ assertEquals(utilDate, getDbHelper().getUtilDate(
"PropertyDefaultsDatesEntity",
"utilDate"));
- assertEquals(calendar.getTimeInMillis(), ItestDBUtils.getTimestamp(
+ assertEquals(calendar.getTimeInMillis(), getDbHelper().getTimestamp(
"PropertyDefaultsDatesEntity",
"calendar").getTime());
- assertEquals(sqlDate, ItestDBUtils.getSqlDate(
+ assertEquals(sqlDate, getDbHelper().getSqlDate(
"PropertyDefaultsDatesEntity",
"sqlDate"));
- assertEquals(time, ItestDBUtils.getTime("PropertyDefaultsDatesEntity", "sqlTime"));
- assertEquals(timestamp, ItestDBUtils.getTimestamp(
+ assertEquals(time, getDbHelper()
+ .getTime("PropertyDefaultsDatesEntity", "sqlTime"));
+ assertEquals(timestamp, getDbHelper().getTimestamp(
"PropertyDefaultsDatesEntity",
"sqlTimestamp"));
}
public void testOtherDefaults() throws Exception {
- ItestDBUtils.deleteAll("PropertyDefaultsOtherEntity");
+ getDbHelper().deleteAll("PropertyDefaultsOtherEntity");
PropertyDefaultsOtherEntity o1 = new PropertyDefaultsOtherEntity();
o1.setString("abc");
@@ -209,21 +210,21 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals("abc", ItestDBUtils.getObject(
+ assertEquals("abc", getDbHelper().getObject(
"PropertyDefaultsOtherEntity",
"string"));
- assertEquals(2, ItestDBUtils.getInt("PropertyDefaultsOtherEntity", "bigInt"));
- assertEquals(3.5d, ItestDBUtils.getDouble(
+ assertEquals(2, getDbHelper().getInt("PropertyDefaultsOtherEntity", "bigInt"));
+ assertEquals(3.5d, getDbHelper().getDouble(
"PropertyDefaultsOtherEntity",
"bigDecimal"));
- byte[] b1 = ItestDBUtils.getBytes("PropertyDefaultsOtherEntity", "byteArray");
+ byte[] b1 = getDbHelper().getBytes("PropertyDefaultsOtherEntity", "byteArray");
assertNotNull(b1);
assertEquals(2, b1.length);
assertEquals((byte) 1, b1[0]);
assertEquals((byte) 2, b1[1]);
- byte[] b2 = ItestDBUtils.getBytes(
+ byte[] b2 = getDbHelper().getBytes(
"PropertyDefaultsOtherEntity",
"byteWrapperArray");
assertNotNull(b2);
@@ -231,16 +232,16 @@
assertEquals((byte) 1, b2[0]);
assertEquals((byte) 2, b2[1]);
- assertEquals("ab", ItestDBUtils.getObject(
+ assertEquals("ab", getDbHelper().getObject(
"PropertyDefaultsOtherEntity",
"charArray"));
- assertEquals("ab", ItestDBUtils.getObject(
+ assertEquals("ab", getDbHelper().getObject(
"PropertyDefaultsOtherEntity",
"charWrapperArray"));
- assertEquals(1, ItestDBUtils.getInt("PropertyDefaultsOtherEntity", "enumType"));
+ assertEquals(1, getDbHelper().getInt("PropertyDefaultsOtherEntity", "enumType"));
- byte[] ser = ItestDBUtils.getBytes(
+ byte[] ser = getDbHelper().getBytes(
"PropertyDefaultsOtherEntity",
"serializableType");
assertNotNull(ser);
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_7_EntityRelationshipsTest.java Tue Oct 10 11:17:09 2006
@@ -19,7 +19,6 @@
package org.apache.cayenne.jpa.itest.ch2;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.CollectionFieldPersistenceEntity;
public class _2_1_7_EntityRelationshipsTest extends EntityManagerCase {
@@ -32,10 +31,10 @@
// TODO: andrus 8/10/2006 - fails because of pk handling issues
public void _testEmptyCollection() throws Exception {
- ItestDBUtils.deleteAll("HelperEntity1");
- ItestDBUtils.deleteAll("CollectionFieldPersistenceEntity");
+ getDbHelper().deleteAll("HelperEntity1");
+ getDbHelper().deleteAll("CollectionFieldPersistenceEntity");
- ItestDBUtils.insert("CollectionFieldPersistenceEntity", new String[] {
+ getDbHelper().insert("CollectionFieldPersistenceEntity", new String[] {
"id"
}, new Object[] {
new Integer(5)
@@ -51,16 +50,16 @@
// TODO: andrus 8/10/2006 - fails because of pk handling issues
public void _testNonEmptyCollection() throws Exception {
- ItestDBUtils.deleteAll("HelperEntity1");
- ItestDBUtils.deleteAll("CollectionFieldPersistenceEntity");
+ getDbHelper().deleteAll("HelperEntity1");
+ getDbHelper().deleteAll("CollectionFieldPersistenceEntity");
- ItestDBUtils.insert("CollectionFieldPersistenceEntity", new String[] {
+ getDbHelper().insert("CollectionFieldPersistenceEntity", new String[] {
"id"
}, new Object[] {
new Integer(5)
});
- ItestDBUtils.insert("HelperEntity1", new String[] {
+ getDbHelper().insert("HelperEntity1", new String[] {
"id", "entity_id"
}, new Object[] {
new Integer(4), new Integer(5)
Modified: incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java?view=diff&rev=454859&r1=454858&r2=454859
==============================================================================
--- incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java (original)
+++ incubator/cayenne/main/trunk/integration-test/jpa-chapter2/src/test/java/org/apache/cayenne/jpa/itest/ch2/_2_1_8_1_BidiOneToOneRelationshipsTest.java Tue Oct 10 11:17:09 2006
@@ -19,7 +19,6 @@
package org.apache.cayenne.jpa.itest.ch2;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch2.entity.BidiOneToOneOwned;
import org.apache.cayenne.jpa.itest.ch2.entity.BidiOneToOneOwner;
@@ -33,16 +32,16 @@
// TODO: andrus 8/10/2006 - fails
public void _testDefaults() throws Exception {
- ItestDBUtils.deleteAll("BidiOneToOneOwned");
- ItestDBUtils.deleteAll("BidiOneToOneOwner");
+ getDbHelper().deleteAll("BidiOneToOneOwned");
+ getDbHelper().deleteAll("BidiOneToOneOwner");
- ItestDBUtils.insert("BidiOneToOneOwned", new String[] {
+ getDbHelper().insert("BidiOneToOneOwned", new String[] {
"id"
}, new Object[] {
5
});
- ItestDBUtils.insert("BidiOneToOneOwner", new String[] {
+ getDbHelper().insert("BidiOneToOneOwner", new String[] {
"id", "owned_id"
}, new Object[] {
4, 5