Changeset 4270

Timestamp:

Jun 14, 2005, 5:20:36 PM (21 years ago)

Author:

evanalst

Message:

Update test case for psCreateTable to verify invalid arguments.

Location:

trunk/psLib/test/dataIO

Files:

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

trunk/psLib/test/dataIO/tst_psDB.c

@@ -9 +9 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 01:48:25 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 03:20:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
                               {TPDBInit,           841,  "dbInit",            0, false},
                               {TPDBChange,         842,  "dbChange",          0, false},
-                              {TPDBCreateTable,     -3,  "dbCreateTable",     0, false},
+                              {TPDBCreateTable,    843,  "dbCreateTable",     0, false},
                               {TPDBDropTable,       -4,  "dbDropTable",       0, false},
                               {TPDBSelectColumn,    -5,  "dbSelectColumn",    0, false},
@@ -305 +305 @@
 
     // Attempt to initialize database with invalid arguments
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid host");
     dbh = psDBInit("xxx",NULL,NULL,NULL);
     if(dbh != NULL) {
@@ -312 +313 @@
 
     // Attempt cleanup database/connection with NULL psDB object
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL database objec");
     psDBCleanup(NULL);
 
@@ -336 +338 @@
 
     // Attemp to change database to invalid database name
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid database");
     if(psDBChange(dbh,"abc")) {
         psError(PS_ERR_UNKNOWN,true,"Did not expect return true for unknown database name");
@@ -345 +348 @@
 
     // Attempt to change database with NULL database object
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for null database object");
     if(psDBChange(NULL,dbname)) {
         psError(PS_ERR_UNKNOWN,true,"Did not expect return true for NULL database object");
@@ -353 +357 @@
 }
 
-// Testpoint #XXX, psDBCreateTable shall create tables in the test database ...
+// Testpoint #843, psDBCreateTable shall create tables in the test database ...
 psS32 TPDBCreateTable( void )
 {
-    psS32 failed = 0;
     psDB *dbh = NULL;
     const char* table = "table1";
+
+    // Create metadata for table definition
     psMetadata *md = _get_CreateTableMetadata();
 
-    dbh = _init_psDB();
-    if (dbh == NULL) {
-        return 1;
-    }
-
-    psLogMsg( __func__, PS_LOG_INFO, "psDBCreateTable shall create a new table in the new test database.\n" );
-
-    failed = ! psDBCreateTable(dbh, table, md);
-    if (!failed) {
+    // Initialize database connection
+    dbh = _init_psDB();
+    if (dbh == NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL for valid argument in database connection");
+        return 1;
+    }
+
+    // Attempt to create database table with valid arguments
+    if(!psDBCreateTable(dbh, table, md)) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect return of false for valid arguments");
+        return 2;
+    } else {
+        // Drop the table from the test database
         psDBDropTable(dbh, table);
     }
 
+    // Free metadata definition of table
     psFree(md);
-    psDBCleanup(dbh);
-
-    return failed;
+
+    // Attempt to create table with NULL table definition
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL parameter");
+    if(psDBCreateTable(dbh,table,NULL)) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect return of true for NULL metadata object");
+        return 3;
+    }
+
+    // Attempt to create table with NULL connection
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL parameter");
+    if(psDBCreateTable(NULL, table, md)) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect return of true for NULL database object");
+        return 4;
+    }
+
+    // Close/cleanup database connection
+    psDBCleanup(dbh);
+
+    return 0;
 }
 

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

@@ -5 +5 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|TPDBInit
+    Following should generate error message for invalid host
 <DATE><TIME>|<HOST>|E|psDBInit (FILE:LINENO)
     Failed to connect to database.  Error: Unknown MySQL server host 'xxx' (1)
+<DATE><TIME>|<HOST>|I|TPDBInit
+    Following should generate error message for NULL database objec
 <DATE><TIME>|<HOST>|E|psDBCleanup (FILE:LINENO)
     Invalid psDB has been specified.
@@ -18 +22 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|TPDBChange
+    Following should generate error message for invalid database
 <DATE><TIME>|<HOST>|E|psDBChange (FILE:LINENO)
     Failed to change database.  Error: Access denied for user ''@'localhost' to database 'abc'
+<DATE><TIME>|<HOST>|I|TPDBChange
+    Following should generate error message for null database object
 <DATE><TIME>|<HOST>|E|psDBChange (FILE:LINENO)
     Invalid psDB has been specified.
@@ -32 +40 @@
 
 <DATE><TIME>|<HOST>|I|TPDBCreateTable
-    psDBCreateTable shall create a new table in the new test database.
+    Following should generate an error message for NULL parameter
+<DATE><TIME>|<HOST>|E|psDBGenerateCreateTableSQL (FILE:LINENO)
+    Create table parameters may not be NULL.
+<DATE><TIME>|<HOST>|E|psDBCreateTable (FILE:LINENO)
+    Query generation failed.
+<DATE><TIME>|<HOST>|I|TPDBCreateTable
+    Following should generate an error message for NULL parameter
+<DATE><TIME>|<HOST>|E|psDBCreateTable (FILE:LINENO)
+    Invalid psDB has been specified.
 
 ---> TESTPOINT PASSED (psDB{dbCreateTable} | tst_psDB.c)