From 9f1e9db866a29343d9be32bb54019dd2ce0400bc Mon Sep 17 00:00:00 2001 From: Donald Woods Date: Wed, 13 Oct 2010 17:07:36 +0000 Subject: [PATCH] make sure tests close EMs git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1022193 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/openjpa/persistence/embed/TestEmbeddable.java | 9 ++++++++- .../apache/openjpa/persistence/embed/TestEmbedded.java | 3 +++ .../embed/attrOverrides/TestAssocOverrides.java | 1 + .../embed/attrOverrides/TestAttrOverrides.java | 3 +++ .../embed/attrOverrides/TestAttrOverridesXml.java | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java index efb20dbdb..9a6864fad 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java @@ -959,6 +959,7 @@ public class TestEmbeddable extends SQLListenerTestCase { Embed embed = a.getEmbed(); assertNull(embed); assertFalse(puu.isLoaded(a, "embed")); + em.close(); } /* @@ -2431,6 +2432,7 @@ public class TestEmbeddable extends SQLListenerTestCase { VicePresident vp = em.find(VicePresident.class, 1); assertVicePresident(vp); + em.close(); } public void assertItem1(Item1 item) { @@ -2493,13 +2495,15 @@ public class TestEmbeddable extends SQLListenerTestCase { FileName4 fileName3 = item.getImage(Item4.Catagory.A3); assertEquals("file3", fileName3.getFName()); - assertEquals("file3", fileName3.getLName()); + assertEquals("file3", fileName3.getLName()); + em.close(); } public void findObjMapKeyTemporal() { EntityManager em = emf.createEntityManager(); Item5 item = em.find(Item5.class, 1); assertEquals(3, item.getImages().size()); + em.close(); } public void queryObjMapKeyTemporal() { @@ -2511,6 +2515,7 @@ public class TestEmbeddable extends SQLListenerTestCase { q.setParameter("id", 1); List coll = q.getResultList(); assertEquals(1, coll.size()); + em.close(); } public void queryItem(EntityManagerFactory emf) { @@ -2740,6 +2745,7 @@ public class TestEmbeddable extends SQLListenerTestCase { assertNotNull(seller); assertTrue(seller.getId() != 0); } + em.close(); } /* @@ -3063,5 +3069,6 @@ public class TestEmbeddable extends SQLListenerTestCase { } } assertTrue(found); + em.close(); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java index d203bfc2d..d8e968233 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java @@ -46,6 +46,7 @@ public class TestEmbedded extends SQLListenerTestCase { a.setGeocode(g); em.persist(a); em.getTransaction().commit(); + em.close(); } /* @@ -99,6 +100,7 @@ public class TestEmbedded extends SQLListenerTestCase { em.persist(a); } em.getTransaction().commit(); + em.close(); em = emf.createEntityManager(); em.getTransaction().begin(); @@ -117,6 +119,7 @@ public class TestEmbedded extends SQLListenerTestCase { assertTrue(count>1); em.getTransaction().commit(); assertEquals(1, sql.size()); + em.close(); } private void persistAddress(Address address) { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java index 08bc14006..da9dc07be 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java @@ -229,6 +229,7 @@ public class TestAssocOverrides extends SQLListenerTestCase { EntityManager em = emf.createEntityManager(); PartTimeEmployee p = em.find(PartTimeEmployee.class, 1); Assert.assertEquals(p.getHourlyWage(), (float)100); + em.close(); } public void queryObj2() { diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java index b9524b4b7..15a996500 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java @@ -105,6 +105,7 @@ public class TestAttrOverrides extends SQLListenerTestCase { assertEquals(p.getAddress().getStreet(), "street_1"); assertEquals(p.getAddress().getState(), "state_1"); assertEquals(p.getName(), "name_1"); + em.close(); } public void queryObj1() { @@ -186,6 +187,7 @@ public class TestAttrOverrides extends SQLListenerTestCase { "+4_1"); assertEquals(p.getParcels().size(), numPropertiesPerPersons); + em.close(); } public void queryObj2() { @@ -282,6 +284,7 @@ public class TestAttrOverrides extends SQLListenerTestCase { assertEquals(expNickName, s); i--; } + em.close(); } } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java index 10fcbd600..c389e2f8d 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java @@ -158,6 +158,7 @@ public class TestAttrOverridesXml extends SQLListenerTestCase { Assert.assertEquals(p.getAddress().getStreet(), "street_1"); Assert.assertEquals(p.getAddress().getState(), "state_1"); Assert.assertEquals(p.getName(), "name_1"); + em.close(); } public void queryObj1() {