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:03:55 UTC
svn commit: r1567828 - in /db/derby/code/branches/10.8: ./
java/client/org/apache/derby/client/net/NetCursor.java
java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
java/testing/org/apache/derbyTesting/junit/JDBC.java
Author: myrnavl
Date: Thu Feb 13 02:03:54 2014
New Revision: 1567828
URL: http://svn.apache.org/r1567828
Log:
DERBY-5667; testReadCommitted(org.apache.derbyTesting.functionTests.tests.store.UpdateLocksTest)junit.framework.AssertionFailedError: Missing rows in ResultSet
merge of revision 1567826 from 10.9 branch
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/JDBC.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/code/branches/10.9:r1567826
Merged /db/derby/code/trunk:r1567787
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/branches/10.9/java/client/org/apache/derby/client/net/NetCursor.java:r1567826
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=1567828&r1=1567827&r2=1567828&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:03:54 2014
@@ -68,6 +68,8 @@ public class UpdateLocksTest extends Bas
try {
dropTable("a");
+ // commit to prevent message 'table/view a already exists'
+ commit();
} catch (SQLException e) {
assertSQLState("42Y55", e);
}
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/JDBC.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/JDBC.java?rev=1567828&r1=1567827&r2=1567828&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/JDBC.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/JDBC.java Thu Feb 13 02:03:54 2014
@@ -1363,9 +1363,13 @@ public class JDBC {
}
rs.close();
- Assert.assertEquals("Unexpected row count",
+ String message = "Unexpected row count, expected: " + expectedRows.length +
+ ", actual: " + actual.size() + "\n" +
+ "\t expected rows: \n\t\t"
+ + expected + "\n\t actual result: \n\t\t" + actual;
+ Assert.assertEquals(message,
expectedRows.length, actual.size());
- String message = "Missing rows in ResultSet; \n\t expected rows: \n\t\t"
+ message = "Missing rows in ResultSet; \n\t expected rows: \n\t\t"
+ expected + "\n\t actual result: \n\t\t" + actual;
Assert.assertTrue(message,
actual.containsAll(expected));