Changeset 12356

Timestamp:

Mar 8, 2007, 3:41:22 PM (19 years ago)

Author:

jhoblitt

Message:

cleanups
fix test count

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.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-09 01:37:55 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-09 01:41:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 #endif
 
-    plan_tests(2);
+    plan_tests(25 + 1);
 
     // see if we can open a db connection at all
@@ -155 +155 @@
             psArray *column = psDBSelectColumn(dbh, "horse", "color", 42);
             ok(column, "psDBSelectColumn() - select");
-            ok(column->n == 3, "psDBSelectColumn() - number of elements");
+            ok(psArrayLength(column) == 3, "psDBSelectColumn() - number of elements");
 
             for (long i = 0; i < column->n; i++) {
@@ -168 +168 @@
             psVector *column = psDBSelectColumnNum(dbh, "yak", "hair", PS_TYPE_F32, 42);
             ok(column, "psDBSelectColumnNum() - select");
-            ok(column->n == 2, "psDBSelectColumnNum() - number of elements");
+            ok(psVectorLength(column) == 2, "psDBSelectColumnNum() - number of elements");
 
             for (long i = 0; i < column->n; i++) {
@@ -187 +187 @@
             psArray *resultSet = psDBSelectRows(dbh, "horse", md, 0);
             ok(resultSet, "psDBSelectRows() - select");
-            ok(resultSet->n == 1, "psDBSelectRows() - number of rows");
+            ok(psArrayLength(resultSet) == 1, "psDBSelectRows() - number of rows");
 
             psFree(md);
@@ -210 +210 @@
             psArray *resultSet = psDBDumpRows(dbh, "horse");
             ok(resultSet, "psDBDumpRows() - dump");
-            ok(resultSet->n == 3, "psDBDumpRows() - number of rows");
+            ok(psArrayLength(resultSet) == 3, "psDBDumpRows() - number of rows");
             psFree(resultSet);
         }