Author: dwoods
Date: Wed Oct 13 18:15:04 2010
New Revision: 1022222
URL: http://svn.apache.org/viewvc?rev=1022222&view=rev
Log:
make sure tests close EMs and streams
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestBooleanId.java
Wed Oct 13 18:15:04 2010
@@ -33,6 +33,7 @@ public class TestBooleanId extends SQLLi
private BooleanIdEntity se;
private CompoundBooleanIdEntity ce;
+ @Override
public void setUp() throws Exception {
super.setUp(BooleanIdEntity.class,
CompoundBooleanIdEntity.class,
@@ -40,6 +41,12 @@ public class TestBooleanId extends SQLLi
assertTrue(emf != null);
}
+ @Override
+ public void tearDown() throws Exception {
+ closeEM(em);
+ super.tearDown();
+ }
+
public void testSimpleBooleanIdEntity() {
se = new BooleanIdEntity(true,"name");
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestStringId.java
Wed Oct 13 18:15:04 2010
@@ -26,14 +26,18 @@ import org.apache.openjpa.persistence.te
public class TestStringId extends AbstractPersistenceTestCase {
private static EntityManagerFactory _emf;
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
_emf = createEMF(StringIdEntity.class);
cleanup();
}
+ @Override
public void tearDown() {
- _emf.close();
+ closeEMF(_emf);
+ _emf = null;
}
private void cleanup() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
Wed Oct 13 18:15:04 2010
@@ -624,6 +624,7 @@ public class TestDefaultInheritanceStrat
verifyInheritanceFinderResult(em, BaseClass6.class, 479, 302);
verifyInheritanceFinderResult(em, SubclassI.class, 109);
verifyInheritanceFinderResult(em, SubclassJ.class, 238);
+ em.close();
}
/**
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
Wed Oct 13 18:15:04 2010
@@ -57,6 +57,7 @@ public class TestFindAbstractClass
query = "select c from AbstractBase c";
rs = em.createQuery(query).getResultList();
assertTrue(rs.get(0) instanceof ConcreteSubclass);
+ em.close();
}
public void testFind() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
Wed Oct 13 18:15:04 2010
@@ -73,11 +73,6 @@ public class TestJoinTableStrategy exten
em.close();
}
- @Override
- public void tearDown() {
- // problem deleting table in MySQL
- }
-
public void testFindEntity() {
EntityManager em1 = emf.createEntityManager();
Manager m = em1.find(Manager.class, 1);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
Wed Oct 13 18:15:04 2010
@@ -72,6 +72,7 @@ public class TestMappedSuperclass extend
em.getTransaction().begin();
em.persist(sd);
em.getTransaction().commit();
+ em.close();
}
/**
@@ -104,5 +105,6 @@ public class TestMappedSuperclass extend
em.getTransaction().begin();
em.merge(sd);
em.getTransaction().commit();
+ em.close();
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
Wed Oct 13 18:15:04 2010
@@ -66,6 +66,7 @@ public class TestAbstractJoinedAppId
assertTrue(rs.size() > 0);
for (int i = 0; i < rs.size(); i++)
assertTrue(rs.get(i) instanceof Subclass);
+ em.close();
}
public void testTraverseRelation() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
Wed Oct 13 18:15:04 2010
@@ -171,6 +171,7 @@ public class TestInheritanceTypeJoinedQu
Object obj = rs.get(i);
assertTrue((obj instanceof ParttimeEmployee) || (obj instanceof
FulltimeEmployee));
}
+ em.close();
}
public void testInheritanceTypeJoinedQuery() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
Wed Oct 13 18:15:04 2010
@@ -69,6 +69,8 @@ public class TestMappedSuperClass extend
rs = em.createQuery(query).getResultList();
} catch (ArgumentException e) {
// as expected
+ } finally {
+ em.close();
}
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
Wed Oct 13 18:15:04 2010
@@ -132,6 +132,7 @@ public class TestTablePerClassInheritanc
.getTranslations().contains(translation));
}
em.getTransaction().rollback();
+ em.close();
}
@@ -145,8 +146,10 @@ public class TestTablePerClassInheritanc
*/
public int count(Class c) {
OpenJPAEntityManager em = emf.createEntityManager();
- return ((Number) em.createQuery("SELECT COUNT(p) FROM " +
+ Number n = ((Number) em.createQuery("SELECT COUNT(p) FROM " +
c.getSimpleName() + " p").getSingleResult()).intValue();
+ closeEM(em);
+ return n.intValue();
}
/**
@@ -215,6 +218,8 @@ public class TestTablePerClassInheritanc
} catch(ArgumentException e) {
// as expected
//System.out.println("e.getMessages()");
+ } finally {
+ em.close();
}
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java?rev=1022222&r1=1022221&r2=1022222&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
Wed Oct 13 18:15:04 2010
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.i
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -71,6 +72,7 @@ public class TestSerialization extends S
emp = em.find(Employee.class, id);
assertEquals(deserialized, emp);
+ em.close();
}
/**
@@ -78,19 +80,28 @@ public class TestSerialization extends S
*/
private Object serializeObject(Object orig) {
Object deserialized = null;
+ ObjectOutputStream oos = null;
+ ObjectInputStream ois = null;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos = new ObjectOutputStream(baos);
oos.writeObject(orig);
ByteArrayInputStream bais = new ByteArrayInputStream(baos
.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
+ ois = new ObjectInputStream(bais);
- deserialized = ois.readObject();
+ deserialized = ois.readObject();
} catch (Exception e) {
fail(e.toString());
+ } finally {
+ try {
+ oos.close();
+ ois.close();
+ } catch (IOException e) {
+ // ignore
+ }
}
return deserialized;
}
