You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mt...@apache.org on 2009/10/17 16:49:55 UTC
svn commit: r826264 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/
Author: mtylenda
Date: Sat Oct 17 14:49:54 2009
New Revision: 826264
URL: http://svn.apache.org/viewvc?rev=826264&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/TestEJBGetObjectByIdValue.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java Sat Oct 17 14:49:54 2009
@@ -23,19 +23,18 @@
import org.apache.openjpa.persistence.kernel.common.apps.AImplB;
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 TestEJBGetObjectByIdValue extends AbstractTestCase {
- private Object[] oids;
-
public TestEJBGetObjectByIdValue(String name) {
super(name, "kernelcactusapp");
}
public void setUp() throws Exception {
- deleteAll(RuntimeTest1.class);
- deleteAll(AImplB.class);
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class, AImplB.class);
EntityManager em = currentEntityManager();
startTx(em);
@@ -56,12 +55,12 @@
endEm(em);
em = currentEntityManager();
- pc = (RuntimeTest1) em.find(RuntimeTest1.class, 1);
+ pc = em.find(RuntimeTest1.class, 1);
assertEquals("foo", pc.getStringField());
em.close();
em = currentEntityManager();
- pc = (RuntimeTest1) em.find(RuntimeTest1.class, pc.getIntField());
+ pc = em.find(RuntimeTest1.class, pc.getIntField());
assertEquals("foo", pc.getStringField());
endEm(em);
}
@@ -78,12 +77,12 @@
endEm(em);
em = currentEntityManager();
- pc = (AImplB) em.find(AImplB.class, oid);
+ pc = em.find(AImplB.class, oid);
assertEquals("foo", pc.getName());
endEm(em);
em = currentEntityManager();
- pc = (AImplB) em.find(AImplB.class, oid.toString());
+ pc = em.find(AImplB.class, oid.toString());
assertEquals("foo", pc.getName());
endEm(em);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java Sat Oct 17 14:49:54 2009
@@ -24,6 +24,7 @@
import org.apache.openjpa.persistence.kernel.common.apps.InterfaceHolder;
import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl1;
import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl2;
+import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl3;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
/**
@@ -37,16 +38,14 @@
super(name, "kernelcactusapp");
}
+ @Override
+ public void setUp() throws Exception {
+ super.setUp(InterfaceTestImpl1.class, InterfaceTestImpl2.class, InterfaceTestImpl3.class,
+ InterfaceHolder.class);
+ }
+
@SuppressWarnings("unchecked")
public void testInterfaceField() {
- try {
- deleteAll(InterfaceTestImpl1.class);
- deleteAll(InterfaceTestImpl2.class);
- deleteAll(InterfaceHolder.class);
- }
- catch (Exception e) {
- }
-
EntityManager em2 = currentEntityManager();
startTx(em2);
@@ -65,8 +64,7 @@
em = currentEntityManager();
startTx(em);
- InterfaceHolder hold =
- (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ InterfaceHolder hold = em.find(InterfaceHolder.class, 1);
assertNotNull(hold.getIntf());
assertEquals("intf-1-field", hold.getIntf().getStringField());
endTx(em);
@@ -74,7 +72,7 @@
em = currentEntityManager();
startTx(em);
- hold = (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ hold = em.find(InterfaceHolder.class, 1);
hold.setIntf(null);
assertNull(hold.getIntf());
endTx(em);
@@ -82,14 +80,14 @@
em = currentEntityManager();
startTx(em);
- hold = (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ hold = em.find(InterfaceHolder.class, 1);
assertNull(hold.getIntf());
endTx(em);
endEm(em);
em = currentEntityManager();
startTx(em);
- hold = (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ hold = em.find(InterfaceHolder.class, 1);
hold.setIntf(new InterfaceTestImpl2("intf-2-field"));
assertEquals("intf-2-field", hold.getIntf().getStringField());
endTx(em);
@@ -97,7 +95,7 @@
em = currentEntityManager();
startTx(em);
- hold = (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ hold = em.find(InterfaceHolder.class, 1);
assertNotNull(hold.getIntf());
assertEquals("intf-2-field", hold.getIntf().getStringField());
endTx(em);
@@ -105,7 +103,7 @@
em = currentEntityManager();
startTx(em);
- hold = (InterfaceHolder) em.find(InterfaceHolder.class, 1);
+ hold = em.find(InterfaceHolder.class, 1);
hold.getIntfs().add(new InterfaceTestImpl1("intf-1-set"));
endTx(em);
endEm(em);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java Sat Oct 17 14:49:54 2009
@@ -25,6 +25,8 @@
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 TestEJBLocales extends AbstractTestCase {
@@ -33,8 +35,8 @@
super(name, "kernelcactusapp");
}
- public void setUp() {
- deleteAll(RuntimeTest1.class);
+ public void setUp() throws Exception {
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
}
public void testLocales() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java Sat Oct 17 14:49:54 2009
@@ -30,8 +30,8 @@
super(name, "kernelcactusapp");
}
- public void setUp() {
- deleteAll(Inner.class);
+ public void setUp() throws Exception {
+ super.setUp(Inner.class);
}
public void testException() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java Sat Oct 17 14:49:54 2009
@@ -27,14 +27,12 @@
public class TestEJBState extends AbstractTestCase {
- private static final int INSERT_COUNT = 20;
-
public TestEJBState(String name) {
super(name, "kernelcactusapp");
}
- public void setUp() {
- deleteAll(AllFieldsTypeTest.class);
+ public void setUp() throws Exception {
+ super.setUp(AllFieldsTypeTest.class);
}
public void testBigDecimalsLoseTrailingZeros() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java?rev=826264&r1=826263&r2=826264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java Sat Oct 17 14:49:54 2009
@@ -20,14 +20,13 @@
import javax.persistence.EntityManager;
-
-import org.apache.openjpa.persistence.kernel.common.apps.UnAnnotPojo;
import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-/*
- * @author Afam Okeke
+import org.apache.openjpa.persistence.kernel.common.apps.UnAnnotPojo;
+
+/**
* Ensures that pojo that is not persistent capable cannot be persisted.
+ * @author Afam Okeke
*/
-
public class TestPojoWithoutAnnotationsCannotBePersisted
extends AbstractTestCase {
@@ -37,7 +36,8 @@
super(name, "kernelcactusapp");
}
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp(new Object[] {});
pojo = new UnAnnotPojo();
pojo.setName("failure");
pojo.setNum(0);