Changeset 12415

Timestamp:

Mar 12, 2007, 2:23:20 PM (19 years ago)

Author:

jhoblitt

Message:

minor cleanups

File:

• trunk/psLib/test/astro/tap_psTime_04.c (modified) (4 diffs)

trunk/psLib/test/astro/tap_psTime_04.c

@@ -18 +18 @@
  *  @author  David Robbins, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-01-19 20:42:21 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-03-13 00:23:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 #include "pstap.h"
 
-psS32 main(psS32 argc, char* argv[])
+int main(int argc, char* argv[])
 {
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(15);
+    plan_tests(16);
 
 
@@ -117 +117 @@
     {
         psMemId id = psMemGetId();
-        psTime *empty = NULL;
         psTime *tide = NULL;
         psTime *noTide = psTimeAlloc(PS_TIME_UTC);
@@ -125 +124 @@
         // Following should generate error message
         // XXX: We do not test error generation here
-        empty = psTime_TideUT1Corr(tide);
+        psTime *empty = empty = psTime_TideUT1Corr(tide);
         ok(empty == NULL, "psTime_TideUT1Corr() returned NULL for NULL input time");
 
         empty = psTime_TideUT1Corr(noTide);
-        ok((empty->sec == 1049160599) && (empty->nsec == 656981971),
-           "psTime_TideUT1Corr() returned correct values");
+        is_long(empty->sec, 1049160599, "psTime_TideUT1Corr() returned correct ->sec");
+        is_long(empty->nsec, 656981971, "psTime_TideUT1Corr() returned correct ->nsec");
 
         ok(p_psTimeFinalize(), "p_psTimeFinalize() successful");
+
         psFree(empty);
         psFree(noTide);