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/09 20:11:23 UTC
svn commit: r823649 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/
Author: mtylenda
Date: Fri Oct 9 18:11:23 2009
New Revision: 823649
URL: http://svn.apache.org/viewvc?rev=823649&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/TestQueries.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java Fri Oct 9 18:11:23 2009
@@ -30,14 +30,11 @@
import java.util.Collection;
import java.util.Iterator;
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-
-import org.apache.openjpa.persistence.Extent;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAQuery;
+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;
public class TestQueries extends BaseKernelTest {
@@ -53,8 +50,7 @@
public void setUp()
throws Exception {
- super.setUp();
- deleteAll(RuntimeTest1.class);
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
}
public void testSimpleQuery() {
@@ -141,7 +137,7 @@
// OpenJPAQuery q = pm.createNativeQuery("",RuntimeTest1.class);
OpenJPAQuery q = pm.createQuery("SELECT o FROM RuntimeTest1 o");
try {
- Collection c = (Collection) q.getResultList();
+ q.getResultList();
fail("Query.execute() should have thrown a JDOException when "
+ "PM is outside a Transaction and NTR==false");
} catch (Exception jdoe) {
@@ -158,7 +154,7 @@
private void deleteByQuery(Class type, boolean subs, String filter,
OpenJPAEntityManager pm) {
startTx(pm);
- Extent extent = pm.createExtent(type, subs);
+ pm.createExtent(type, subs);
//FIXME jthomas
// OpenJPAQuery query = pm.newQuery(extent, filter);
// Collection items = (Collection) query.execute();
@@ -167,7 +163,7 @@
OpenJPAQuery query =
pm.createQuery("SELECT o FROM " + cstrng + " o WHERE o." + filter);
query.setSubclasses(subs);
- Collection items = (Collection) query.getResultList();
+ Collection items = query.getResultList();
for (Iterator i = items.iterator(); i.hasNext();)
pm.remove(i.next());
@@ -186,14 +182,14 @@
private Collection runQuery(Class type, boolean subs, String filter,
OpenJPAEntityManager pm) {
- Extent extent = pm.createExtent(type, subs);
+ pm.createExtent(type, subs);
//FIXME jthomas
//Query query = pm.newQuery(extent, filter);
String cstrng = type.getName();
OpenJPAQuery query =
pm.createQuery("SELECT o FROM " + cstrng + " o WHERE o." + filter);
query.setSubclasses(subs);
- Collection results = (Collection) query.getResultList();
+ Collection results = query.getResultList();
return results;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java Fri Oct 9 18:11:23 2009
@@ -33,6 +33,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.kernel.Broker;
import org.apache.openjpa.kernel.OpenJPASavepoint;
@@ -46,7 +48,7 @@
private static final int RELEASED = 2;
private static final int ROLLBACK = 4;
- static Map _assigned = new HashMap();
+ static Map<String, TrackingSavepoint> _assigned = new HashMap<String, TrackingSavepoint>();
/**
* Creates a new instance of TestSavepointOrdering
@@ -55,8 +57,8 @@
super(name);
}
- public void setUp() {
- deleteAll(RuntimeTest1.class);
+ public void setUp() throws Exception {
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
_assigned.clear();
}
@@ -69,7 +71,7 @@
}
public void doCleanUpTest(boolean commit) {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName());
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -95,7 +97,7 @@
}
private void doOrderingTest(boolean rollback) {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName());
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -141,7 +143,7 @@
}
public void testDisallowFlush() {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName() + "(AllowFlush=false)");
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -159,7 +161,7 @@
}
public void testDisallowFlush2() {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName() + "(AllowFlush=false)");
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -178,7 +180,7 @@
}
public void testAllowFlush() {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName() + "(AllowFlush=true)");
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -197,7 +199,7 @@
}
public void testAllowFlush2() {
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
props.put("openjpa.SavepointManager",
TrackingSavepointManager.class.getName() + "(AllowFlush=true)");
OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -216,7 +218,7 @@
}
private void assertFlags(String name, int flag, int noflag) {
- TrackingSavepoint sp = (TrackingSavepoint) _assigned.get(name);
+ TrackingSavepoint sp = _assigned.get(name);
assertNotNull(sp);
assertEquals(sp.flags & flag, flag);
assertTrue((sp.flags & noflag) == 0);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java Fri Oct 9 18:11:23 2009
@@ -32,6 +32,7 @@
import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest5;
@@ -59,10 +60,8 @@
return properties;
}
- public void setUp() {
- deleteAll(ModRuntimeTest1.class);
- deleteAll(RuntimeTest4.class);
- deleteAll(RuntimeTest5.class);
+ public void setUp() throws Exception {
+ super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class, RuntimeTest4.class, RuntimeTest5.class);
}
public void testSimple() {
@@ -89,7 +88,7 @@
endTx(pm);
pm = getPM();
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
}
for (int i = 0; i < before; i++) {
pc.setStringField("before" + i);
@@ -123,7 +122,7 @@
endEm(pm);
pm = getPM();
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertEquals("value", pc.getStringField());
assertEquals(333, pc.getIntField());
//FIXME jthomas - setDateField
@@ -146,7 +145,7 @@
ModRuntimeTest1 pc2 = new ModRuntimeTest1("foo", 2);
pm.persist(pc2);
pm.setSavepoint("s1");
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertTrue(pm.isTransactional(pc));
pm.setSavepoint("s2");
pc.setStringField("bar");
@@ -170,7 +169,7 @@
pm = getPM();
pm.setOptimistic(false);
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
pc.setStringField("s1");
pm.setSavepoint("s1");
pc.setStringField("s2");
@@ -256,7 +255,7 @@
pm = getPM();
pm.setRetainState(true);
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
for (int i = 0; i < before; i++) {
pc.setSelfOneOne(new ModRuntimeTest1("before" + i, i));
@@ -288,7 +287,7 @@
endEm(pm);
pm = getPM();
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertEquals("orig", pc.getStringField());
if (before > 0)
assertEquals("before" + (before - 1),
@@ -325,7 +324,7 @@
pm = getPM();
pm.setRetainState(true);
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
for (int i = 0; i < before; i++) {
pc.setSelfOneOne(new ModRuntimeTest1("before" + i, i));
@@ -351,7 +350,7 @@
endEm(pm);
pm = getPM();
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertEquals("orig", pc.getStringField());
if (before > 0)
assertEquals("before" + (before - 1),
@@ -386,7 +385,7 @@
pm = getPM();
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertEquals(2, pc.getSelfOneMany().size());
for (Iterator it = pc.getSelfOneMany().iterator(); it.hasNext();) {
temp = (ModRuntimeTest1) it.next();
@@ -434,7 +433,7 @@
endEm(pm);
pm = getPM();
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
assertEquals("orig", pc.getStringField());
assertEquals(2 + before, pc.getSelfOneMany().size());
boolean found2 = false;
@@ -466,7 +465,7 @@
pm = getPM();
startTx(pm);
- pc = (RuntimeTest4) pm.find(RuntimeTest4.class, oid);
+ pc = pm.find(RuntimeTest4.class, oid);
assertEquals(12, pc.getRuntimeTest5s().size());
int count = 0;
for (Iterator i = pc.getRuntimeTest5s().iterator();
@@ -487,7 +486,7 @@
endEm(pm);
pm = getPM();
- pc = (RuntimeTest4) pm.find(RuntimeTest4.class, oid);
+ pc = pm.find(RuntimeTest4.class, oid);
assertEquals(8, pc.getRuntimeTest5s().size());
endEm(pm);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java Fri Oct 9 18:11:23 2009
@@ -33,13 +33,14 @@
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.OpenJPAEntityManager;
public class TestSecurityContext extends BaseKernelTest {
private SecurityManager oldManager;
- private StrictSecurityManager ssm;
/**
* Creates a new instance of TestSecurityContext
@@ -51,7 +52,8 @@
super(name);
}
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
oldManager = System.getSecurityManager();
// System.setSecurityManager (ssm = new StrictSecurityManager ());
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java Fri Oct 9 18:11:23 2009
@@ -45,6 +45,10 @@
super(name);
}
+ public void setUp() throws Exception {
+ super.setUp(AImplB.class);
+ }
+
public void testSequence() {
OpenJPAEntityManager pm = getPM();
startTx(pm);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java Fri Oct 9 18:11:23 2009
@@ -31,6 +31,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.Extent;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
@@ -45,8 +47,8 @@
super(name);
}
- public void setUp() {
- deleteAll(RuntimeTest1.class);
+ public void setUp() throws Exception {
+ super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
}
public void testSimple() {
@@ -117,7 +119,7 @@
String delete = "DELETE FROM RuntimeTest1 r "
+ "WHERE r.stringField = \'testSimple2\'";
OpenJPAQuery deleteQuery = pm.createQuery(delete);
- int deleted = deleteQuery.executeUpdate();
+ deleteQuery.executeUpdate();
endTx(pm);
endEm(pm);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java Fri Oct 9 18:11:23 2009
@@ -29,6 +29,7 @@
import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
import org.apache.openjpa.kernel.OpenJPAStateManager;
import org.apache.openjpa.meta.ClassMetaData;
@@ -52,6 +53,10 @@
super(test);
}
+ public void setUp() throws Exception {
+ super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class);
+ }
+
public void setUpMetaData(ClassMetaData meta) {
_meta = meta;
_f1 = _meta.getField(1).usesImplData();
@@ -119,7 +124,6 @@
}
public void testNotClearedIfRetainValues() {
- deleteAll(ModRuntimeTest1.class);
notClearedIfRetainValuesTest(true);
notClearedIfRetainValuesTest(false);
}
@@ -149,7 +153,7 @@
// test in next transaction
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
sm = getStateManager(pc, pm);
assertNotNull(sm);
if (pm.getOptimistic())
@@ -164,7 +168,7 @@
// test in another pm for good measure
pm = getPM(optimistic, true);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
sm = getStateManager(pc, pm);
assertNotNull(sm);
setUpMetaData(sm.getMetaData());
@@ -174,7 +178,7 @@
// test in transaction; re-lookup pc to be sure it enters the trans
startTx(pm);
- pc = (ModRuntimeTest1) pm.find(ModRuntimeTest1.class, oid);
+ pc = pm.find(ModRuntimeTest1.class, oid);
if (pm.getOptimistic())
assertEquals(value, sm.getImplData(key));
else {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java Fri Oct 9 18:11:23 2009
@@ -50,6 +50,7 @@
public void setUp()
throws Exception {
+ super.setUp(Inner.class);
Inner inner = new Inner("foo");
inner.addTwin();
OpenJPAEntityManager pm = getPM();
@@ -62,7 +63,7 @@
public void testGetById() {
OpenJPAEntityManager pm = getPM();
- Inner inner = (Inner) pm.find(Inner.class, _oid);
+ Inner inner = pm.find(Inner.class, _oid);
assertNotNull(inner);
assertEquals("foo", inner.getString());
endEm(pm);
@@ -122,6 +123,7 @@
@Table(name="StaticInner")
public static class Inner {
+ @SuppressWarnings("unused")
private int num = 0;
private String string = null;
private List twins = new LinkedList();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java Fri Oct 9 18:11:23 2009
@@ -45,6 +45,10 @@
super(name);
}
+ public void setUp() throws Exception {
+ super.setUp(BlobTest.class);
+ }
+
public void testStoreBlob() {
OpenJPAEntityManager pm;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java?rev=823649&r1=823648&r2=823649&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java Fri Oct 9 18:11:23 2009
@@ -46,6 +46,7 @@
}
public void setUp() throws Exception {
+ super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class, PersistenceAware.class);
try {
OpenJPAEntityManager pm = getPM(false, false);
supportsPessimistic = !pm.getOptimistic();
@@ -129,8 +130,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertPersistent(b, true, false, false, false);
assertPersistent(b.getSelfOneOne(), true, false, false, false);
@@ -153,8 +153,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertPersistent(b, true, false, false, false);
assertPersistent(b.getSelfOneOne(), true, false, false, false);
@@ -176,8 +175,7 @@
return;
OpenJPAEntityManager pm = getPM(false, false);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertPersistent(b, false, false, false, false);
assertPersistent(b.getSelfOneOne(), false, false, false, false);
@@ -197,8 +195,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
pm.remove(b);
assertPersistent(b, true, false, true, true);
@@ -223,8 +220,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
pm.remove(b);
assertPersistent(b, true, false, true, true);
@@ -298,8 +294,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
changeTest2(b);
endTx(pm);
@@ -320,8 +315,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
changeTest2(b);
endTx(pm);
@@ -342,8 +336,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -365,8 +358,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -388,8 +380,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
assertNotNull("parent is null", parent);
pm.remove(b);
@@ -417,8 +408,7 @@
OpenJPAEntityManager pm = getPM(false, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
pm.remove(b);
@@ -480,8 +470,7 @@
OpenJPAEntityManager pm = getPM(true, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -500,8 +489,7 @@
OpenJPAEntityManager pm = getPM(true, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -520,8 +508,7 @@
OpenJPAEntityManager pm = getPM(true, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
assertNotNull("parent is null", parent);
pm.remove(b);
@@ -546,8 +533,7 @@
OpenJPAEntityManager pm = getPM(true, false);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
pm.remove(b);
rollbackTx(pm);
@@ -608,8 +594,7 @@
OpenJPAEntityManager pm = getPM(true, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -628,8 +613,7 @@
OpenJPAEntityManager pm = getPM(true, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -648,8 +632,7 @@
OpenJPAEntityManager pm = getPM(true, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
assertNotNull("parent is null", parent);
@@ -675,8 +658,7 @@
OpenJPAEntityManager pm = getPM(true, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
pm.remove(b);
rollbackTx(pm);
@@ -749,8 +731,7 @@
OpenJPAEntityManager pm = getPM(false, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -772,8 +753,7 @@
OpenJPAEntityManager pm = getPM(false, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
assertTest2Orig(b);
changeTest2(b);
@@ -794,8 +774,7 @@
OpenJPAEntityManager pm = getPM(false, true);
startTx(pm);
- ModRuntimeTest2 b = (ModRuntimeTest2) pm.find(ModRuntimeTest2.class,
- _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
ModRuntimeTest1 parent = b.getSelfOneOne();
assertNotNull("parent is null", parent);
pm.remove(b);
@@ -823,8 +802,7 @@
OpenJPAEntityManager pm = getPM(false, true);
startTx(pm);
- ModRuntimeTest2 b =
- (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, _id);
+ ModRuntimeTest2 b = pm.find(ModRuntimeTest2.class, _id);
pm.remove(b);
rollbackTx(pm);
@@ -900,7 +878,7 @@
pm = getPM(false, false);
//FIXME jthomas
- b = (ModRuntimeTest2) pm.find(ModRuntimeTest2.class, oid);
+ b = pm.find(ModRuntimeTest2.class, oid);
pm.retrieve(b);
//FIXME jthomas
endEm(pm);
@@ -975,11 +953,10 @@
*/
public void assertPersistent(Object a, boolean isTrans, boolean isNew,
boolean isDeleted, boolean isDirty) {
- OpenJPAEntityManager pm =
- (OpenJPAEntityManager) currentEntityManager();
+ OpenJPAEntityManager pm = currentEntityManager();
assertTrue(pm.isPersistent(a));
- PersistenceCapable xman = (PersistenceCapable) a;
+ assertTrue(a instanceof PersistenceCapable);
assertEquals(isTrans, pm.isTransactional(a));
assertEquals(isNew, pm.isNewlyPersistent(a));