Author: dwoods
Date: Fri Apr 9 00:35:34 2010
New Revision: 932195
URL: http://svn.apache.org/viewvc?rev=932195&view=rev
Log:
OPENJPA-1616 Fix TestTimeoutException tests for Oracle and re-enable for DB2
Modified:
openjpa/branches/2.0.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
Modified:
openjpa/branches/2.0.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml?rev=932195&r1=932194&r2=932195&view=diff
==============================================================================
---
openjpa/branches/2.0.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml
(original)
+++
openjpa/branches/2.0.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-error-state-codes.xml
Fri Apr 9 00:35:34 2010
@@ -164,7 +164,7 @@
</dictionary>
<dictionary class="org.apache.openjpa.jdbc.sql.OracleDictionary">
- <lock>42000,61000</lock>
+ <lock>42000,61000,72000</lock>
<referential-integrity>1,1400,1722,2291,2292</referential-integrity>
<object-exists>23000</object-exists>
<object-not-found></object-not-found>
Modified:
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java?rev=932195&r1=932194&r2=932195&view=diff
==============================================================================
---
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
(original)
+++
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
Fri Apr 9 00:35:34 2010
@@ -43,9 +43,6 @@ public class TestTimeoutException extend
private final Class<?> entityClass = PObject.class;
public void setUp() {
- // TODO - Hack until OPENJPA-1594 is addressed
- setUnsupportedDatabases(OracleDictionary.class, DB2Dictionary.class);
-
// Disable tests for any DB that has supportsSelectForUpdate==false,
like HSQLDictionary
OpenJPAEntityManagerFactorySPI tempEMF = emf;
if (tempEMF == null) {
