Author: aadamchik
Date: Tue Oct 10 11:17:20 2006
New Revision: 454860
URL: http://svn.apache.org/viewvc?view=rev&rev=454860
Log:
refactoring itests for better support of JPA vs. Cayenne POJO tests
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java?view=diff&rev=454860&r1=454859&r2=454860
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_18_BasicAnnotationTest.java
Tue Oct 10 11:17:20 2006
@@ -19,7 +19,6 @@
package org.apache.cayenne.jpa.itest.ch9;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch9.entity.BasicEntity;
/**
@@ -32,8 +31,8 @@
public class _9_1_18_BasicAnnotationTest extends EntityManagerCase {
public void testSelectBasicDefault() throws Exception {
- ItestDBUtils.deleteAll("BasicEntity");
- ItestDBUtils.insert("BasicEntity", new String[] {
+ getDbHelper().deleteAll("BasicEntity");
+ getDbHelper().insert("BasicEntity", new String[] {
"id", "basicDefault", "basicDefaultInt"
}, new Object[] {
1, "a", 67
@@ -45,8 +44,8 @@
}
public void testSelectBasicEager() throws Exception {
- ItestDBUtils.deleteAll("BasicEntity");
- ItestDBUtils.insert("BasicEntity", new String[] {
+ getDbHelper().deleteAll("BasicEntity");
+ getDbHelper().insert("BasicEntity", new String[] {
"id", "basicEager"
}, new Object[] {
2, "b"
@@ -57,8 +56,8 @@
}
public void testSelectBasicLazy() throws Exception {
- ItestDBUtils.deleteAll("BasicEntity");
- ItestDBUtils.insert("BasicEntity", new String[] {
+ getDbHelper().deleteAll("BasicEntity");
+ getDbHelper().insert("BasicEntity", new String[] {
"id", "basicLazy"
}, new Object[] {
3, "c"
Modified:
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java?view=diff&rev=454860&r1=454859&r2=454860
==============================================================================
---
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
(original)
+++
incubator/cayenne/main/trunk/integration-test/jpa-chapter9/src/test/java/org/apache/cayenne/jpa/itest/ch9/_9_1_8_IdAnnotationTest.java
Tue Oct 10 11:17:20 2006
@@ -19,7 +19,6 @@
package org.apache.cayenne.jpa.itest.ch9;
import org.apache.cayenne.itest.jpa.EntityManagerCase;
-import org.apache.cayenne.itest.jpa.ItestDBUtils;
import org.apache.cayenne.jpa.itest.ch9.entity.IdColumnEntity;
import org.apache.cayenne.jpa.itest.ch9.entity.IdEntity;
@@ -32,7 +31,7 @@
// TODO: andrus, 9/10/2006 - fails
public void _testUserProvidedId() throws Exception {
- ItestDBUtils.deleteAll("IdEntity");
+ getDbHelper().deleteAll("IdEntity");
IdEntity o1 = new IdEntity();
o1.setIdValue(15);
@@ -40,26 +39,26 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals(15, ItestDBUtils.getInt("IdEntity", "id"));
+ assertEquals(15, getDbHelper().getInt("IdEntity", "id"));
assertEquals(15, o1.getIdValue());
}
// TODO: andrus, 9/10/2006 - fails
public void _testGeneratedId() throws Exception {
- ItestDBUtils.deleteAll("IdEntity");
+ getDbHelper().deleteAll("IdEntity");
IdEntity o1 = new IdEntity();
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertTrue(ItestDBUtils.getInt("IdEntity", "id") > 0);
+ assertTrue(getDbHelper().getInt("IdEntity", "id") > 0);
assertTrue(o1.getIdValue() > 0);
}
// TODO: andrus, 9/10/2006 - fails
public void _testUserProvidedIdColumnAnnotation() throws Exception {
- ItestDBUtils.deleteAll("IdColumnEntity");
+ getDbHelper().deleteAll("IdColumnEntity");
IdColumnEntity o1 = new IdColumnEntity();
o1.setIdValue(15);
@@ -67,20 +66,20 @@
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertEquals(15, ItestDBUtils.getInt("IdColumnEntity",
"idcolumn"));
+ assertEquals(15, getDbHelper().getInt("IdColumnEntity",
"idcolumn"));
assertEquals(15, o1.getIdValue());
}
// TODO: andrus, 9/10/2006 - fails
public void _testGeneratedIdColumnAnnotation() throws Exception {
- ItestDBUtils.deleteAll("IdColumnEntity");
+ getDbHelper().deleteAll("IdColumnEntity");
IdColumnEntity o1 = new IdColumnEntity();
getEntityManager().persist(o1);
getEntityManager().getTransaction().commit();
- assertTrue(ItestDBUtils.getInt("IdColumnEntity", "idcolumn") >
0);
+ assertTrue(getDbHelper().getInt("IdColumnEntity", "idcolumn") >
0);
assertTrue(o1.getIdValue() > 0);
}
}
