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/08 17:54:57 UTC
svn commit: r1005869 - in
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access:
TestDefaultAccess.java TestExplicitAccess.java xml/TestXMLExplicitAccess.java
Author: dwoods
Date: Fri Oct 8 15:54:56 2010
New Revision: 1005869
URL: http://svn.apache.org/viewvc?rev=1005869&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java?rev=1005869&r1=1005868&r2=1005869&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java Fri Oct 8 15:54:56 2010
@@ -74,7 +74,8 @@ public class TestDefaultAccess extends S
verifyDefaultFieldAccess(em);
em.close();
- emf1.close();
+ clear(emf1);
+ closeEMF(emf1);
}
/**
@@ -91,7 +92,8 @@ public class TestDefaultAccess extends S
verifyDefaultPropertyAccess(em);
em.close();
- emf1.close();
+ clear(emf1);
+ closeEMF(emf1);
}
/**
@@ -108,7 +110,8 @@ public class TestDefaultAccess extends S
verifyDefaultFieldAccess(em);
em.close();
- emf1.close();
+ clear(emf1);
+ closeEMF(emf1);
}
/**
@@ -126,7 +129,8 @@ public class TestDefaultAccess extends S
verifyDefaultPropertyAccess(em);
em.close();
- emf1.close();
+ clear(emf1);
+ closeEMF(emf1);
}
private void verifyDefaultFieldAccess(OpenJPAEntityManagerSPI em) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java?rev=1005869&r1=1005868&r2=1005869&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java Fri Oct 8 15:54:56 2010
@@ -115,6 +115,7 @@ public class TestExplicitAccess extends
qry.setParameter("strVal", "PropertyAccess");
PropAccess pa2 = (PropAccess)qry.getSingleResult();
assertEquals(pa, pa2);
+ em.close();
}
/**
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java?rev=1005869&r1=1005868&r2=1005869&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java Fri Oct 8 15:54:56 2010
@@ -147,9 +147,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"strField\" in \"XMLDefFieldMixedPropAccess\"",
"[id, stringField, version]");
+ } finally {
+ em.close();
}
-
- em.close();
}
/**
@@ -193,9 +193,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"strProp\" in \"XMLDefPropMixedFieldAccess\"",
"[id, strField, version]");
+ } finally {
+ em.close();
}
-
- em.close();
}
/**
@@ -203,13 +203,13 @@ public class TestXMLExplicitAccess exten
* subclass using property access get mapped properly.
*/
public void testAbstractMappedSuperField() {
- OpenJPAEntityManagerFactorySPI emf =
+ OpenJPAEntityManagerFactorySPI emf1 =
(OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.
createEntityManagerFactory("Access-XML",
"org/apache/openjpa/persistence/access/" +
"access-persistence.xml");
- OpenJPAEntityManagerSPI em = emf.createEntityManager();
+ OpenJPAEntityManagerSPI em = emf1.createEntityManager();
XMLPropertySub ps = new XMLPropertySub();
// Call super setter with underlying field access
@@ -248,9 +248,11 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"crtDate\" in \"XMLPropertySub\"",
"[createDate, id, name]");
+ } finally {
+ em.close();
+ clear(emf1);
+ closeEMF(emf1);
}
-
- em.close();
}
/**
@@ -259,13 +261,13 @@ public class TestXMLExplicitAccess exten
*/
public void testAbstractMappedSuperProperty() {
- OpenJPAEntityManagerFactorySPI emf =
+ OpenJPAEntityManagerFactorySPI emf1 =
(OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.
createEntityManagerFactory("Access-XML",
"org/apache/openjpa/persistence/access/" +
"access-persistence.xml");
- OpenJPAEntityManagerSPI em = emf.createEntityManager();
+ OpenJPAEntityManagerSPI em = emf1.createEntityManager();
XMLFieldSub fs = new XMLFieldSub();
// Call super setter with underlying field access
@@ -304,9 +306,11 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"createDate\" in \"XMLFieldSub\"",
"[crtDate, id, name]");
+ } finally {
+ em.close();
+ clear(emf1);
+ closeEMF(emf1);
}
-
- em.close();
}
/**
@@ -316,13 +320,13 @@ public class TestXMLExplicitAccess exten
*/
public void testMappedSuperField() {
- OpenJPAEntityManagerFactorySPI emf =
+ OpenJPAEntityManagerFactorySPI emf1 =
(OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.
createEntityManagerFactory("Access-XML",
"org/apache/openjpa/persistence/access/" +
"access-persistence.xml");
- OpenJPAEntityManagerSPI em = emf.createEntityManager();
+ OpenJPAEntityManagerSPI em = emf1.createEntityManager();
XMLPropertySub2 ps = new XMLPropertySub2();
// Call super setter with underlying field access
@@ -361,9 +365,11 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"crtDate\" in \"XMLPropertySub2\"",
"[createDate, id, name]");
+ } finally {
+ em.close();
+ clear(emf1);
+ closeEMF(emf1);
}
-
- em.close();
}
/**
@@ -412,9 +418,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"createDate\" in \"XMLFieldSub2\"",
"[crtDate, id, name]");
+ } finally {
+ em.close();
}
-
- em.close();
}
/**
@@ -464,10 +470,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"myFieldProp\" in \"XMLMixedFieldSub\"",
"[createDate, mid, myField, name]");
- }
-
- em.close();
-
+ } finally {
+ em.close();
+ }
}
/**
@@ -544,9 +549,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"crtDate\" in \"XMLSuperPropertyEntity\"",
"[id, name]");
- }
-
- em.close();
+ } finally {
+ em.close();
+ }
}
/**
@@ -623,8 +628,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"crtDate\" in \"XMLSuperFieldEntity\"",
"[id, name]");
- }
- em.close();
+ } finally {
+ em.close();
+ }
}
/**
@@ -671,9 +677,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"firstName\" in \"XMLEmbedFieldAccess\"",
"[fName, lName]");
+ } finally {
+ em.close();
}
-
- em.close();
}
/**
@@ -722,9 +728,9 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"fName\" in \"XMLEmbedPropAccess\"",
"[firstName, lastName]");
+ } finally {
+ em.close();
}
-
- em.close();
}
/**
@@ -774,8 +780,8 @@ public class TestXMLExplicitAccess exten
assertExceptionMessage(e, ArgumentException.class,
"No field named \"middleName\" in \"XMLEmbedMixedAccess\"",
"[firstName, lastName, mName]");
+ } finally {
+ em.close();
}
-
- em.close();
}
}