Author: dwoods
Date: Fri Oct 8 13:53:54 2010
New Revision: 1005828
URL: http://svn.apache.org/viewvc?rev=1005828&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
Fri Oct 8 13:53:54 2010
@@ -44,6 +44,8 @@ public class TestAutoDetachProperty exte
public void tearDown() throws Exception {
em.close();
em = null;
+ emf.close();
+ emf = null;
}
public void testIsAutoDetachingOnClose() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadAutoDetachProperty.java
Fri Oct 8 13:53:54 2010
@@ -25,31 +25,28 @@ import javax.persistence.EntityManagerFa
import javax.persistence.Persistence;
import javax.persistence.PersistenceException;
-import junit.framework.TestCase;
-
import org.apache.openjpa.lib.util.ParseException;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
-public class TestBadAutoDetachProperty extends TestCase {
+public class TestBadAutoDetachProperty extends AbstractPersistenceTestCase {
public void testEmptyValue() {
HashMap props = new HashMap(System.getProperties());
props.put("openjpa.AutoDetach", "");
- EntityManagerFactory emf = (OpenJPAEntityManagerFactory) Persistence
- .createEntityManagerFactory("test", props);
+ EntityManagerFactory emf = createNamedEMF("test", props);
EntityManager em = emf.createEntityManager();
- em.close();
- emf.close();
+ clear(emf);
+ closeEMF(emf);
}
public void testCommaOnlyValue() {
+ EntityManagerFactory emf = null;
+ EntityManager em = null;
try {
HashMap props = new HashMap(System.getProperties());
props.put("openjpa.AutoDetach", ",");
- EntityManagerFactory emf = (OpenJPAEntityManagerFactory)
Persistence
- .createEntityManagerFactory("test", props);
- EntityManager em = emf.createEntityManager();
- em.close();
- emf.close();
+ emf = createNamedEMF("test", props);
+ em = emf.createEntityManager();
} catch (PersistenceException e) {
Throwable cause = e.getCause();
if (cause != null) {
@@ -70,18 +67,20 @@ public class TestBadAutoDetachProperty e
} catch (RuntimeException e) {
fail("Should have caught a PersistenceException, instead caught: "
+ e);
+ } finally {
+ clear(emf);
+ closeEMF(emf);
}
}
public void testEmptyItemValue() {
+ EntityManagerFactory emf = null;
+ EntityManager em = null;
try {
HashMap props = new HashMap(System.getProperties());
props.put("openjpa.AutoDetach", "close,,commit");
- EntityManagerFactory emf = (OpenJPAEntityManagerFactory)
Persistence
- .createEntityManagerFactory("test", props);
- EntityManager em = emf.createEntityManager();
- em.close();
- emf.close();
+ emf = createNamedEMF("test", props);
+ em = emf.createEntityManager();
} catch (PersistenceException e) {
Throwable cause = e.getCause();
if (cause != null) {
@@ -102,6 +101,9 @@ public class TestBadAutoDetachProperty e
} catch (RuntimeException e) {
fail("Should have caught a PersistenceException, instead caught: "
+ e);
+ } finally {
+ clear(emf);
+ closeEMF(emf);
}
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
Fri Oct 8 13:53:54 2010
@@ -81,7 +81,8 @@ public class TestCacheMarshallerEndToEnd
assertContains(log.lines, " " + AllFieldTypes.class.getName());
assertContains(log.lines, " " + NamedQueryEntity.class.getName());
assertContains(log.lines, " NamedQueryEntity.namedQuery");
- emf.close();
+ clear(emf);
+ closeEMF(emf);
emf = createEMF(LOAD_PROPS);
EntityManager em = emf.createEntityManager();
@@ -92,7 +93,8 @@ public class TestCacheMarshallerEndToEnd
assertEquals(1, q.getResultList().size());
em.getTransaction().rollback();
em.close();
- emf.close();
+ clear(emf);
+ closeEMF(emf);
}
private void assertContains(List<String> lines, String prefix) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
Fri Oct 8 13:53:54 2010
@@ -48,12 +48,19 @@ public class TestDynamicConfiguration ex
assertNotNull(emf2);
OpenJPAConfiguration conf2 = emf2.getConfiguration();
- assertFalse(emf1==emf2);
- assertFalse(emf1.equals(emf2));
- assertFalse(conf1==conf2);
- assertEquals(conf1, conf2);
- assertEquals(conf1.hashCode(), conf2.hashCode());
- assertEquals(conf1.toProperties(false), conf2.toProperties(false));
+ try {
+ assertFalse(emf1==emf2);
+ assertFalse(emf1.equals(emf2));
+ assertFalse(conf1==conf2);
+ assertEquals(conf1, conf2);
+ assertEquals(conf1.hashCode(), conf2.hashCode());
+ assertEquals(conf1.toProperties(false),
conf2.toProperties(false));
+ } finally {
+ clear(emf1);
+ closeEMF(emf1);
+ clear(emf2);
+ closeEMF(emf2);
+ }
}
public void testConfigurationIsReadOnlyAfterFirstConstruction() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
Fri Oct 8 13:53:54 2010
@@ -177,14 +177,8 @@ public class TestQueryProperties extends
qTime.intValue(), timeout.intValue());
} finally {
// cleanup
- if ((em1 != null) && em1.isOpen())
- em1.close();
- if (emf1 != null)
- emf1.close();
- if ((em2 != null) && em2.isOpen())
- em2.close();
- if (emf2!= null)
- emf2.close();
+ closeEMF(emf1);
+ closeEMF(emf2);
}
}
@@ -300,14 +294,8 @@ public class TestQueryProperties extends
qTime.intValue(), timeout.intValue());
} finally {
// cleanup
- if ((em1 != null) && em1.isOpen())
- em1.close();
- if (emf1 != null)
- emf1.close();
- if ((em2 != null) && em2.isOpen())
- em2.close();
- if (emf2!= null)
- emf2.close();
+ closeEMF(emf1);
+ closeEMF(emf2);
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java?rev=1005828&r1=1005827&r2=1005828&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestSpecificationConfiguration.java
Fri Oct 8 13:53:54 2010
@@ -66,9 +66,8 @@ public class TestSpecificationConfigurat
assertEquals(2, major);
assertTrue(spec.isSame("JPA"));
} finally {
- if (emf1 != null) {
- emf1.close();
- }
+ clear(emf1);
+ closeEMF(emf1);
}
}
