Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure tests cleanup EMs and EMFs 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1005859 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-10-08 15:29:54 +00:00
parent 28f75cc187
commit 4c648a0522
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java
View File

@ -52,7 +52,7 @@ import junit.framework.TestCase;
@DatabasePlatform("org.apache.derby.jdbc.EmbeddedDriver") @DatabasePlatform("org.apache.derby.jdbc.EmbeddedDriver")
public class TestEquivalentConfiguration extends SingleEMFTestCase { public class TestEquivalentConfiguration extends SingleEMFTestCase {
private EntityManagerFactory emf; private EntityManagerFactory emf1 = null;
private Properties _system; private Properties _system;
@ -106,16 +106,21 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
public void tearDown() throws Exception { public void tearDown() throws Exception {
restore(_system); restore(_system);
super.tearDown(); super.tearDown();
if (emf1 != null) {
clear(emf1);
closeEMF(emf1);
emf1 = null;
}
} }
/** /**
* Tests that openjpa.* namespace can be used for persistence.xml. * Tests that openjpa.* namespace can be used for persistence.xml.
*/ */
public void testOldStylePersistenceUnitConfiguration() { public void testOldStylePersistenceUnitConfiguration() {
emf = OpenJPAPersistence.createEntityManagerFactory(OLD_STYLE_UNIT_NAME, emf1 = OpenJPAPersistence.createEntityManagerFactory(OLD_STYLE_UNIT_NAME,
PERSISTENCE_UNIT); PERSISTENCE_UNIT);
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY)); assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY));
assertTrue(containsProperty(OLD_STYLE_URL_KEY)); assertTrue(containsProperty(OLD_STYLE_URL_KEY));
assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY)); assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY));
@ -128,10 +133,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
* Tests that javax.* namespace can be used for persistence.xml. * Tests that javax.* namespace can be used for persistence.xml.
*/ */
public void testNewStylePersistenceUnitConfiguration() { public void testNewStylePersistenceUnitConfiguration() {
emf = OpenJPAPersistence.createEntityManagerFactory(NEW_STYLE_UNIT_NAME, emf1 = OpenJPAPersistence.createEntityManagerFactory(NEW_STYLE_UNIT_NAME,
PERSISTENCE_UNIT); PERSISTENCE_UNIT);
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY)); assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY));
assertTrue(containsProperty(NEW_STYLE_URL_KEY)); assertTrue(containsProperty(NEW_STYLE_URL_KEY));
assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY)); assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY));
@ -145,10 +150,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
* persistence.xml. * persistence.xml.
*/ */
public void testMixedStylePersistenceUnitConfiguration() { public void testMixedStylePersistenceUnitConfiguration() {
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
MIXED_STYLE_UNIT_NAME, PERSISTENCE_UNIT); MIXED_STYLE_UNIT_NAME, PERSISTENCE_UNIT);
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY)); assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY));
assertFalse(containsProperty(NEW_STYLE_URL_KEY)); assertFalse(containsProperty(NEW_STYLE_URL_KEY));
assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY)); assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY));
@ -165,7 +170,7 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
public void testConflictStylePersistenceUnitConfiguration() { public void testConflictStylePersistenceUnitConfiguration() {
try { try {
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
CONFLICT_STYLE_UNIT_NAME, PERSISTENCE_UNIT); CONFLICT_STYLE_UNIT_NAME, PERSISTENCE_UNIT);
fail(); fail();
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
@ -181,14 +186,14 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
System.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER); System.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER);
System.setProperty(NEW_STYLE_URL_KEY, URL); System.setProperty(NEW_STYLE_URL_KEY, URL);
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT); SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT);
} finally { } finally {
System.getProperties().remove(NEW_STYLE_DRIVER_KEY); System.getProperties().remove(NEW_STYLE_DRIVER_KEY);
System.getProperties().remove(NEW_STYLE_URL_KEY); System.getProperties().remove(NEW_STYLE_URL_KEY);
} }
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY)); assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY));
assertTrue(containsProperty(NEW_STYLE_URL_KEY)); assertTrue(containsProperty(NEW_STYLE_URL_KEY));
assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY)); assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY));
@ -205,13 +210,13 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER); System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER);
System.setProperty(OLD_STYLE_URL_KEY, URL); System.setProperty(OLD_STYLE_URL_KEY, URL);
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT); SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT);
} finally { } finally {
System.getProperties().remove(OLD_STYLE_DRIVER_KEY); System.getProperties().remove(OLD_STYLE_DRIVER_KEY);
System.getProperties().remove(OLD_STYLE_URL_KEY); System.getProperties().remove(OLD_STYLE_URL_KEY);
} }
assertNotNull(emf); assertNotNull(emf1);
assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY)); assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY));
assertFalse(containsProperty(NEW_STYLE_URL_KEY)); assertFalse(containsProperty(NEW_STYLE_URL_KEY));
assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY)); assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY));
@ -228,14 +233,14 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER); System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER);
System.setProperty(NEW_STYLE_URL_KEY, URL); System.setProperty(NEW_STYLE_URL_KEY, URL);
try { try {
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT); SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT);
} finally { } finally {
System.getProperties().remove(OLD_STYLE_DRIVER_KEY); System.getProperties().remove(OLD_STYLE_DRIVER_KEY);
System.getProperties().remove(NEW_STYLE_URL_KEY); System.getProperties().remove(NEW_STYLE_URL_KEY);
} }
assertNotNull(emf); assertNotNull(emf1);
assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY)); assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY));
assertTrue(containsProperty(NEW_STYLE_URL_KEY)); assertTrue(containsProperty(NEW_STYLE_URL_KEY));
assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY)); assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY));
@ -252,7 +257,7 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER); System.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER);
System.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER); System.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER);
try { try {
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT); SYSTEM_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT);
fail(); fail();
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
@ -271,10 +276,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
conf.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER); conf.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER);
conf.setProperty(OLD_STYLE_URL_KEY, URL); conf.setProperty(OLD_STYLE_URL_KEY, URL);
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf); RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf);
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY)); assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY));
assertTrue(containsProperty(OLD_STYLE_URL_KEY)); assertTrue(containsProperty(OLD_STYLE_URL_KEY));
assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY)); assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY));
@ -291,10 +296,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
conf.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER); conf.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER);
conf.setProperty(NEW_STYLE_URL_KEY, URL); conf.setProperty(NEW_STYLE_URL_KEY, URL);
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf); RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf);
assertNotNull(emf); assertNotNull(emf1);
assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY)); assertFalse(containsProperty(OLD_STYLE_DRIVER_KEY));
assertFalse(containsProperty(OLD_STYLE_URL_KEY)); assertFalse(containsProperty(OLD_STYLE_URL_KEY));
assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY)); assertTrue(containsProperty(NEW_STYLE_DRIVER_KEY));
@ -312,10 +317,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
conf.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER); conf.setProperty(OLD_STYLE_DRIVER_KEY, DRIVER);
conf.setProperty(NEW_STYLE_URL_KEY, URL); conf.setProperty(NEW_STYLE_URL_KEY, URL);
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf); RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf);
assertNotNull(emf); assertNotNull(emf1);
assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY)); assertTrue(containsProperty(OLD_STYLE_DRIVER_KEY));
assertFalse(containsProperty(OLD_STYLE_URL_KEY)); assertFalse(containsProperty(OLD_STYLE_URL_KEY));
assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY)); assertFalse(containsProperty(NEW_STYLE_DRIVER_KEY));
@ -334,7 +339,7 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
conf.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER); conf.setProperty(NEW_STYLE_DRIVER_KEY, DRIVER);
try { try {
emf = OpenJPAPersistence.createEntityManagerFactory( emf1 = OpenJPAPersistence.createEntityManagerFactory(
RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf); RUNTIME_CONFIGURED_UNIT_NAME, PERSISTENCE_UNIT, conf);
fail(); fail();
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
@ -343,10 +348,10 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
} }
void verifyDatabaseConnection() { void verifyDatabaseConnection() {
String driver = OpenJPAPersistence.cast(emf).getConfiguration() String driver = OpenJPAPersistence.cast(emf1).getConfiguration()
.getConnectionDriverName(); .getConnectionDriverName();
EntityManager em = emf.createEntityManager(); EntityManager em = emf1.createEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();
em.flush(); em.flush();
em.getTransaction().commit(); em.getTransaction().commit();
@ -357,7 +362,7 @@ public class TestEquivalentConfiguration extends SingleEMFTestCase {
} }
OpenJPAConfiguration getConfiguration() { OpenJPAConfiguration getConfiguration() {
return ((OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.cast(emf)) return ((OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.cast(emf1))
.getConfiguration(); .getConfiguration();
} }