Changeset 12395

Timestamp:

Mar 9, 2007, 5:25:48 PM (19 years ago)

Author:

jhoblitt

Message:

fix 2 failing tests (logic errors)
change 2 failing tests to use ok_str() so it's obvious why they are failing

File:

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

trunk/psLib/test/astro/tap_psTime_01.c

@@ -23 +23 @@
  *  @author  Eric Van Alst, 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-10 03:25:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -506 +506 @@
         time->nsec = testTime1NanosecondsUTC;
         char *timeStr = psTimeToISO(time);
-        ok(strcmp(timeStr,testTime1Str) == 0, "psTimeToISO(time) returned correct time (no leapsecond)");
+        ok_str(timeStr, testTime1Str, "psTimeToISO(time) returned correct time (no leapsecond)");
         psFree(timeStr);
         psFree(time);
@@ -523 +523 @@
         time->leapsecond = true;
         char *timeStr = psTimeToISO(time);
-        ok(strcmp(timeStr,testTime1StrLeap) == 0, "psTimeToISO(time) returned correct time (with leapsecond)");
+        ok_str(timeStr, testTime1StrLeap, "psTimeToISO(time) returned correct time (with leapsecond)");
         psFree(timeStr);
         psFree(time);
@@ -639 +639 @@
         psMemId id = psMemGetId();
         psTime *time = psTimeFromJD(testTime4JD);
-        ok(time->type != PS_TIME_TAI, "psTimeFromJD() returned the correct type");
-        ok(time->sec != testTime4SecondsUTC, "psTimeFromJD() returned the correct ->sec");
+        is_int(time->type, PS_TIME_TAI, "psTimeFromJD() returned the correct type");
+        is_int(time->sec, testTime4SecondsUTC, "psTimeFromJD() returned the correct ->sec");
         psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");