Author: dwoods
Date: Fri Oct 8 15:22:14 2010
New Revision: 1005856
URL: http://svn.apache.org/viewvc?rev=1005856&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java?rev=1005856&r1=1005855&r2=1005856&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
Fri Oct 8 15:22:14 2010
@@ -238,12 +238,11 @@ public abstract class AbstractBrokerSeri
}
public void testInMemorySavepointsWithNewInstances() {
- emf.close();
- OpenJPAEntityManagerFactory emf = createEMF(
+ OpenJPAEntityManagerFactory emf1 = createEMF(
getManagedType(), getSecondaryType(),
"openjpa.EntityManagerFactoryPool", "true",
"openjpa.SavepointManager", "in-mem");
- OpenJPAEntityManager em = emf.createEntityManager();
+ OpenJPAEntityManager em = emf1.createEntityManager();
OpenJPAEntityManager em2 = null;
try {
em.getTransaction().begin();
@@ -267,16 +266,17 @@ public abstract class AbstractBrokerSeri
} finally {
close(em);
close(em2);
+ clear(emf1);
+ closeEMF(emf1);
}
}
public void testInMemorySavepointsWithModifiedInstances() {
- emf.close();
- OpenJPAEntityManagerFactory emf = createEMF(
+ OpenJPAEntityManagerFactory emf1 = createEMF(
getManagedType(), getSecondaryType(),
"openjpa.EntityManagerFactoryPool", "true",
"openjpa.SavepointManager", "in-mem");
- OpenJPAEntityManager em = emf.createEntityManager();
+ OpenJPAEntityManager em = emf1.createEntityManager();
OpenJPAEntityManager em2 = null;
try {
em.getTransaction().begin();
@@ -298,6 +298,8 @@ public abstract class AbstractBrokerSeri
} finally {
close(em);
close(em2);
+ clear(emf1);
+ closeEMF(emf1);
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java?rev=1005856&r1=1005855&r2=1005856&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
Fri Oct 8 15:22:14 2010
@@ -18,7 +18,6 @@
*/
package org.apache.openjpa.kernel;
-import java.util.List;
import java.util.Collections;
import javax.persistence.EntityManager;
@@ -30,17 +29,22 @@ import org.apache.openjpa.persistence.JP
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.query.SimpleEntity;
import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.persistence.test.PersistenceTestCase;
public class TestDynamicClassRegistration
extends AbstractCachedEMFTestCase {
- private OpenJPAEntityManagerFactorySPI emf;
+ private OpenJPAEntityManagerFactorySPI emf1;
+ @Override
public void setUp() throws Exception {
super.setUp();
+ emf1 = createNamedEMF("empty-pu");
+ }
- emf = createNamedEMF("empty-pu");
+ public void tearDown() throws Exception {
+ super.tearDown();
+ clear(emf1);
+ closeEMF(emf1);
}
public void testEnhancedDynamicClassRegistration()
@@ -53,9 +57,9 @@ public class TestDynamicClassRegistratio
getClass().getClassLoader());
ClassMetaData meta =
- JPAFacadeHelper.getMetaData(emf, SimpleEntity.class);
+ JPAFacadeHelper.getMetaData(emf1, SimpleEntity.class);
assertNotNull(meta);
- EntityManager em = emf.createEntityManager();
+ EntityManager em = emf1.createEntityManager();
javax.persistence.Query q = em.createQuery("select o from simple o");
em.close();
}
@@ -66,14 +70,14 @@ public class TestDynamicClassRegistratio
// trigger class initialization
ManagedClassSubclasser.prepareUnenhancedClasses(
- emf.getConfiguration(),
+ emf1.getConfiguration(),
Collections.singleton(UnenhancedFieldAccess.class),
null);
ClassMetaData meta =
- JPAFacadeHelper.getMetaData(emf, UnenhancedFieldAccess.class);
+ JPAFacadeHelper.getMetaData(emf1, UnenhancedFieldAccess.class);
assertNotNull(meta);
- EntityManager em = emf.createEntityManager();
+ EntityManager em = emf1.createEntityManager();
javax.persistence.Query q = em.createQuery(
"select o from UnenhancedFieldAccess o");
em.close();
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java?rev=1005856&r1=1005855&r2=1005856&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
Fri Oct 8 15:22:14 2010
@@ -38,16 +38,20 @@ public class TestEntityManagerFactoryPoo
Map m = new HashMap();
// also tests string values for the property
m.put("openjpa.EntityManagerFactoryPool", "True");
- EntityManagerFactory emf = Persistence.createEntityManagerFactory(
+ EntityManagerFactory emf1 = Persistence.createEntityManagerFactory(
"test", m);
- assertSame(this.emf, emf);
+ assertSame(this.emf, emf1);
+ clear(emf1);
+ closeEMF(emf1);
}
public void testBrokerFactoryPoolMiss() {
Map m = new HashMap();
m.put("openjpa.EntityManagerFactoryPool", Boolean.TRUE);
- EntityManagerFactory emf = Persistence.createEntityManagerFactory(
+ EntityManagerFactory emf1 = Persistence.createEntityManagerFactory(
"second-persistence-unit", m);
- assertNotSame(this.emf, emf);
+ assertNotSame(this.emf, emf1);
+ clear(emf1);
+ closeEMF(emf1);
}
}
