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 2009/07/14 19:20:32 UTC
svn commit: r793980 - in
/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation:
TestConstraints.java TestValidatingLEM.java
Author: dwoods
Date: Tue Jul 14 17:20:32 2009
New Revision: 793980
URL: http://svn.apache.org/viewvc?rev=793980&view=rev
Log:
cleanup imports and add proper EMF cleanup
Modified:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java?rev=793980&r1=793979&r2=793980&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java Tue Jul 14 17:20:32 2009
@@ -16,14 +16,12 @@
import java.util.Set;
import javax.persistence.Query;
-import javax.persistence.ValidationMode;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java?rev=793980&r1=793979&r2=793980&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java Tue Jul 14 17:20:32 2009
@@ -14,22 +14,18 @@
package org.apache.openjpa.integration.validation;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
-import javax.persistence.Query;
import javax.persistence.ValidationMode;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.event.LifecycleEventManager;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
import org.apache.openjpa.validation.ValidatingLifecycleEventManager;
@@ -75,15 +71,16 @@
public void testValidatingLEM1() {
getLog().trace("testValidatingLEM1() - NONE");
// create our EMF
- OpenJPAEntityManagerFactory emf = OpenJPAPersistence
- .createEntityManagerFactory(
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
"simple-none-mode",
"org/apache/openjpa/integration/validation/persistence.xml");
assertNotNull(emf);
- // create EM
- OpenJPAEntityManager em = emf.createEntityManager();
- assertNotNull(em);
+ OpenJPAEntityManager em = null;
try {
+ // create EM
+ em = emf.createEntityManager();
+ assertNotNull(em);
// verify created LifecycleEventManager type
OpenJPAConfiguration conf = em.getConfiguration();
assertNotNull(conf);
@@ -99,6 +96,7 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ cleanup(emf);
}
}
@@ -109,15 +107,16 @@
public void testValidatingLEM2() {
getLog().trace("testValidatingLEM2() - AUTO");
// create our EMF
- OpenJPAEntityManagerFactory emf = OpenJPAPersistence
- .createEntityManagerFactory(
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
"simple-auto-mode",
"org/apache/openjpa/integration/validation/persistence.xml");
assertNotNull(emf);
- // create EM
- OpenJPAEntityManager em = emf.createEntityManager();
- assertNotNull(em);
+ OpenJPAEntityManager em = null;
try {
+ // create EM
+ em = emf.createEntityManager();
+ assertNotNull(em);
// verify created LifecycleEventManager type
OpenJPAConfiguration conf = em.getConfiguration();
assertNotNull(conf);
@@ -133,6 +132,7 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ cleanup(emf);
}
}
@@ -148,16 +148,17 @@
props.put("javax.persistence.validation.mode",
String.valueOf(ValidationMode.CALLBACK));
// create our EMF w/ props
- OpenJPAEntityManagerFactory emf = OpenJPAPersistence
- .createEntityManagerFactory(
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
"simple-none-mode",
"org/apache/openjpa/integration/validation/persistence.xml",
props);
assertNotNull(emf);
- // create EM
- OpenJPAEntityManager em = emf.createEntityManager();
- assertNotNull(em);
+ OpenJPAEntityManager em = null;
try {
+ // create EM
+ em = emf.createEntityManager();
+ assertNotNull(em);
// verify created LifecycleEventManager type
OpenJPAConfiguration conf = em.getConfiguration();
assertNotNull(conf);
@@ -173,6 +174,7 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ cleanup(emf);
}
}
@@ -187,23 +189,24 @@
try {
factory = Validation.buildDefaultValidatorFactory();
} catch (javax.validation.ValidationException e) {
- // no validation providers found
+ fail("testValidatingLEM4() - no validation providers found" + e);
}
assertNotNull(factory);
// create the Map to test overrides
Map<String,Object> props = new HashMap<String,Object>();
props.put("javax.persistence.validation.factory", factory);
// create our EMF w/ props
- OpenJPAEntityManagerFactory emf = OpenJPAPersistence
- .createEntityManagerFactory(
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
"simple-auto-mode",
"org/apache/openjpa/integration/validation/persistence.xml",
props);
assertNotNull(emf);
- // create EM
- OpenJPAEntityManager em = emf.createEntityManager();
- assertNotNull(em);
+ OpenJPAEntityManager em = null;
try {
+ // create EM
+ em = emf.createEntityManager();
+ assertNotNull(em);
// verify expected validation config items
OpenJPAConfiguration conf = em.getConfiguration();
assertNotNull(conf);
@@ -222,9 +225,19 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ cleanup(emf);
}
}
+
+ /**
+ * Helper method to remove entities and close the emf an any open em's.
+ * @param emf
+ */
+ private void cleanup(OpenJPAEntityManagerFactorySPI emf) {
+ clear(emf);
+ closeEMF(emf);
+ }
/**
* Internal convenience method for getting the OpenJPA logger