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:41:08 UTC
svn commit: r793990 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
Author: dwoods
Date: Tue Jul 14 17:41:07 2009
New Revision: 793990
URL: http://svn.apache.org/viewvc?rev=793990&view=rev
Log:
cleanup imports and add proper EMF cleanup
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java?rev=793990&r1=793989&r2=793990&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java Tue Jul 14 17:41:07 2009
@@ -20,7 +20,7 @@
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.PersistenceException;
import org.apache.openjpa.persistence.query.SimpleEntity;
@@ -52,19 +52,22 @@
*/
public void testValidationMode1() {
getLog().trace("testValidationMode1() - Default mode is AUTO");
- OpenJPAEntityManagerFactory emf = null;
-
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple",
- "org/apache/openjpa/persistence/validation/persistence.xml");
- assertNotNull(emf);
- // verify default validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Default validation mode",
- String.valueOf(ValidationMode.AUTO),
- conf.getValidationMode());
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple",
+ "org/apache/openjpa/persistence/validation/persistence.xml");
+ assertNotNull(emf);
+ try {
+ // verify default validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Default validation mode",
+ String.valueOf(ValidationMode.AUTO),
+ conf.getValidationMode());
+ } finally {
+ cleanup(emf);
+ }
}
/**
@@ -73,19 +76,22 @@
*/
public void testValidationMode2() {
getLog().trace("testValidationMode1() - AUTO in persistence.xml");
- OpenJPAEntityManagerFactory emf = null;
-
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple-auto-mode",
- "org/apache/openjpa/persistence/validation/persistence.xml");
- assertNotNull(emf);
- // verify expected validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Validation mode",
- String.valueOf(ValidationMode.AUTO),
- conf.getValidationMode());
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple-auto-mode",
+ "org/apache/openjpa/persistence/validation/persistence.xml");
+ assertNotNull(emf);
+ try {
+ // verify expected validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Validation mode",
+ String.valueOf(ValidationMode.AUTO),
+ conf.getValidationMode());
+ } finally {
+ cleanup(emf);
+ }
}
/**
@@ -95,19 +101,22 @@
public void testValidationMode3() {
getLog().trace("testValidationMode3() - persistence.xml overrides " +
"Default");
- OpenJPAEntityManagerFactory emf = null;
-
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple-none-mode",
- "org/apache/openjpa/persistence/validation/persistence.xml");
- assertNotNull(emf);
- // verify validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Validation mode",
- String.valueOf(ValidationMode.NONE),
- conf.getValidationMode());
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple-none-mode",
+ "org/apache/openjpa/persistence/validation/persistence.xml");
+ assertNotNull(emf);
+ try {
+ // verify validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Validation mode",
+ String.valueOf(ValidationMode.NONE),
+ conf.getValidationMode());
+ } finally {
+ cleanup(emf);
+ }
}
/**
@@ -119,13 +128,13 @@
public void testValidationMode4() {
getLog().trace("testValidationMode4() - persistence.xml overrides " +
"Default");
- OpenJPAEntityManagerFactory emf = null;
-
+ OpenJPAEntityManagerFactorySPI emf = null;
try {
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple-callback-mode",
- "org/apache/openjpa/persistence/validation/persistence.xml");
+ emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple-callback-mode",
+ "org/apache/openjpa/persistence/validation/persistence.xml");
assertNotNull(emf);
// verify validation mode
OpenJPAConfiguration conf = emf.getConfiguration();
@@ -137,6 +146,8 @@
// expected when no Validation APIs or provider are available
getLog().trace("testValidationMode4() - caught expected " +
"exception", e);
+ } finally {
+ cleanup(emf);
}
}
@@ -146,7 +157,6 @@
*/
public void testValidationMode5() {
getLog().trace("testValidationMode5() - Map(NONE) overrides default");
- OpenJPAEntityManagerFactory emf = null;
// create the Map to test overrides
Map<String,String> props = new HashMap<String,String>();
@@ -154,17 +164,22 @@
String.valueOf(ValidationMode.NONE));
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple",
- "org/apache/openjpa/persistence/validation/persistence.xml",
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple",
+ "org/apache/openjpa/persistence/validation/persistence.xml",
props);
assertNotNull(emf);
- // verify validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Validation mode",
- String.valueOf(ValidationMode.NONE),
- conf.getValidationMode());
+ try {
+ // verify validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Validation mode",
+ String.valueOf(ValidationMode.NONE),
+ conf.getValidationMode());
+ } finally {
+ cleanup(emf);
+ }
}
/**
@@ -174,7 +189,6 @@
public void testValidationMode6() {
getLog().trace("testValidationMode6() - Map(NONE) overrides PU " +
"provided mode=callback");
- OpenJPAEntityManagerFactory emf = null;
// create the Map to test overrides
Map<String,String> props = new HashMap<String,String>();
@@ -182,17 +196,22 @@
String.valueOf(ValidationMode.NONE));
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple-callback-mode",
- "org/apache/openjpa/persistence/validation/persistence.xml",
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple-callback-mode",
+ "org/apache/openjpa/persistence/validation/persistence.xml",
props);
assertNotNull(emf);
- // verify validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Validation mode",
- String.valueOf(ValidationMode.NONE),
- conf.getValidationMode());
+ try {
+ // verify validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Validation mode",
+ String.valueOf(ValidationMode.NONE),
+ conf.getValidationMode());
+ } finally {
+ cleanup(emf);
+ }
}
/**
@@ -202,7 +221,6 @@
public void testValidationMode7() {
getLog().trace("testValidationMode7() - Map(ValidationMode.NONE) " +
"overrides PU provided mode=callback");
- OpenJPAEntityManagerFactory emf = null;
// create the Map to test overrides
Map<String,Object> props = new HashMap<String,Object>();
@@ -210,19 +228,33 @@
ValidationMode.NONE);
// create our EMF
- emf = OpenJPAPersistence.createEntityManagerFactory(
- "simple-callback-mode",
- "org/apache/openjpa/persistence/validation/persistence.xml",
+ OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
+ OpenJPAPersistence.createEntityManagerFactory(
+ "simple-callback-mode",
+ "org/apache/openjpa/persistence/validation/persistence.xml",
props);
assertNotNull(emf);
- // verify validation mode
- OpenJPAConfiguration conf = emf.getConfiguration();
- assertNotNull(conf);
- assertEquals("Validation mode",
- String.valueOf(ValidationMode.NONE),
- conf.getValidationMode());
+ try {
+ // verify validation mode
+ OpenJPAConfiguration conf = emf.getConfiguration();
+ assertNotNull(conf);
+ assertEquals("Validation mode",
+ String.valueOf(ValidationMode.NONE),
+ conf.getValidationMode());
+ } finally {
+ 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