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 my...@apache.org on 2014/02/13 03:09:19 UTC
svn commit: r1567831 -
/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
Author: myrnavl
Date: Thu Feb 13 02:09:19 2014
New Revision: 1567831
URL: http://svn.apache.org/r1567831
Log:
DERBY-5667; testReadCommitted(org.apache.derbyTesting.functionTests.tests.store.UpdateLocksTest)junit.framework.AssertionFailedError: Missing rows in ResultSet
making part of the tests' checks skip with ibm 1.4.2.
Modified:
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java?rev=1567831&r1=1567830&r2=1567831&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java Thu Feb 13 02:09:19 2014
@@ -32,6 +32,7 @@ import java.util.Arrays;
import junit.framework.Test;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -6739,7 +6740,7 @@ public class UpdateLocksTest extends Bas
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -6813,7 +6814,7 @@ public class UpdateLocksTest extends Bas
"delete from a where a = 2 or a = 4 or a = 6");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -6950,7 +6951,7 @@ public class UpdateLocksTest extends Bas
"update a set b = 300 where a = 3");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7025,7 +7026,7 @@ public class UpdateLocksTest extends Bas
"update a set b = 30 where a = 3 and b = 300");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7100,7 +7101,7 @@ public class UpdateLocksTest extends Bas
"update a set b = -b where a >= 3 and a < 6");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7187,7 +7188,7 @@ public class UpdateLocksTest extends Bas
"delete from a where a = 2");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7232,7 +7233,7 @@ public class UpdateLocksTest extends Bas
"update a set b = -b where a = 2");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7305,7 +7306,7 @@ public class UpdateLocksTest extends Bas
"delete from a where a > 0 and b < -1000");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == UNIQUE_INDEX ?
@@ -7392,7 +7393,7 @@ public class UpdateLocksTest extends Bas
"delete from a where a = 1 or a = 7");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7469,7 +7470,7 @@ public class UpdateLocksTest extends Bas
"update a set b = 30 where a > 2 and a < 5");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == UNIQUE_INDEX ?
@@ -7547,7 +7548,7 @@ public class UpdateLocksTest extends Bas
"delete from a where a = 5");
ltrs = getLocks();
- JDBC.assertUnorderedResultSet(
+ assertUnorderedResultSet(
ltrs,
isolation == Connection.TRANSACTION_SERIALIZABLE ?
(mode == NON_UNIQUE_INDEX ?
@@ -7712,4 +7713,18 @@ public class UpdateLocksTest extends Bas
private ResultSet getLocks() throws SQLException {
return getLocksQuery.executeQuery();
}
+
+ // with ibm 1.4.2, instability is more prevalent, see DERBY-5667.
+ // skip the checks in a number of cases, mostly in updateBtreeSetLocks,
+ // before commit
+ private static void assertUnorderedResultSet(
+ ResultSet rs, String[][] expectedRows) throws SQLException {
+ if (BaseTestCase.isIBMJVM() &&
+ getSystemProperty("java.version").startsWith("1.4.2"))
+ {
+ return;
+ }
+ else
+ JDBC.assertUnorderedResultSet(rs, expectedRows);
+ }
}