Author: jrbauer
Date: Sat Sep 26 05:26:35 2009
New Revision: 819093
URL: http://svn.apache.org/viewvc?rev=819093&view=rev
Log:
OPENJPA-1115 Allow schema-less delimited id tests to fail until intermittent
cleanup issue is resolved. Removed duplicate test case and unnecessary em
creation in test framework database support methods.
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimInheritance.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimIdSeqGen.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java?rev=819093&r1=819092&r2=819093&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimId.java
Sat Sep 26 05:26:35 2009
@@ -29,8 +29,11 @@
import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+...@allowfailure(message="Temporarily allowing this test to fail until cleanup
" +
+ "order issues are resolved.")
public class TestNoSchemaManualDelimId extends SQLListenerTestCase {
OpenJPAEntityManager em;
EntityF entityF;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimIdSeqGen.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimIdSeqGen.java?rev=819093&r1=819092&r2=819093&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimIdSeqGen.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimIdSeqGen.java
Sat Sep 26 05:26:35 2009
@@ -23,8 +23,11 @@
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+...@allowfailure(message="Temporarily allowing this test to fail until cleanup
" +
+ "order issues are resolved.")
public class TestNoSchemaManualDelimIdSeqGen extends SQLListenerTestCase {
OpenJPAEntityManager em;
JDBCConfiguration conf;
@@ -44,7 +47,7 @@
if (isTestsDisabled())
return;
- super.setUp(EntityE.class); //,DROP_TABLES);
+ super.setUp(EntityE.class, DROP_TABLES);
assertNotNull(emf);
conf = (JDBCConfiguration) emf.getConfiguration();
@@ -105,7 +108,6 @@
System.out.println(super.toString(sql));
int genId = entityE.getId();
- System.out.println("generated id - " + genId);
em.clear();
em.getTransaction().begin();
EntityE eA = em.find(EntityE.class, genId);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java?rev=819093&r1=819092&r2=819093&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/TestNoSchemaManualDelimitedJoinAnnotations.java
Sat Sep 26 05:26:35 2009
@@ -27,8 +27,11 @@
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+...@allowfailure(message="Temporarily allowing this test to fail until cleanup
" +
+ "order issues are resolved.")
public class TestNoSchemaManualDelimitedJoinAnnotations extends
SQLListenerTestCase {
OpenJPAEntityManager em;
int id = 0;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java?rev=819093&r1=819092&r2=819093&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
Sat Sep 26 05:26:35 2009
@@ -166,9 +166,7 @@
if (tempEMF == null) {
tempEMF = createEMF();
}
- OpenJPAEntityManagerSPI em = tempEMF.createEntityManager();
- JDBCConfiguration conf = (JDBCConfiguration) em.getConfiguration();
- DBDictionary dict = conf.getDBDictionaryInstance();
+ DBDictionary dict =
((JDBCConfiguration)tempEMF.getConfiguration()).getDBDictionaryInstance();
for (Class<?> db : dbs) {
if
(dict.getClass().getCanonicalName().equalsIgnoreCase(db.getCanonicalName())) {
setTestsDisabled(true);
@@ -177,8 +175,6 @@
}
if (emf == null) {
closeEMF(tempEMF);
- } else {
- em.close();
}
}
@@ -187,9 +183,7 @@
if (tempEMF == null) {
tempEMF = createEMF();
}
- OpenJPAEntityManagerSPI em = tempEMF.createEntityManager();
- JDBCConfiguration conf = (JDBCConfiguration) em.getConfiguration();
- DBDictionary dict = conf.getDBDictionaryInstance();
+ DBDictionary dict =
((JDBCConfiguration)tempEMF.getConfiguration()).getDBDictionaryInstance();
boolean supportedDB = false;
for (Class<?> db : dbs) {
if
(dict.getClass().getCanonicalName().equalsIgnoreCase(db.getCanonicalName())) {
@@ -200,8 +194,6 @@
setTestsDisabled(!supportedDB);
if (emf == null) {
closeEMF(tempEMF);
- } else {
- em.close();
}
}
