Author: dwoods
Date: Wed Oct 13 01:15:25 2010
New Revision: 1021970
URL: http://svn.apache.org/viewvc?rev=1021970&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdSeqGen.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdSeqGen.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdResultSetAnnotations.java
Wed Oct 13 01:15:25 2010
@@ -61,6 +61,15 @@ public class TestDelimIdResultSetAnnotat
}
@Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
+ @Override
protected OpenJPAEntityManagerFactorySPI createEMF(final Object... props) {
return createNamedEMF("delimited-identifiers", props);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdSeqGen.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdSeqGen.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdSeqGen.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimIdSeqGen.java
Wed Oct 13 01:15:25 2010
@@ -55,6 +55,15 @@ public class TestDelimIdSeqGen extends S
}
@Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
+ @Override
protected OpenJPAEntityManagerFactorySPI createEMF(final Object... props) {
return createNamedEMF("delimited-identifiers", props);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimInheritance.java
Wed Oct 13 01:15:25 2010
@@ -53,6 +53,15 @@ public class TestDelimInheritance extend
}
@Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
+ @Override
protected OpenJPAEntityManagerFactorySPI createEMF(final Object... props) {
return createNamedEMF("delimited-identifiers", props);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
Wed Oct 13 01:15:25 2010
@@ -44,6 +44,15 @@ public class TestDelimitedIdentifiers ex
}
@Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
+ @Override
protected OpenJPAEntityManagerFactorySPI createEMF(final Object... props) {
return createNamedEMF("delimited-identifiers", props);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedJoinAnnotation.java
Wed Oct 13 01:15:25 2010
@@ -58,6 +58,15 @@ public class TestDelimitedJoinAnnotation
}
@Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
+ @Override
protected OpenJPAEntityManagerFactorySPI createEMF(final Object... props) {
return createNamedEMF("delimited-identifiers", props);
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimId.java
Wed Oct 13 01:15:25 2010
@@ -49,6 +49,15 @@ public class TestManualDelimId extends S
assertNotNull(em);
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
public void createEntityF() {
entityF = new EntityF("fName");
entityF.setNonDelimName("fNonDelimName");
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdResultSetAnnotations.java
Wed Oct 13 01:15:25 2010
@@ -61,6 +61,15 @@ public class TestManualDelimIdResultSetA
assertNotNull(em);
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
private void createCat(int id) {
cat = new Cat(id);
cat.setName("Puff");
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdSeqGen.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdSeqGen.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdSeqGen.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimIdSeqGen.java
Wed Oct 13 01:15:25 2010
@@ -55,6 +55,17 @@ public class TestManualDelimIdSeqGen ext
}
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ dict = null;
+ conf = null;
+ super.tearDown();
+ }
+
public void createEntityE() {
entityE = new EntityE("e name");
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimInheritance.java
Wed Oct 13 01:15:25 2010
@@ -53,6 +53,15 @@ public class TestManualDelimInheritance
assertNotNull(em);
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ super.tearDown();
+ }
+
private void createDog(int id) {
dog = new Dog(id);
dog.setName("Spot");
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java?rev=1021970&r1=1021969&r2=1021970&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestManualDelimitedJoinAnnotations.java
Wed Oct 13 01:15:25 2010
@@ -65,6 +65,17 @@ public class TestManualDelimitedJoinAnno
dict = conf.getDBDictionaryInstance();
}
+ @Override
+ public void tearDown() throws Exception {
+ if (em != null && em.isOpen()) {
+ em.close();
+ em = null;
+ }
+ dict = null;
+ conf = null;
+ super.tearDown();
+ }
+
private void createCandD(int id) {
entityC = new EntityC(id);
entityC.setName("ec");
