db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r515508 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNet/setTransactionIsolation.out tests/jdbcapi/setTransactionIsolation.java
Date Wed, 07 Mar 2007 10:04:47 GMT
Author: kahatlen
Date: Wed Mar  7 02:04:42 2007
New Revision: 515508

URL: http://svn.apache.org/viewvc?view=rev&rev=515508
Log:
DERBY-2399: Convert setTransactionIsolation.java to JUnit

Fixed failure when running the test under DerbyNet.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
      - copied, changed from r514876, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java

Copied: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
(from r514876, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out?view=diff&rev=515508&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out&r1=514876&p2=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out&r2=515508
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
Wed Mar  7 02:04:42 2007
@@ -493,4 +493,4 @@
 insert into t1copy (select * from t1)
 A lock could not be obtained within the time requested
 FAIL: setTransactionIsolation() did not throw exception with open hold cursor
-count=1, setTransactionIsolation() does not commit
+passCommitCheck=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java?view=diff&rev=515508&r1=515507&r2=515508
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
Wed Mar  7 02:04:42 2007
@@ -243,13 +243,13 @@
             boolean passCommitCheck = false;
             switch (count) {
             case 1:
-                // Embedded doesn't commit
-                if (TestUtil.isEmbeddedFramework())
+                // Embedded and JCC don't commit
+                if (TestUtil.isEmbeddedFramework() || TestUtil.isJCCFramework())
                     passCommitCheck = true;
                 break;
             case 2:
                 // Client commits
-                if (TestUtil.isNetFramework())
+                if (TestUtil.isDerbyNetClientFramework())
                     passCommitCheck = true;
                 break;
             default:



Mime
View raw message