svn commit: r616514 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

[dj...@apache.org]

Author: djd
Date: Tue Jan 29 12:48:32 2008
New Revision: 616514

URL: http://svn.apache.org/viewvc?rev=616514&view=rev
Log:
Fix mistake made in commit for DERBY-3350 where DatabaseMetaDataTest was only run for embedded. The fix to DERBY-3350 exposes a couple of more columns that are incorrect due to DERBY-3171.

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=616514&r1=616513&r2=616514&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 Tue Jan 29 12:48:32 2008
@@ -193,7 +193,7 @@
     public static Test suite() {
         TestSuite suite = new TestSuite("DatabaseMetaDataTest");
         suite.addTest(
-            TestConfiguration.embeddedSuite(DatabaseMetaDataTest.class));
+            TestConfiguration.defaultSuite(DatabaseMetaDataTest.class));
         // Test for DERBY-2584 needs a fresh database to ensure that the
         // meta-data queries haven't already been compiled. No need to run the
         // test in client/server mode since it only tests the compilation of
@@ -737,9 +737,9 @@
         if (usingDerbyNetClient())
             nullval = false;
         boolean [] nullability = {
-                true, true, false, true, nullval, true, nullval,
+                true, true, false, nullval, nullval, nullval, nullval,
                 nullval, nullval, nullval, true, true, nullval, nullval,
-                nullval, nullval, true, true, true, true, true
+                nullval, nullval, nullval, true, true, true, true
         };
             
         assertMetaDataResultSet(rs, columnNames, columnTypes, nullability);