Author: dwoods
Date: Thu Oct 14 20:42:33 2010
New Revision: 1022699
URL: http://svn.apache.org/viewvc?rev=1022699&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
Thu Oct 14 20:42:33 2010
@@ -78,6 +78,7 @@ public class TestAutoIncrement extends S
em.getTransaction().commit();
assertEquals(1, Math.abs(pc1.getId() - pc2.getId()));
+ em.close();
}
public void testAutoIncrementIdentityWithNativeSequence() {
@@ -90,6 +91,7 @@ public class TestAutoIncrement extends S
em.getTransaction().commit();
assertEquals(1, Math.abs(pc1.getId() - pc2.getId()));
+ em.close();
}
/**
@@ -108,6 +110,7 @@ public class TestAutoIncrement extends S
// Sequence probably exists.
em.getTransaction().rollback();
}
+ closeEM(em);
closeEMF(factorySPI);
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
Thu Oct 14 20:42:33 2010
@@ -129,16 +129,23 @@ public class TestFlushBeforeDetach exten
*/
private Object serializeObject(Object orig) throws Exception {
Object deserialized = null;
+ ObjectOutputStream oos = null;
+ ObjectInputStream ois = null;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(orig);
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ oos = new ObjectOutputStream(baos);
+ oos.writeObject(orig);
- ByteArrayInputStream bais =
- new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(baos.toByteArray());
+ ois = new ObjectInputStream(bais);
- deserialized = ois.readObject();
- return deserialized;
+ deserialized = ois.readObject();
+ return deserialized;
+ } finally {
+ oos.close();
+ ois.close();
+ }
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
Thu Oct 14 20:42:33 2010
@@ -59,6 +59,7 @@ public class TestMissingMetaData extends
public void tearDown() {
emf.close();
+ emf = null;
}
public static void main(String[] args) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
Thu Oct 14 20:42:33 2010
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.Au
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
/**
* This test case tests the getProperties() and getSupportedProperties()
methods
@@ -43,16 +44,16 @@ import org.apache.openjpa.persistence.Op
* @author Pinaki Poddar
*
*/
-public class TestPropertiesMethods extends TestCase {
+public class TestPropertiesMethods extends AbstractPersistenceTestCase {
private static final String UNIT_NAME = "test";
- private static OpenJPAEntityManagerFactory emf;
+ private OpenJPAEntityManagerFactory emf;
private OpenJPAEntityManager em;
@SuppressWarnings("unchecked")
public void setUp() throws Exception {
- if (emf == null) {
- Map config = new HashMap();
- config.putAll(System.getProperties());
+ super.setUp();
+ Map config = new HashMap();
+ config.putAll(System.getProperties());
/* numeric */ config.put("openjpa.DataCacheTimeout", 300);
/* num enum */ config.put("openjpa.AutoClear", 0);
@@ -64,12 +65,19 @@ public class TestPropertiesMethods exten
/* equiv key */ //config.put("javax.persistence.jdbc.url",
"jdbc:derby:target/database/test;create=true");
/* prime use */ //config.put("openjpa.ConnectionUserName", "root");
- emf =
OpenJPAPersistence.cast(Persistence.createEntityManagerFactory(UNIT_NAME,
config));
- assertNotNull(emf);
- }
+ emf =
OpenJPAPersistence.cast(Persistence.createEntityManagerFactory(UNIT_NAME,
config));
+ assertNotNull(emf);
em = OpenJPAPersistence.cast(emf.createEntityManager());
}
+ @Override
+ public void tearDown() {
+ closeEM(em);
+ em = null;
+ closeEMF(emf);
+ emf = null;
+ }
+
// public void testProperties() {
// print("EMF Properties", emf.getProperties());
// print("EMF Supported Properties", emf.getSupportedProperties());
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
Thu Oct 14 20:42:33 2010
@@ -82,6 +82,8 @@ public class TestSerializedFactory exten
emf2.close();
assertFalse("The entity manager factory is not closed",
emf2.isOpen());
+ emf2 = null;
+ oos.close();
}
public static void main(String[] args) {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java?rev=1022699&r1=1022698&r2=1022699&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
Thu Oct 14 20:42:33 2010
@@ -62,6 +62,7 @@ public class TestValidationFactory exten
assertEquals("Default ValidationFactory",
null,
conf.getValidationFactoryInstance());
+ closeEMF(emf);
}
/**
@@ -91,6 +92,7 @@ public class TestValidationFactory exten
assertEquals("ValidationFactory",
this.getClass(),
conf.getValidationFactoryInstance());
+ closeEMF(emf);
}
/**
@@ -120,6 +122,7 @@ public class TestValidationFactory exten
assertEquals("ValidationFactory",
this.getClass(),
conf.getValidationFactoryInstance());
+ closeEMF(emf);
}
/**
@@ -159,6 +162,7 @@ public class TestValidationFactory exten
getLog().trace("testValidationFactory4() - caught expected " +
"PersistenceException", e);
}
+ closeEMF(emf);
}
}
