Changeset 12357 for trunk/psLib/test/db/tap_psDB.c

Timestamp:

Mar 8, 2007, 3:46:44 PM (19 years ago)

Author:

jhoblitt

Message:

more cleanup

File:

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

trunk/psLib/test/db/tap_psDB.c

@@ -6 +6 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-09 01:41:22 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-09 01:46:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -137 +137 @@
 
             row = psMetadataAlloc();
-            psMetadataAdd(row, PS_LIST_TAIL, "color", PS_DATA_STRING, NULL, "");
+            psMetadataAdd(row, PS_LIST_TAIL, "color", PS_DATA_STRING, NULL, NULL);
             psArrayAdd(rowSet, 0, row);
             psFree(row);
@@ -157 +157 @@
             ok(psArrayLength(column) == 3, "psDBSelectColumn() - number of elements");
 
-            for (long i = 0; i < column->n; i++) {
-                printf("\thorse color is: %s\n", (char *)column->data[i]);
-            }
+            // 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'");
 
             psFree(column);