Changeset 12607 for trunk/psLib/test/astro/tap_psTime_03.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/astro/tap_psTime_03.c (modified) (11 diffs)

trunk/psLib/test/astro/tap_psTime_03.c

@@ -11 +11 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-03-13 00:19:21 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-03-27 22:52:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -326 +326 @@
 
         psF64 delta = psTimeDelta(NULL, NULL);
-        ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(NULL, NULL) returned 0.0");
+        is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(NULL, NULL) returned 0.0");
 
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -341 +341 @@
 
         psF64 delta = psTimeDelta(time1, NULL);
-        ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0");
+        is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0");
 
         psFree(time1);
@@ -360 +360 @@
 
         psF64 delta = psTimeDelta(time1, time2);
-        ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time1 arg");
+        is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time1 arg");
 
         psFree(time1);
@@ -382 +382 @@
 
         psF64 delta = psTimeDelta(time1, time2);
-        ok_double_tol(delta, 0.0,  ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time2 arg");
+        is_double_tol(delta, 0.0,  ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time2 arg");
 
         psFree(time1);
@@ -406 +406 @@
 
         psF64 delta = psTimeDelta(time1, time2);
-        ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for different time types");
+        is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for different time types");
 
         psFree(time1);
@@ -428 +428 @@
 
         psF64 delta = psTimeDelta(time2, time1);
-        ok_double_tol(delta, deltaTime1, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
+        is_double_tol(delta, deltaTime1, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
 
         psFree(time1);
@@ -451 +451 @@
 
         psF64 delta = psTimeDelta(time2,time1);
-        ok_double_tol(delta, deltaTime2, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
+        is_double_tol(delta, deltaTime2, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
 
         psFree(time1);
@@ -474 +474 @@
         
         psF64 delta = psTimeDelta(time2,time1);
-        ok_double_tol(delta, deltaTime3, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
+        is_double_tol(delta, deltaTime3, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type");
 
         psFree(time1);
@@ -494 +494 @@
             // Verify TAI ISO string
             char *timeStr = psTimeToISO(time);
-            ok_str(timeStr, testTimeBStrTAI[i], "TAI ISO string");
+            is_str(timeStr, testTimeBStrTAI[i], "TAI ISO string");
             psFree(timeStr);
 
             time = psTimeConvert(time, PS_TIME_TT);
             timeStr = psTimeToISO(time);
-            ok_str(timeStr, testTimeBStrTT[i], "TT ISO string");
+            is_str(timeStr, testTimeBStrTT[i], "TT ISO string");
             psFree(timeStr);
 
@@ -506 +506 @@
             time->leapsecond = testTimeBLeapsecond[i];
             timeStr = psTimeToISO(time);
-            ok_str(timeStr, testTimeBStrUTC[i], "UTC ISO string");
+            is_str(timeStr, testTimeBStrUTC[i], "UTC ISO string");
             psFree(timeStr);
 
             time = psTimeConvert(time, PS_TIME_UT1);
             timeStr = psTimeToISO(time);
-            ok_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string");
+            is_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string");
             psFree(timeStr);