You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/08/08 00:45:36 UTC
svn commit: r802261 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java
Author: mikedd
Date: Fri Aug 7 22:45:35 2009
New Revision: 802261
URL: http://svn.apache.org/viewvc?rev=802261&view=rev
Log:
Refactor write behind testcase to use static EMFs.
modified: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java?rev=802261&r1=802260&r2=802261&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/writebehind/AbstractWriteBehindTestCase.java Fri Aug 7 22:45:35 2009
@@ -25,12 +25,13 @@
import org.apache.openjpa.jdbc.writebehind.entities.SimpleNonGeneratedIdEntity;
import org.apache.openjpa.jdbc.writebehind.entities.SimpleTableGeneratedIdEntity;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.test.PersistenceTestCase;
import org.apache.openjpa.writebehind.WriteBehindCache;
import org.apache.openjpa.writebehind.WriteBehindCacheManager;
import org.apache.openjpa.writebehind.WriteBehindCallback;
-public abstract class AbstractWriteBehindTestCase extends SingleEMTestCase {
+public abstract class AbstractWriteBehindTestCase extends PersistenceTestCase {
protected static Object[] writeBehindProps =
new Object[] {
"openjpa.DataCache", "true",
@@ -47,17 +48,27 @@
SimpleNonGeneratedIdEntity.class, SimpleTableGeneratedIdEntity.class,
AbstractSimpleEntity.class };
- protected EntityManagerFactory _validatorEMF = null;
+ protected static OpenJPAEntityManagerFactorySPI _validatorEMF = null;
+ protected static OpenJPAEntityManagerFactorySPI emf = null;
+ protected OpenJPAEntityManagerSPI em = null;
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
if(emf == null) {
- super.setUp(writeBehindProps);
+ emf = createEMF(writeBehindProps);
}
if(_validatorEMF == null) {
_validatorEMF = createEMF(validatorProps);
}
+ em = emf.createEntityManager();
}
+ public void tearDown() throws Exception {
+ em.close();
+ super.tearDown();
+ }
+
+
public static Object[] getDefaultWriteBehindProperties() {
return writeBehindProps;
}
@@ -66,10 +77,8 @@
return getWBCacheManager(emf);
}
- protected WriteBehindCacheManager getWBCacheManager(
- OpenJPAEntityManagerFactorySPI factory) {
- WriteBehindCacheManager wbcm =
- factory.getConfiguration().getWriteBehindCacheManagerInstance();
+ protected WriteBehindCacheManager getWBCacheManager(OpenJPAEntityManagerFactorySPI factory) {
+ WriteBehindCacheManager wbcm = factory.getConfiguration().getWriteBehindCacheManagerInstance();
return wbcm;
}
@@ -91,8 +100,7 @@
return factory.getConfiguration().getWriteBehindCallbackInstance();
}
- protected WriteBehindCache getWBCache(
- OpenJPAEntityManagerFactorySPI factory, String name) {
+ protected WriteBehindCache getWBCache(OpenJPAEntityManagerFactorySPI factory, String name) {
WriteBehindCache wbc = null;
if (StringUtils.isEmpty(name)) {
wbc = getWBCacheManager(factory).getSystemWriteBehindCache();
@@ -101,13 +109,8 @@
}
return wbc;
}
-
+
protected EntityManagerFactory getValidatorEMF() {
return _validatorEMF;
}
-
- public void tearDown() throws Exception {
- // intentionally skip super.tearDown()
- }
-
}