Author: dwoods
Date: Wed Oct 13 17:07:36 2010
New Revision: 1022193
URL: http://svn.apache.org/viewvc?rev=1022193&view=rev
Log:
make sure tests close EMs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java?rev=1022193&r1=1022192&r2=1022193&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
Wed Oct 13 17:07:36 2010
@@ -959,6 +959,7 @@ public class TestEmbeddable extends SQLL
Embed embed = a.getEmbed();
assertNull(embed);
assertFalse(puu.isLoaded(a, "embed"));
+ em.close();
}
/*
@@ -2431,6 +2432,7 @@ public class TestEmbeddable extends SQLL
VicePresident vp = em.find(VicePresident.class, 1);
assertVicePresident(vp);
+ em.close();
}
public void assertItem1(Item1 item) {
@@ -2493,13 +2495,15 @@ public class TestEmbeddable extends SQLL
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 SQLL
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 SQLL
assertNotNull(seller);
assertTrue(seller.getId() != 0);
}
+ em.close();
}
/*
@@ -3063,5 +3069,6 @@ public class TestEmbeddable extends SQLL
}
}
assertTrue(found);
+ em.close();
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java?rev=1022193&r1=1022192&r2=1022193&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
Wed Oct 13 17:07:36 2010
@@ -46,6 +46,7 @@ public class TestEmbedded extends SQLLis
a.setGeocode(g);
em.persist(a);
em.getTransaction().commit();
+ em.close();
}
/*
@@ -99,6 +100,7 @@ public class TestEmbedded extends SQLLis
em.persist(a);
}
em.getTransaction().commit();
+ em.close();
em = emf.createEntityManager();
em.getTransaction().begin();
@@ -117,6 +119,7 @@ public class TestEmbedded extends SQLLis
assertTrue(count>1);
em.getTransaction().commit();
assertEquals(1, sql.size());
+ em.close();
}
private void persistAddress(Address address) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java?rev=1022193&r1=1022192&r2=1022193&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
Wed Oct 13 17:07:36 2010
@@ -229,6 +229,7 @@ public class TestAssocOverrides extends
EntityManager em = emf.createEntityManager();
PartTimeEmployee p = em.find(PartTimeEmployee.class, 1);
Assert.assertEquals(p.getHourlyWage(), (float)100);
+ em.close();
}
public void queryObj2() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java?rev=1022193&r1=1022192&r2=1022193&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
Wed Oct 13 17:07:36 2010
@@ -105,6 +105,7 @@ public class TestAttrOverrides extends
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
"+4_1");
assertEquals(p.getParcels().size(), numPropertiesPerPersons);
+ em.close();
}
public void queryObj2() {
@@ -282,6 +284,7 @@ public class TestAttrOverrides extends
assertEquals(expNickName, s);
i--;
}
+ em.close();
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java?rev=1022193&r1=1022192&r2=1022193&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
Wed Oct 13 17:07:36 2010
@@ -158,6 +158,7 @@ public class TestAttrOverridesXml extend
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() {
