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

Timestamp:

Mar 27, 2007, 12:52:03 PM (19 years ago)

Author:

jhoblitt

Message:

s/is_float/is_float/g
s/is_float_tol/is_float_tol/g
s/is_double/is_double/g
s/is_double_tol/is_double_tol/g
s/is_str/is_str/g
s/is_strn/is_strn/g

File:

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

trunk/psLib/test/db/tap_psDB.c

@@ -6 +6 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-10 01:24:09 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-27 22:52:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
             // XXX this test is depending on the order the rows come out it...
             // this shouldn't be depended upon
-            ok_str((char *)column->data[0], "brown", "horse.color == 'brown'");
+            is_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'");
+            is_str((char *)column->data[2], "pink",  "horse.color == 'pink'");
 
             psFree(column);
@@ -177 +177 @@
             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")
+            is_float(column->data.F32[0], 10e3, "hair == 10e3")
+            is_float(column->data.F32[1], NAN, "hair == NAN")
 
             psFree(column);
@@ -197 +197 @@
 
                 psMetadataItem *item = psListGet(md->list, 0);
-                ok_str(item->name, "color", "column name");
-                ok_str((char *)item->data.V, "brown", "column value");
+                is_str(item->name, "color", "column name");
+                is_str((char *)item->data.V, "brown", "column value");
             }
             psFree(resultSet);
@@ -219 +219 @@
 
             psMetadataItem *item = psListGet(columns->list, 0);
-            ok_str(item->name, "color", "column name");
+            is_str(item->name, "color", "column name");
             is_long(psArrayLength((psArray*)item->data.V), 3, "column array length");
 
@@ -245 +245 @@
 
                 psMetadataItem *item = psListGet(md->list, 0);
-                ok_str((char *)item->data.V, "HOT pink", "psDBUpdateRows() - psDBSelectRows() found HOT pink");
+                is_str((char *)item->data.V, "HOT pink", "psDBUpdateRows() - psDBSelectRows() found HOT pink");
 
             }