You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/07/28 17:35:13 UTC
svn commit: r980101 -
/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
Author: faywang
Date: Wed Jul 28 15:35:13 2010
New Revision: 980101
URL: http://svn.apache.org/viewvc?rev=980101&view=rev
Log:
OPENJPA-1726: exclude the test case from running on Postgres as Postgres does not support setQueryTimeout.
Modified:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
Modified: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java?rev=980101&r1=980100&r2=980101&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java (original)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java Wed Jul 28 15:35:13 2010
@@ -34,6 +34,7 @@ import junit.framework.AssertionFailedEr
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.persistence.LockTimeoutException;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
import org.apache.openjpa.util.OpenJPAException;
@@ -46,6 +47,23 @@ public class TestPessimisticLocks extend
private DBDictionary dict = null;
public void setUp() {
+ // Disable tests for any DB that has supportsQueryTimeout==false, like Postgres
+ OpenJPAEntityManagerFactorySPI tempEMF = emf;
+ if (tempEMF == null) {
+ tempEMF = createEMF();
+ }
+ assertNotNull(tempEMF);
+ DBDictionary dict = ((JDBCConfiguration)tempEMF.getConfiguration()).getDBDictionaryInstance();
+ assertNotNull(dict);
+ if (!dict.supportsQueryTimeout)
+ setTestsDisabled(true);
+ if (emf == null) {
+ closeEMF(tempEMF);
+ }
+
+ if (isTestsDisabled())
+ return;
+
setUp(CLEAR_TABLES, Employee.class, Department.class, "openjpa.LockManager", "mixed");
EntityManager em = null;