Author: mtylenda
Date: Sun Oct 11 13:35:43 2009
New Revision: 824071
URL: http://svn.apache.org/viewvc?rev=824071&view=rev
Log:
OPENJPA-1153: Speed tests up by using only needed entities rather than all
entities from persistence.xml
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java?rev=824071&r1=824070&r2=824071&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
Sun Oct 11 13:35:43 2009
@@ -25,20 +25,19 @@
import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
public class TestEJBEntityManager extends AbstractTestCase {
private Object _id = null;
- private Object _id2 = null;
-
public TestEJBEntityManager(String name) {
super(name, "kernelcactusapp");
}
public void setUp() throws Exception {
- deleteAll(RuntimeTest1.class);
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class,
RuntimeTest3.class);
EntityManager em = currentEntityManager();
startTx(em);
@@ -48,7 +47,7 @@
em.persist(a);
em.persist(b);
_id = a.getIntField();
- _id2 = b.getIntField();
+ b.getIntField();
endTx(em);
endEm(em);
@@ -110,7 +109,7 @@
}.start();
while (result.size() == 0)
- Thread.currentThread().yield(); // wait for results
+ Thread.yield(); // wait for results
Object ret = result.get(0);
if (ret instanceof Exception)
@@ -128,7 +127,7 @@
EntityManager em = currentEntityManager();
RuntimeTest1 a = new RuntimeTest1("foo", 10);
- RuntimeTest1 a2 = (RuntimeTest1) em.find(RuntimeTest1.class, _id);
+ em.find(RuntimeTest1.class, _id);
try {
em.persist(a);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java?rev=824071&r1=824070&r2=824071&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
Sun Oct 11 13:35:43 2009
@@ -38,8 +38,7 @@
}
public void setUp() throws Exception {
- deleteAll(Inner.class);
- deleteAll(Inner2.class);
+ super.setUp(Inner.class, Inner2.class);
EntityManager em = currentEntityManager();
startTx(em);
@@ -70,7 +69,7 @@
endEm(_pm);
_pm = currentEntityManager();
- _inner = (Inner) _pm.find(Inner.class, "string");
+ _inner = _pm.find(Inner.class, "string");
}
public void testOtherFields() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java?rev=824071&r1=824070&r2=824071&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
Sun Oct 11 13:35:43 2009
@@ -31,9 +31,8 @@
super(name, "kernelcactusapp");
}
- public void setUp() {
- deleteAll(InverseA.class);
- deleteAll(InverseB.class);
+ public void setUp() throws Exception {
+ super.setUp(InverseA.class, InverseB.class);
}
public void testOneOne() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java?rev=824071&r1=824070&r2=824071&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
Sun Oct 11 13:35:43 2009
@@ -32,8 +32,8 @@
super(name);
}
- public void setUp() {
- deleteAll(Entity1.class);
+ public void setUp() throws Exception {
+ super.setUp(Entity1.class, Entity2.class);
int instNum = 10;
