Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skip remaining 2 failing queryTimeout tests for MSSQL2005 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1028071 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-10-27 18:56:41 +00:00
parent daa090c11b
commit 9e09567ddc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
View File

@ -39,6 +39,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openjpa.persistence.OptimisticLockException;
import org.apache.openjpa.persistence.PersistenceException;
import org.apache.openjpa.persistence.QueryTimeoutException;
import org.apache.openjpa.persistence.query.common.apps.QTimeout;
@ -1057,9 +1058,12 @@ public class TestQueryTimeout extends SQLListenerTestCase {
e, eStr);
boolean bRollback = matchesExpectedException(PersistenceException.class,
e, eStr);
// 31c and 33c fail on MSSQL2005, so this is a special case to handle it
boolean bLockFailed = matchesExpectedException(OptimisticLockException.class,
e, "Unable to obtain an object lock");
// no easy way to determine exact Exception type for all DBs
assertTrue(test + " - UNEXPECTED Exception = " + e,
(bRetry || bRollback));
(bRetry || bRollback || bLockFailed));
getLog().trace(test + " - Caught expected Exception = ", e);
return bRetry;
}