db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1567823 - in /db/derby/code/branches/10.10: ./ java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java java/testing/org/apache/derbyTesting/junit/JDBC.java
Date Thu, 13 Feb 2014 01:21:17 GMT
Author: myrnavl
Date: Thu Feb 13 01:21:16 2014
New Revision: 1567823

URL: http://svn.apache.org/r1567823
Log:
DERBY-5667;  testReadCommitted(org.apache.derbyTesting.functionTests.tests.store.UpdateLocksTest)junit.framework.AssertionFailedError:
Missing rows in ResultSet
   backport of revision 1567787 from trunk - improve error message

Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/JDBC.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1567787

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java?rev=1567823&r1=1567822&r2=1567823&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
Thu Feb 13 01:21:16 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.10/java/testing/org/apache/derbyTesting/junit/JDBC.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/JDBC.java?rev=1567823&r1=1567822&r2=1567823&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/JDBC.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/JDBC.java Thu
Feb 13 01:21:16 2014
@@ -1446,7 +1446,11 @@ public class JDBC {
         rs.close();
 
         if (rowCountsMustMatch) {
-            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 + "\n";
+            Assert.assertEquals(message,
                                 expectedRows.length, actual.size());
         }
         if ( !actual.containsAll(expected) )



Mime
View raw message