Author: dwoods
Date: Thu Oct 14 20:39:11 2010
New Revision: 1022698
URL: http://svn.apache.org/viewvc?rev=1022698&view=rev
Log:
more testcase comments about what gets cleaned up and print err msg if an EM or
EMF cannot be closed.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java?rev=1022698&r1=1022697&r2=1022698&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
Thu Oct 14 20:39:11 2010
@@ -234,7 +234,9 @@ public abstract class AbstractPersistenc
} finally {
emf.close();
brc = !emf.isOpen();
- emf = null;
+ if (!brc) {
+ System.err.println("AbstractPersistenceTestCase().closeEMF() -
EMF is still open.");
+ }
}
return brc;
}
@@ -253,7 +255,11 @@ public abstract class AbstractPersistenc
em.getTransaction().rollback();
}
em.close();
- return true;
+ boolean brc = !em.isOpen();
+ if (!brc) {
+ System.err.println("AbstractPersistenceTestCase().closeEM() - EM
is still open.");
+ }
+ return brc;
}
/**
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java?rev=1022698&r1=1022697&r2=1022698&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
Thu Oct 14 20:39:11 2010
@@ -31,7 +31,8 @@ import org.apache.openjpa.lib.jdbc.JDBCL
/**
* Base class for tests that need to check generated SQL.
- * Extends SingleEMFTestCase, which will cleanup the EMF it provides.
+ * Extends SingleEMFTestCase, which will cleanup the EMF it provides,
+ * along with any EMs generated by that EMF.
*
* @author Patrick Linskey
*/
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java?rev=1022698&r1=1022697&r2=1022698&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
Thu Oct 14 20:39:11 2010
@@ -38,8 +38,8 @@ import org.apache.openjpa.persistence.Op
* OpenJPA-extended SPI interface <code>OpenJPAEntityManagerFactorySPI</code>
* so that derived classes can access internal mapping/metadata/configuration
* and other structures.
- * Extends AbstractCachedEMFTestCase, which extends AbstractPersistenceTestCase
- * and cleans up the EMF it provides in tearDown().
+ * Extends AbstractCachedEMFTestCase, which extends
AbstractPersistenceTestCase.
+ * Cleans up the EMF it provides and any EMs created from it in tearDown().
*
*/
public abstract class SingleEMFTestCase
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java?rev=1022698&r1=1022697&r2=1022698&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
Thu Oct 14 20:39:11 2010
@@ -59,8 +59,8 @@ public abstract class SingleEMTestCase
@Override
public void tearDown() throws Exception {
- rollback();
- close();
+ closeEM(em);
+ em = null;
super.tearDown();
}
