Changeset 4374

Timestamp:

Jun 23, 2005, 4:11:59 PM (21 years ago)

Author:

evanalst

Message:

Update test case for psDBDumpCols to test for invalid arguments.

Location:

trunk/psLib/test/dataIO

Files:

• tst_psDB.c (modified) (3 diffs)
• verified/tst_psDB.stderr (modified) (1 diff)

trunk/psLib/test/dataIO/tst_psDB.c

@@ -9 +9 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-24 01:49:25 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-24 02:11:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1549 +1549 @@
                 return 5*(itemNum+1);
             }
-            //                if(((psArray*)mdItem->data[0])->type.type != PS_TYPE_S32) {
-            //                    psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
-            //                            itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32);
-            //                    psDBDropTable(dbh,table);
-            //                    psDBCleanup(dbh);
-            //                    return 6*(itemNum+1);
-            //                }
             if(((psArray*)mdItem->data.V)->n != 3) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
@@ -1730 +1723 @@
     psFree(mdIter);
     psFree(meta);
+
+    // Attempt to dump columns from NULL database object
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL database");
+    if(psDBDumpCols(NULL,table) != NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect non-NULL when dumping columns from NULL database");
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 10;
+    }
+
+    // Attempt to dump columns for NULL table
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL table");
+    if(psDBDumpCols(dbh,NULL) != NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect non-NULL when dumping columns from NULL table");
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 11;
+    }
+
 
     psDBDropTable(dbh, table);

trunk/psLib/test/dataIO/verified/tst_psDB.stderr

@@ -263 +263 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|TPDBDumpCols
+    Following should generate an error message for NULL database
+<DATE><TIME>|<HOST>|E|psDBDumpCols (FILE:LINENO)
+    Invalid psDB has been specified.
+<DATE><TIME>|<HOST>|I|TPDBDumpCols
+    Following should generate an error message for NULL table
+<DATE><TIME>|<HOST>|E|psDBDumpCols (FILE:LINENO)
+    NULL table specified.
 
 ---> TESTPOINT PASSED (psDB{dbDumpCols} | tst_psDB.c)