db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1811511 - in /db/derby/code/branches/10.14: ./ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Date Sun, 08 Oct 2017 22:32:13 GMT
Author: rhillegas
Date: Sun Oct  8 22:32:13 2017
New Revision: 1811511

URL: http://svn.apache.org/viewvc?rev=1811511&view=rev
Log:
DERBY-6968: Port 1811510 from trunk to 10.14 branch.

Modified:
    db/derby/code/branches/10.14/   (props changed)
    db/derby/code/branches/10.14/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Propchange: db/derby/code/branches/10.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  8 22:32:13 2017
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
 /db/derby/code/branches/10.8:1177474,1234973,1464951
 /db/derby/code/branches/10.9:1373148
-/db/derby/code/trunk:1063809
+/db/derby/code/trunk:1063809,1811510

Modified: db/derby/code/branches/10.14/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.14/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1811511&r1=1811510&r2=1811511&view=diff
==============================================================================
--- db/derby/code/branches/10.14/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
(original)
+++ db/derby/code/branches/10.14/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Sun Oct  8 22:32:13 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);
         



Mime
View raw message