You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/10/13 20:35:46 UTC
svn commit: r1022228 - in
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc:
./ annotations/
Author: dwoods
Date: Wed Oct 13 18:35:46 2010
New Revision: 1022228
URL: http://svn.apache.org/viewvc?rev=1022228&view=rev
Log:
make sure tests close EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java?rev=1022228&r1=1022227&r2=1022228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java Wed Oct 13 18:35:46 2010
@@ -24,19 +24,15 @@ import javax.persistence.Id;
import javax.persistence.OneToOne;
import javax.persistence.Persistence;
-import junit.framework.TestCase;
-
import org.apache.openjpa.jdbc.meta.MappingRepository;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
/**
* Testcase that verifies the names for Foreign Key columns is as expected.
*/
-public class TestFKColumnNames extends TestCase {
+public class TestFKColumnNames extends AbstractPersistenceTestCase {
- OpenJPAEntityManagerFactorySPI emf =
- (OpenJPAEntityManagerFactorySPI) Persistence
- .createEntityManagerFactory("test");
/**
* <P>
@@ -49,6 +45,9 @@ public class TestFKColumnNames extends T
* </P>
*/
public void testSQLKeywords() {
+ OpenJPAEntityManagerFactorySPI emf =
+ (OpenJPAEntityManagerFactorySPI) Persistence
+ .createEntityManagerFactory("test");
MappingRepository repos =
(MappingRepository) emf.getConfiguration()
.getMetaDataRepositoryInstance();
@@ -58,6 +57,7 @@ public class TestFKColumnNames extends T
assertEquals("FROM_ID", repos.getMapping(Inner2.class, null, true)
.getFieldMapping("from").getColumns()[0].getName());
+ closeEMF(emf);
}
@Entity
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java?rev=1022228&r1=1022227&r2=1022228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMixedAccess.java Wed Oct 13 18:35:46 2010
@@ -27,28 +27,32 @@ import org.apache.openjpa.persistence.te
public class TestMixedAccess extends AbstractCachedEMFTestCase {
public void testMixedAccessEntityError() {
+ EntityManagerFactory emf = null;
try {
- EntityManagerFactory emf =
- createEMF(UnenhancedMixedAccess.class, "openjpa.RuntimeUnenhancedClasses", "supported");
+ emf = createEMF(UnenhancedMixedAccess.class, "openjpa.RuntimeUnenhancedClasses", "supported");
emf.createEntityManager().close();
} catch (RuntimeException e) {
String msg = e.getMessage();
if (!(msg.contains("UnenhancedMixedAccess.id") &&
msg.contains("UnenhancedMixedAccess.getStringField")))
throw e;
+ } finally {
+ closeEMF(emf);
}
}
public void testInappropriateTransientError() {
+ EntityManagerFactory emf = null;
try {
- EntityManagerFactory emf = createEMF(
- UnenhancedInappropriateTransient.class, "openjpa.RuntimeUnenhancedClasses", "supported");
+ emf = createEMF(UnenhancedInappropriateTransient.class, "openjpa.RuntimeUnenhancedClasses", "supported");
emf.createEntityManager().close();
} catch (RuntimeException e) {
String msg = e.getMessage();
if (!(msg.contains("UnenhancedInappropriateTransient.id") &&
msg.contains("UnenhancedInappropriateTransient.prePersist")))
throw e;
- }
+ } finally {
+ closeEMF(emf);
+ }
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java?rev=1022228&r1=1022227&r2=1022228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java Wed Oct 13 18:35:46 2010
@@ -63,6 +63,7 @@ public class TestMultiColumnVersion exte
em.merge(pc);
em.getTransaction().commit();
assertVersionEquals(new Number[]{2,2, 2.0f}, em.getVersion(pc));
+ em.close();
}
public void testConcurrentOptimisticUpdateFailsForSingleTable() {
@@ -84,6 +85,7 @@ public class TestMultiColumnVersion exte
pc1.setName("Updated in em1");
pc2.setName("Updated in em2");
em1.getTransaction().commit();
+ em1.close();
try {
em2.getTransaction().commit();
@@ -111,7 +113,9 @@ public class TestMultiColumnVersion exte
assertVersionEquals(em1.getVersion(pc1), em2.getVersion(pc2));
em1.getTransaction().commit();
+ em1.close();
em2.getTransaction().commit();
+ em2.close();
}
public void testVersionOnPersistAndUpdateForMultiTable() {
@@ -128,6 +132,7 @@ public class TestMultiColumnVersion exte
em.merge(pc);
em.getTransaction().commit();
assertVersionEquals(new Number[]{2,2,2,2}, em.getVersion(pc));
+ em.close();
}
public void testConcurrentOptimisticUpdateFailsForMultiTable() {
@@ -150,6 +155,7 @@ public class TestMultiColumnVersion exte
pc1.setName("Updated in em1");
pc2.setName("Updated in em2");
em1.getTransaction().commit();
+ em1.close();
try {
em2.getTransaction().commit();
@@ -178,7 +184,9 @@ public class TestMultiColumnVersion exte
assertVersionEquals(em1.getVersion(pc1), em2.getVersion(pc2));
em1.getTransaction().commit();
+ em1.close();
em2.getTransaction().commit();
+ em2.close();
}
static void assertVersionEquals(Object expected, Object actual) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java?rev=1022228&r1=1022227&r2=1022228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java Wed Oct 13 18:35:46 2010
@@ -346,4 +346,5 @@ public class TestNonstandardMappingAnnot
}
em.close();
- }}
+ }
+}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java?rev=1022228&r1=1022227&r2=1022228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java Wed Oct 13 18:35:46 2010
@@ -47,6 +47,7 @@ public class TestPropertyAccess
assertNotNull(pa1_2);
assertEquals(10, pa1_2.getId());
assertEquals("foo", pa1_2.getName());
+ em.close();
}
public void testPropertyAccessBasicMutation() {
@@ -70,6 +71,7 @@ public class TestPropertyAccess
PropertyAccess1 pa1_3 = em.find(PropertyAccess1.class, 10);
assertNotSame(pa1_2, pa1_3);
assertEquals("foobar", pa1_3.getName());
+ em.close();
}
public void testJPQL() {