You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/10/13 02:00:53 UTC
svn commit: r1021956 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/
Author: dwoods
Date: Wed Oct 13 00:00:52 2010
New Revision: 1021956
URL: http://svn.apache.org/viewvc?rev=1021956&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java Wed Oct 13 00:00:52 2010
@@ -60,6 +60,12 @@ public abstract class AbstractCriteriaTe
return dict;
}
+ @Override
+ public void tearDown() throws Exception {
+ dict = null;
+ super.tearDown();
+ }
+
/**
* Create an entity manager factory for persistence unit <code>pu</code>. Put {@link #CLEAR_TABLES} in this list to
* tell the test framework to delete all table contents before running the tests.
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java Wed Oct 13 00:00:52 2010
@@ -50,7 +50,9 @@ public abstract class CriteriaTest exten
return CLASSES;
}
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
if (getEntityManagerFactory() == null) {
auditor = new SQLAuditor();
setEntityManagerFactory(createNamedEMF(getDomainClasses()));
@@ -61,6 +63,22 @@ public abstract class CriteriaTest exten
cb = getEntityManagerFactory().getCriteriaBuilder();
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ cb = null;
+ auditor.clear();
+ auditor = null;
+ if (emf != null && emf.isOpen()) {
+ emf.close();
+ emf = null;
+ }
+ super.tearDown();
+ }
+
protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
return emf;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java Wed Oct 13 00:00:52 2010
@@ -80,7 +80,8 @@ public abstract class EmbeddableDomainTe
return CLASSES;
}
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
if (getEntityManagerFactory() == null) {
auditor = new SQLAuditor();
setEntityManagerFactory(createNamedEMF(getDomainClasses()));
@@ -91,6 +92,18 @@ public abstract class EmbeddableDomainTe
cb = getEntityManagerFactory().getCriteriaBuilder();
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ if (emf != null && emf.isOpen()) {
+ emf.close();
+ emf = null;
+ }
+ }
+
protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
return emf;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java Wed Oct 13 00:00:52 2010
@@ -34,7 +34,9 @@ public abstract class JoinDomainTestCase
return new Class[]{A.class,B.class,C.class,D.class};
}
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
if (getEntityManagerFactory() == null) {
auditor = new SQLAuditor();
setEntityManagerFactory(createNamedEMF(getDomainClasses()));
@@ -45,6 +47,19 @@ public abstract class JoinDomainTestCase
cb = getEntityManagerFactory().getCriteriaBuilder();
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ if (emf != null && emf.isOpen()) {
+ emf.close();
+ emf = null;
+ }
+ super.tearDown();
+ }
+
protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
return emf;
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java Wed Oct 13 00:00:52 2010
@@ -97,10 +97,6 @@ public class TestCriteria extends Single
emf.createEntityManager();
}
- public void tearDown() {
- // do nothing as we may not have a database connection
- }
-
public void testLogicalPredicateAssociativity() {
DomainObject e = qb.createQueryDefinition(Employee.class);
Predicate p1 = e.get("salary").greaterThan(100);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java Wed Oct 13 00:00:52 2010
@@ -30,7 +30,7 @@ import javax.persistence.criteria.Root;
public class TestDistinctCriteria extends CriteriaTest {
@Override
- public void setUp() {
+ public void setUp() throws Exception {
super.setUp();
try {
deleteDataForTestDistinct();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java Wed Oct 13 00:00:52 2010
@@ -98,6 +98,22 @@ import org.apache.openjpa.persistence.te
public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
+
+ private static int TEST_COUNT = 0;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ TEST_COUNT++;
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ // Hack to cleanup EM and EMF when we're done
+ if (TEST_COUNT >= 123)
+ super.tearDown();
+ }
+
public void testEmbeddableQuery1() {
String jpql = "select e from EntityA_Coll_String a, in (a.nickNames) e order by a.id";
CriteriaQuery<String> q = cb.createQuery(String.class);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java Wed Oct 13 00:00:52 2010
@@ -65,7 +65,8 @@ public class TestMetaModelTypesafeCriter
protected EntityType<TransactionHistory> transactionHistory_ = null;
protected EntityType<VideoStore> videoStore_ = null;
- public void setUp() {
+ @Override
+ public void setUp() throws Exception {
super.setUp();
Metamodel mm = em.getMetamodel();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java?rev=1021956&r1=1021955&r2=1021956&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java Wed Oct 13 00:00:52 2010
@@ -35,7 +35,9 @@ import org.apache.openjpa.persistence.Op
*/
public class TestQueryByExample extends CriteriaTest {
DBDictionary dict = null;
- public void setUp() {
+
+ @Override
+ public void setUp() throws Exception {
super.setUp();
// If using an Oracle DB, use sql92 syntax in order to get a correct
@@ -49,6 +51,12 @@ public class TestQueryByExample extends
}
}
+ @Override
+ public void tearDown() throws Exception {
+ dict = null;
+ super.tearDown();
+ }
+
public void testBasicFieldsWithNonDefaultValue() {
String jpql = "SELECT e FROM Employee e WHERE e.rating=1 AND e.salary=1100";