You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2007/03/05 22:45:02 UTC
svn commit: r514877 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/jdbcapi/
Author: kmarsden
Date: Mon Mar 5 13:45:01 2007
New Revision: 514877
URL: http://svn.apache.org/viewvc?view=rev&rev=514877
Log:
DERBY-2399 convert setTransactionIsolationIsolation to JUnit
Fix setTransactionIsolation output to have single master and
include in JDBCHarnessJavaTest
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out?view=diff&rev=514877&r1=514876&r2=514877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out Mon Mar 5 13:45:01 2007
@@ -529,4 +529,4 @@
insert into t1copy (select * from t1)
A lock could not be obtained within the time requested
EXPECTED EXCEPTION SQLSTATE:X0X03 Invalid transaction state - held cursor requires same isolation level
-count=1, setTransactionIsolation() does not commit
+passCommitCheck=true
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?view=diff&rev=514877&r1=514876&r2=514877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall Mon Mar 5 13:45:01 2007
@@ -10,6 +10,5 @@
jdbcapi/secureUsers1.sql
jdbcapi/LOBTest.java
jdbcapi/parameterMapping.java
-jdbcapi/setTransactionIsolation.java
jdbcapi/testRelative.java
jdbcapi/SURTest_ij.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java?view=diff&rev=514877&r1=514876&r2=514877
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java Mon Mar 5 13:45:01 2007
@@ -61,7 +61,7 @@
"maxfieldsize",
//"LOBTest", TODO: investigate failure/convert
// "parameterMapping", TODO: investigate failure/convert
- // "setTransactionIsolation", TODO: investigate failure/convert
+ "setTransactionIsolation",
"SetQueryTimeoutTest",
"prepStmtNull",
// "testRelative", TODO: passes embedded, fails client - investigate failure/convert
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=514877&r1=514876&r2=514877
==============================================================================
--- 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 Mon Mar 5 13:45:01 2007
@@ -240,21 +240,25 @@
ResultSet rs = s.executeQuery("select count(*) from t3");
rs.next();
int count = rs.getInt(1);
+ boolean passCommitCheck = false;
switch (count) {
case 1:
- System.out.println("count="+ count +
- ", setTransactionIsolation() does not commit");
+ // Embedded doesn't commit
+ if (TestUtil.isEmbeddedFramework())
+ passCommitCheck = true;
break;
case 2:
- System.out.println("count="+ count +
- ", setTransactionIsolation() commits");
+ // Client commits
+ if (TestUtil.isNetFramework())
+ passCommitCheck = true;
break;
default:
System.out.println("FAIL: count="+ count +
", unexepected behaviour from testSetTransactionIsolationCommits");
break;
}
- rs.close();
+ System.out.println("passCommitCheck=" +passCommitCheck);
+ rs.close();
s.close();
} catch (SQLException se) {
System.out.println(se.getMessage());