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 rh...@apache.org on 2017/10/08 22:12:45 UTC
svn commit: r1811510 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Author: rhillegas
Date: Sun Oct 8 22:12:45 2017
New Revision: 1811510
URL: http://svn.apache.org/viewvc?rev=1811510&view=rev
Log:
DERBY-6968: Attempt to fix instability in DatabaseMetaDataTest.getBestRowIdentifier(); commit derby-6968-01-aa-assertUnorderedResultSet.diff.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1811510&r1=1811509&r2=1811510&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Sun Oct 8 22:12:45 2017
@@ -3576,12 +3576,12 @@ public class DatabaseMetaDataTest extend
{"2", "I", "4", "INTEGER", "4", null, "10", "1"},
{"2", "VC10", "12", "VARCHAR", "10", null, null, "1"}
};
- JDBC.assertFullResultSet(rs[0], expRS, true);
+ JDBC.assertUnorderedResultSet(rs[0], expRS, true);
// set buffer_length expected for ODBC; for most of the simple
// tables/rows in our test it's "4" so set in verifyBRIResults
expRS[0][5] = "4";
expRS[1][5] = "20";
- JDBC.assertFullResultSet(rs[1], expRS, true);
+ JDBC.assertUnorderedResultSet(rs[1], expRS, true);
// test DERBY-2610 for fun; can't pass in null table name
try {
@@ -3597,10 +3597,10 @@ public class DatabaseMetaDataTest extend
expRS = new String [][] {
{"2", "TABLEID", "1", "CHAR", "36", null, null, "1"}
};
- JDBC.assertFullResultSet(rs[0], expRS, true);
+ JDBC.assertUnorderedResultSet(rs[0], expRS, true);
// set buffer_length expected for ODBC
expRS[0][5] = "72";
- JDBC.assertFullResultSet(rs[1], expRS, true);
+ JDBC.assertUnorderedResultSet(rs[1], expRS, true);
getConnection().setAutoCommit(true);