Author: dwoods
Date: Wed Oct 13 21:13:22 2010
New Revision: 1022292
URL: http://svn.apache.org/viewvc?rev=1022292&view=rev
Log:
make sure tests close EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
Wed Oct 13 21:13:22 2010
@@ -167,9 +167,4 @@ public class TestBiDirectionalJoinTable
assertEquals(1+2*ADDRESS_COUNT, sql.size());
}
-
- @Override
- public void tearDown() {
-
- }
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestOneSidedParentChildWithImplicitForeignKey.java
Wed Oct 13 21:13:22 2010
@@ -57,8 +57,9 @@ public class TestOneSidedParentChildWith
private static long CHILD_ID_COUNTER = System.currentTimeMillis();
private static int CHILD_COUNT = 3;
+ @Override
public void setUp() {
- setUp(DROP_TABLES, ParentWithAppIdentity.class,
+ super.setUp(DROP_TABLES, ParentWithAppIdentity.class,
ParentWithSequenceIdentity.class, ParentWithAutoIdentity.class,
Child.class);
em = emf.createEntityManager();
@@ -150,8 +151,10 @@ public class TestOneSidedParentChildWith
em.getTransaction().commit();
}
- public void tearDown() {
-
+ @Override
+ public void tearDown() throws Exception {
+ closeEM(em);
+ super.tearDown();
}
public IParent newParent(int parentType) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
Wed Oct 13 21:13:22 2010
@@ -95,6 +95,8 @@ public class TestQualifiedPath extends S
q = em.createQuery(query);
rs = q.getResultList();
assertEquals(1, rs.size());
+ em.close();
+ em = null;
}
private void createObj() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
Wed Oct 13 21:13:22 2010
@@ -247,6 +247,7 @@ public class TestSpec10_1_27 extends SQL
VicePresident vp = em.find(VicePresident.class, 1);
assertVicePresident(vp);
+ em.close();
}
public void assertItem1(Item1 item) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
Wed Oct 13 21:13:22 2010
@@ -182,8 +182,8 @@ public class TestSpec10_1_27_Ex5 extends
c = em.find(Company.class, 1);
assertCompany(c);
deleteObj(em, c);
+*/
em.close();
-*/
}
public void updateObj1(EntityManager em, Company c) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
Wed Oct 13 21:13:22 2010
@@ -184,8 +184,8 @@ public class TestSpec10_1_27_Ex7 extends
c = em.find(Company.class, 1);
assertCompany(c);
deleteObj(em, c);
+*/
em.close();
-*/
}
public void updateObj1(EntityManager em, Company c) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java?rev=1022292&r1=1022291&r2=1022292&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
Wed Oct 13 21:13:22 2010
@@ -59,6 +59,7 @@ public class TestMapUpdate extends SQLLi
ms = em.find(MultilingualString.class, entity1.getId());
assertEquals("Good evening", ms.getText("en"));
em.getTransaction().commit();
+ em.close();
}
public void testUpdateMapValue() throws Exception {
@@ -79,6 +80,7 @@ public class TestMapUpdate extends SQLLi
// This assertion fails, the entity still has the old value.
assertEquals("Good evening", ms.getText("en"));
em.getTransaction().commit();
+ em.close();
}
private void createObj(EntityManagerFactory emf) {
