Index: trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c =================================================================== --- trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 12513) +++ trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 12607) @@ -130,9 +130,9 @@ "Skipping 3 tests because psEarthPole is NULL!"); psCube *outCube = psSphereToCube(apparent); - ok_double_tol( outCube->x, x, 0.001, + is_double_tol( outCube->x, x, 0.001, "psAberration: return correct sphere for valid inputs."); - ok_double_tol( outCube->y, y, 0.001, + is_double_tol( outCube->y, y, 0.001, "psAberration: return correct sphere for valid inputs."); - ok_double_tol( outCube->z, z, 0.001, + is_double_tol( outCube->z, z, 0.001, "psAberration: return correct sphere for valid inputs."); psFree(outCube); Index: trunk/psLib/test/astro/tap_psEarthOrientation_motion.c =================================================================== --- trunk/psLib/test/astro/tap_psEarthOrientation_motion.c (revision 12513) +++ trunk/psLib/test/astro/tap_psEarthOrientation_motion.c (revision 12607) @@ -114,9 +114,9 @@ skip_start( ep == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(ep->x, x, 0.1, + is_double_tol(ep->x, x, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (x)."); - ok_double_tol(ep->y, y, 0.1, + is_double_tol(ep->y, y, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (y)."); - ok_double_tol(ep->s, s, 0.1, + is_double_tol(ep->s, s, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (s)."); skip_end(); @@ -198,11 +198,11 @@ skip_start( polarMotion == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(polarMotion->x, x, 0.1, + is_double_tol(polarMotion->x, x, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(x) - IERS B."); - ok_double_tol(polarMotion->y, y, 0.1, + is_double_tol(polarMotion->y, y, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(y) - IERS B."); - ok_double_tol(polarMotion->s, s, 0.1, + is_double_tol(polarMotion->s, s, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(s) - IERS B."); @@ -219,11 +219,11 @@ skip_start( polarMotion == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(polarMotion->x, x, 0.1, + is_double_tol(polarMotion->x, x, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(x) - IERS A."); - ok_double_tol(polarMotion->y, y, 0.1, + is_double_tol(polarMotion->y, y, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(y) - IERS A."); - ok_double_tol(polarMotion->s, s, 0.1, + is_double_tol(polarMotion->s, s, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(s) - IERS A."); @@ -289,11 +289,11 @@ skip_start( out == NULL, 4, "Skipping 4 tests because psSphereRot output is NULL!"); - ok_double_tol( out->q0, q0, 0.0001, + is_double_tol( out->q0, q0, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q0)."); - ok_double_tol( out->q1, q1, 0.0001, + is_double_tol( out->q1, q1, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q1)."); - ok_double_tol( out->q2, q2, 0.0001, + is_double_tol( out->q2, q2, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q2)."); - ok_double_tol( out->q3, -q3, 0.0001, + is_double_tol( out->q3, -q3, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q3)."); skip_end(); @@ -355,9 +355,9 @@ psSphere *result = psSphereRotApply(NULL, earthRot, obj); psCube *cube = psSphereToCube(result); - ok_double_tol( cube->x, x, 0.0001, + is_double_tol( cube->x, x, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (x)"); - ok_double_tol( cube->y, y, 0.0001, + is_double_tol( cube->y, y, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (y)"); - ok_double_tol( cube->z, z, 0.0001, + is_double_tol( cube->z, z, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (z)"); psFree(earthRot); @@ -390,11 +390,11 @@ skip_start( out == NULL, 4, "Skipping 4 tests because psSphereRot output is NULL!"); - ok_double_tol( out->q0, q0, 0.0001, + is_double_tol( out->q0, q0, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q0)."); - ok_double_tol( out->q1, q1, 0.0001, + is_double_tol( out->q1, q1, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q1)."); - ok_double_tol( out->q2, q2, 0.0001, + is_double_tol( out->q2, q2, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q2)."); - ok_double_tol( out->q3, q3, 0.0001, + is_double_tol( out->q3, q3, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q3)."); skip_end(); @@ -462,8 +462,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP1_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP1_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP1_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP1_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); @@ -485,8 +485,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP2_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP2_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP2_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP2_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); @@ -508,8 +508,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP3_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP3_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP3_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP3_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); Index: trunk/psLib/test/astro/tap_psSphereOps_all.c =================================================================== --- trunk/psLib/test/astro/tap_psSphereOps_all.c (revision 12513) +++ trunk/psLib/test/astro/tap_psSphereOps_all.c (revision 12607) @@ -77,11 +77,11 @@ ok( myST != NULL && psMemCheckSphereRot(myST), "psSphereRotAlloc: return allocated SphereRot for valid inputs."); - ok_double(q0, myST->q0, + is_double(q0, myST->q0, "psSphereRotAlloc: return correct q0 value."); - ok_double(q1, myST->q1, + is_double(q1, myST->q1, "psSphereRotAlloc: return correct q1 value."); - ok_double(q2, myST->q2, + is_double(q2, myST->q2, "psSphereRotAlloc: return correct q2 value."); - ok_double(q3, myST->q3, + is_double(q3, myST->q3, "psSphereRotAlloc: return correct q3 value."); } @@ -107,11 +107,11 @@ ok( myST != NULL && psMemCheckSphereRot(myST), "psSphereRotQuat: return allocated SphereRot for valid inputs."); - ok_double(q0, myST->q0, + is_double(q0, myST->q0, "psSphereRotQuat: return correct q0 value."); - ok_double(q1, myST->q1, + is_double(q1, myST->q1, "psSphereRotQuat: return correct q1 value."); - ok_double(q2, myST->q2, + is_double(q2, myST->q2, "psSphereRotQuat: return correct q2 value."); - ok_double(q3, myST->q3, + is_double(q3, myST->q3, "psSphereRotQuat: return correct q3 value."); } @@ -190,7 +190,7 @@ "Skipping 1 tests because psSphereRotApply failed!"); out2 = psSphereRotApply(out2, s1, out); - ok_double( out2->r, 0.0, + is_double( out2->r, 0.0, "psSphereRotConjugate: return correct SphereRot values."); - ok_double( out2->d, 0.0, + is_double( out2->d, 0.0, "psSphereRotConjugate: return correct SphereRot values."); skip_end(); @@ -207,11 +207,11 @@ { s1 = psSphereRotInvert(-PHI_P, -DELTA_P, -ALPHA_P); - ok_double(s1->q0, myST->q0, + is_double(s1->q0, myST->q0, "psSphereRotInvert: return correct q0 value."); - ok_double(s1->q1, myST->q1, + is_double(s1->q1, myST->q1, "psSphereRotInvert: return correct q1 value."); - ok_double(s1->q2, myST->q2, + is_double(s1->q2, myST->q2, "psSphereRotInvert: return correct q2 value."); - ok_double(s1->q3, myST->q3, + is_double(s1->q3, myST->q3, "psSphereRotInvert: return correct q3 value."); psFree(s1); @@ -240,7 +240,7 @@ icrs->d = DEG_TO_RAD(90.0); psSphere* ecliptic = psSphereRotApply(NULL, s1, icrs); - ok_double_tol(DEG_TO_RAD(90.0), ecliptic->r, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), ecliptic->r, 0.00001, "psSphereRotICRSToEcliptic: return correct SphereRot for MJD_2000 date."); - ok_double_tol(DEG_TO_RAD(66.560719), ecliptic->d, 0.00001, + is_double_tol(DEG_TO_RAD(66.560719), ecliptic->d, 0.00001, "psSphereRotICRSToEcliptic: return correct SphereRot for MJD_2000 date."); psFree(ecliptic); @@ -271,7 +271,7 @@ psSphere* fromEcliptic = psSphereRotApply(NULL, s2, ecliptic); //XXX: Pretty sure the following can be 180 degrees OR 0 degrees. (= the poles) - ok_double_tol(DEG_TO_RAD(180.0), fromEcliptic->r, 0.00001, + is_double_tol(DEG_TO_RAD(180.0), fromEcliptic->r, 0.00001, "psSphereRotEclipticToICRS: return correct SphereRot for MJD_2000 date."); - ok_double_tol(DEG_TO_RAD(90.0), fromEcliptic->d, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), fromEcliptic->d, 0.00001, "psSphereRotEclipticToICRS: return correct SphereRot for MJD_2000 date."); psFree(ecliptic); @@ -289,7 +289,7 @@ s2 = psSphereRotICRSToGalactic(); galactic = psSphereRotApply(NULL, s2, icrs); - ok_double_tol(DEG_TO_RAD(122.93192), galactic->r, 0.00001, + is_double_tol(DEG_TO_RAD(122.93192), galactic->r, 0.00001, "psSphereRotICRSToGalactic: return correct SphereRot."); - ok_double_tol(DEG_TO_RAD(27.12825), galactic->d, 0.00001, + is_double_tol(DEG_TO_RAD(27.12825), galactic->d, 0.00001, "psSphereRotICRSToGalactic: return correct SphereRot."); } @@ -300,7 +300,7 @@ psSphere *test = psSphereRotApply(NULL, s1, galactic); //XXX: Pretty sure the following can be 180 degrees OR 0 degrees. (= the poles) - ok_double_tol(DEG_TO_RAD(180.0), test->r, 0.00001, + is_double_tol(DEG_TO_RAD(180.0), test->r, 0.00001, "psSphereRotGalacticToICRS: return correct SphereRot."); - ok_double_tol(DEG_TO_RAD(90.0), test->d, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), test->d, 0.00001, "psSphereRotGalacticToICRS: return correct SphereRot."); psFree(test); @@ -382,7 +382,7 @@ output = psSphereGetOffset(origin, offset, PS_SPHERICAL, PS_ARCMIN); empty = psSphereGetOffset(origin, offset, PS_SPHERICAL, PS_DEGREE); - ok_double_tol(DEG_TO_RAD(empty->r), MIN_TO_RAD(output->r), 0.0001, + is_double_tol(DEG_TO_RAD(empty->r), MIN_TO_RAD(output->r), 0.0001, "psSphereGetOffset: return correct offset for differing units."); - ok_double_tol(DEG_TO_RAD(empty->d), MIN_TO_RAD(output->d), 0.0001, + is_double_tol(DEG_TO_RAD(empty->d), MIN_TO_RAD(output->d), 0.0001, "psSphereGetOffset: return correct offset for differing units."); psFree(output); @@ -426,7 +426,7 @@ skip_start( output == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double(output->r, M_PI/4.0, + is_double(output->r, M_PI/4.0, "psSphereSetOffset: return correct spherical offset."); - ok_double(output->d, M_PI/6.0, + is_double(output->d, M_PI/6.0, "psSphereSetOffset: return correct spherical offset."); skip_end(); @@ -443,7 +443,7 @@ skip_start( empty == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double_tol(empty->r, offset->r, 0.00001, + is_double_tol(empty->r, offset->r, 0.00001, "psSphereGetOffset: return correct spherical offset."); - ok_double_tol(empty->d, offset->d, 0.00001, + is_double_tol(empty->d, offset->d, 0.00001, "psSphereGetOffset: return correct spherical offset."); skip_end(); @@ -464,7 +464,7 @@ skip_start( empty == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double_tol(empty->r, (M_PI / 4.0), 0.0001, + is_double_tol(empty->r, (M_PI / 4.0), 0.0001, "psSphereGetOffset: return correct spherical offset."); - ok_double_tol(empty->d, (M_PI / 6.0), 0.0001, + is_double_tol(empty->d, (M_PI / 6.0), 0.0001, "psSphereGetOffset: return correct spherical offset."); skip_end(); @@ -480,7 +480,7 @@ offset->d = (M_PI / 6.0); //30 deg empty = psSphereSetOffset(origin, offset, PS_SPHERICAL, PS_RADIAN); - ok_double_tol(empty->r, offset->r, 0.0001, + is_double_tol(empty->r, offset->r, 0.0001, "psSphereSetOffset: return correct offset for differing units."); - ok_double_tol(empty->d, offset->d, 0.0001, + is_double_tol(empty->d, offset->d, 0.0001, "psSphereSetOffset: return correct offset for differing units."); psFree(output); Index: trunk/psLib/test/astro/tap_psTime_01.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_01.c (revision 12513) +++ trunk/psLib/test/astro/tap_psTime_01.c (revision 12607) @@ -23,6 +23,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-13 00:01:37 $ + * @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 @@ -187,5 +187,5 @@ psMemId id = psMemGetId(); psF64 ut1Delta = psTimeGetUT1Delta(NULL, PS_IERS_B); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta(NULL, PS_IERS_B) returned NAN"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta(NULL, PS_IERS_B) returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -200,5 +200,5 @@ time->leapsecond = false; psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_B); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta() returned NAN for incorrect time"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta() returned NAN for incorrect time"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -214,5 +214,5 @@ time->leapsecond = false; psF64 ut1Delta = psTimeGetUT1Delta(time, -100); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta(time, -100) returned NAN (incorrect bulletin)"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta(time, -100) returned NAN (incorrect bulletin)"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -229,5 +229,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_A); - ok_double_tol(ut1Delta, testTime1UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin A"); + is_double_tol(ut1Delta, testTime1UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin A"); psFree(time); @@ -244,5 +244,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_B); - ok_double_tol(ut1Delta, testTime1UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime1UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -262,5 +262,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A); - ok_double_tol(ut1Delta, testTime2UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime2UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -280,5 +280,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B); - ok_double_tol(ut1Delta, testTime2UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime2UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -298,5 +298,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A); - ok_double_tol(ut1Delta, testTime3UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime3UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -315,5 +315,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B); - ok_double_tol(ut1Delta, testTime3UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime3UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -329,5 +329,5 @@ psMemId id = psMemGetId(); psF64 mjd = psTimeToMJD(NULL); - ok_double(mjd, NAN, "psTimeToMJD(NULL) returned NULL"); + is_double(mjd, NAN, "psTimeToMJD(NULL) returned NULL"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -346,5 +346,5 @@ time->leapsecond = false; psF64 mjd = psTimeToMJD(time); - ok_double(mjd, NAN, "psTimeToMJD() returned NAN for incorrect time"); + is_double(mjd, NAN, "psTimeToMJD() returned NAN for incorrect time"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -361,5 +361,5 @@ psF64 mjd = psTimeToMJD(time); - ok_double_tol(mjd, 53207.765929, ERROR_TOL, "psTimeToMJD() returned correct time after 1/1/1970 epoch"); + is_double_tol(mjd, 53207.765929, ERROR_TOL, "psTimeToMJD() returned correct time after 1/1/1970 epoch"); psFree(time); @@ -376,5 +376,5 @@ psF64 mjd = psTimeToMJD(time); - ok_double_tol(mjd, testTime4MJD, ERROR_TOL, "psTimeToMJD() returned correct time before 1/1/1970 epoch"); + is_double_tol(mjd, testTime4MJD, ERROR_TOL, "psTimeToMJD() returned correct time before 1/1/1970 epoch"); psFree(time); @@ -391,5 +391,5 @@ psF64 jd = psTimeToJD(NULL); - ok_double(jd, NAN, "psTimeToJD(NULL) returned NULL"); + is_double(jd, NAN, "psTimeToJD(NULL) returned NULL"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -407,5 +407,5 @@ psF64 jd = psTimeToJD(time); - ok_double(jd, NAN, "psTimeToJD() returned NAN for incorrect time"); + is_double(jd, NAN, "psTimeToJD() returned NAN for incorrect time"); psFree(time); @@ -423,5 +423,5 @@ psF64 jd = psTimeToJD(time); - ok_double_tol(jd, 2453208.265929, ERROR_TOL, "psTimeToJD() returned the correct time after 1/1/1970 epoch"); + is_double_tol(jd, 2453208.265929, ERROR_TOL, "psTimeToJD() returned the correct time after 1/1/1970 epoch"); psFree(time); @@ -439,5 +439,5 @@ psF64 jd = psTimeToJD(time); - ok_double_tol(jd, testTime4JD, ERROR_TOL, "psTimeToJD() returned the correct time before 1/1/1970 epoch"); + is_double_tol(jd, testTime4JD, ERROR_TOL, "psTimeToJD() returned the correct time before 1/1/1970 epoch"); psFree(time); @@ -528,5 +528,5 @@ char *timeStr = psTimeToISO(time); - ok_str(timeStr, testTime1Str, "psTimeToISO(time) returned correct time (no leapsecond)"); + is_str(timeStr, testTime1Str, "psTimeToISO(time) returned correct time (no leapsecond)"); psFree(timeStr); @@ -547,5 +547,5 @@ char *timeStr = psTimeToISO(time); - ok_str(timeStr, testTime1StrLeap, "psTimeToISO(time) returned correct time (with leapsecond)"); + is_str(timeStr, testTime1StrLeap, "psTimeToISO(time) returned correct time (with leapsecond)"); psFree(timeStr); Index: trunk/psLib/test/astro/tap_psTime_02.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_02.c (revision 12513) +++ trunk/psLib/test/astro/tap_psTime_02.c (revision 12607) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-13 00:02:14 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ psF64 lmst = psTimeToLMST(NULL, 0); - ok_double(lmst, NAN, "psTimeToLMST(time,0) returned NAN"); + is_double(lmst, NAN, "psTimeToLMST(time,0) returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -82,5 +82,5 @@ psF64 lmst = psTimeToLMST(time, 0.0); - ok_double_tol(lmst, testTime1LMST0, ERROR_TOL, "psTimeToLMST() returned the correct time"); + is_double_tol(lmst, testTime1LMST0, ERROR_TOL, "psTimeToLMST() returned the correct time"); psFree(time); @@ -102,5 +102,5 @@ psF64 lmst = psTimeToLMST(time,0.0); - ok_double(lmst, NAN, "psTimeToLMST() generated a NAN for incorrect type"); + is_double(lmst, NAN, "psTimeToLMST() generated a NAN for incorrect type"); psFree(time); Index: trunk/psLib/test/astro/tap_psTime_03.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_03.c (revision 12513) +++ trunk/psLib/test/astro/tap_psTime_03.c (revision 12607) @@ -11,6 +11,6 @@ * @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,5 +326,5 @@ 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,5 +341,5 @@ 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,5 +360,5 @@ 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,5 +382,5 @@ 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,5 +406,5 @@ 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,5 +428,5 @@ 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,5 +451,5 @@ 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,5 +474,5 @@ 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,10 +494,10 @@ // 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,10 +506,10 @@ 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);