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 da...@apache.org on 2014/08/07 18:04:18 UTC
svn commit: r1616520 - in /db/derby/code/branches/10.11: ./
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Author: dag
Date: Thu Aug 7 16:04:18 2014
New Revision: 1616520
URL: http://svn.apache.org/r1616520
Log:
DERBY-6623 DatabaseMetaDataTest fails intermittently
Backported cleanly from trunk as:
svn merge -c 1615821 https://svn.apache.org/repos/asf/db/derby/code/trunk
Another instance of the test neglecting to consider that the rows may
legimimately come back in another order. Switched to using
assertFullUnorderedResultSet instead of assertFullResultSet.
Modified:
db/derby/code/branches/10.11/ (props changed)
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1615821
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1616520&r1=1616519&r2=1616520&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Thu Aug 7 16:04:18 2014
@@ -4328,12 +4328,12 @@ public class DatabaseMetaDataTest extend
assertFullResultSet(rs, expRS2, true);
rs = getImportedKeys(null, schema, "REFTAB");
- assertFullResultSet(rs, expRS1, true);
+ assertFullUnorderedResultSet(rs, expRS1, true);
rs = getImportedKeys(null, schema, "REFTAB2");
assertFullResultSet(rs, expRS2, true);
rs = getImportedKeys(null, null, "REFTAB");
- assertFullResultSet(rs, expRS1, true);
+ assertFullUnorderedResultSet(rs, expRS1, true);
rs = getImportedKeys(null, "", "REFTAB");
JDBC.assertEmpty(rs[0]);