Changeset 12393

Timestamp:

Mar 9, 2007, 3:24:09 PM (19 years ago)

Author:

jhoblitt

Message:

update/forward port all "orginal" psDB tests

File:

• trunk/psLib/test/db/tap_psDB.c (modified) (10 diffs)

trunk/psLib/test/db/tap_psDB.c

@@ -6 +6 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-09 01:46:44 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-10 01:24:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 #endif
 
-    plan_tests(25 + 1);
+    plan_tests(34 + 1);
 
     // see if we can open a db connection at all
@@ -50 +50 @@
     {
         psDB *dbh = psDBInit(HOST, USER, PASSWD, DBNAME, PORT);
+
+        skip_start(!psDBCreate(dbh, "foobar"), 4,
+                "you probably don't have proper database permissions");
         ok(psDBCreate(dbh, "foobar"), "psDBCreate()");
         ok(psDBChange(dbh, "foobar"), "psDBChange()");
@@ -55 +58 @@
         // change back to the test dbname
         ok(psDBChange(dbh, DBNAME), "psDBChange()");
+        skip_end();
+
         psFree(dbh);
     }
@@ -155 +160 @@
             psArray *column = psDBSelectColumn(dbh, "horse", "color", 42);
             ok(column, "psDBSelectColumn() - select");
-            ok(psArrayLength(column) == 3, "psDBSelectColumn() - number of elements");
+            is_long(psArrayLength(column), 3, "psDBSelectColumn() - number of elements");
 
             // XXX this test is depending on the order the rows come out it...
             // this shouldn't be depended upon
-            ok(strcmp("brown", (char *)column->data[0]) == 0, "horse.color == 'brown'");
-            ok((char *)column->data[1] == NULL, "horse.color == NULL");
-            ok(strcmp("pink", (char *)column->data[2]) == 0,  "horse.color == 'pink'");
+            ok_str((char *)column->data[0], "brown", "horse.color == 'brown'");
+            ok((char *)column->data[1] == NULL,    "horse.color == NULL");
+            ok_str((char *)column->data[2], "pink",  "horse.color == 'pink'");
 
             psFree(column);
@@ -170 +175 @@
             psVector *column = psDBSelectColumnNum(dbh, "yak", "hair", PS_TYPE_F32, 42);
             ok(column, "psDBSelectColumnNum() - select");
-            ok(psVectorLength(column) == 2, "psDBSelectColumnNum() - number of elements");
-
-            for (long i = 0; i < column->n; i++) {
-                printf("\tyak hair count is: %f\n", column->data.F32[i]);
-                if (isnan(column->data.F32[i])){
-                    printf("\t\tNO yak hair!!! (it's a nan)\n");
-                }
-            }
+            is_long(psVectorLength(column), 2, "psDBSelectColumnNum() - number of elements");
+
+            ok_float(column->data.F32[0], 10e3, "hair == 10e3")
+            ok_float(column->data.F32[1], NAN, "hair == NAN")
 
             psFree(column);
@@ -189 +190 @@
             psArray *resultSet = psDBSelectRows(dbh, "horse", md, 0);
             ok(resultSet, "psDBSelectRows() - select");
-            ok(psArrayLength(resultSet) == 1, "psDBSelectRows() - number of rows");
+            is_long(psArrayLength(resultSet), 1, "psDBSelectRows() - number of rows");
 
             psFree(md);
@@ -195 +196 @@
                 md = (psMetadata *)resultSet->data[0];
 
-                psListIterator *cursor = psListIteratorAlloc(md->list, 0, NULL);
-
-                psMetadataItem *item;
-                while ((item = psListGetAndIncrement(cursor))) {
-                    printf("\tcolum name is: %s, value is: %s\n", item->name, (char *)item->data.V);
-                }
-
-                psFree(cursor);
+                psMetadataItem *item = psListGet(md->list, 0);
+                ok_str(item->name, "color", "column name");
+                ok_str((char *)item->data.V, "brown", "column value");
             }
             psFree(resultSet);
@@ -222 +218 @@
             ok(psListLength(columns->list) == 1, "psDBDumpCols() - number of columns");
 
-            psListIterator *cursor = psListIteratorAlloc(columns->list, 0, NULL);
-
-            psMetadataItem  *item;
-            while ((item = psListGetAndIncrement(cursor))) {
-                printf("\tcolumn name is: %s\n", item->name);
-            }
-
-            psFree(cursor);
+            psMetadataItem *item = psListGet(columns->list, 0);
+            ok_str(item->name, "color", "column name");
+            is_long(psArrayLength((psArray*)item->data.V), 3, "column array length");
+
             psFree(columns);
         }
@@ -252 +244 @@
                 psMetadata *md = (psMetadata *)resultSet->data[0];
 
-                psListIterator  *cursor = psListIteratorAlloc(md->list, 0, NULL);
-
-                psMetadataItem  *item;
-                bool test_ok = true;
-                while ((item = psListGetAndIncrement(cursor))) {
-                    if (strcmp((char *)item->data.V, "HOT pink") == 0) {
-                        printf("\thorse color is: %s\n", (char *)item->data.V);
-                    } else {
-                        test_ok = false;
-                    }
-                }
-                ok(test_ok, "psDBUpdateRows() - psDBSelectRows() found HOT pink");
-
-                psFree(cursor);
+                psMetadataItem *item = psListGet(md->list, 0);
+                ok_str((char *)item->data.V, "HOT pink", "psDBUpdateRows() - psDBSelectRows() found HOT pink");
+
             }