IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 24303 for trunk/psLib


Ignore:
Timestamp:
Jun 2, 2009, 3:25:29 PM (17 years ago)
Author:
giebink
Message:

corrected for change to psConverTime function

Location:
trunk/psLib/test/astro
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/astro/tap_psTime_01.c

    r24023 r24303  
    842842    {
    843843        psMemId id = psMemGetId();
    844         bool status = psTimeConvert(NULL, PS_TIME_TAI);
    845 
    846         ok(status == false, "psTimeConvert(NULL, PS_TIME_TAI) returned NULL");
    847         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    848 
    849         psFree(time2);
     844        bool status= psTimeConvert(NULL, PS_TIME_TAI);
     845
     846        ok(status== false, "psTimeConvert(NULL, PS_TIME_TAI) returned NULL");
     847        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    850848    }
    851849
    … …  
    858856        psMemId id = psMemGetId();
    859857        psTime *time1 = psTimeAlloc(PS_TIME_TAI);
    860         psTime *time2 = psTimeConvert(time1,-100);
    861         ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
    862         psFree(time1);
    863         psFree(time2);
     858        bool status = psTimeConvert(time1,-100);
     859        ok(status == false, "psTimeConvert(time1, -100) returned false");
     860        psFree(time1);
    864861        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    865862    }
    … …  
    873870        psMemId id = psMemGetId();
    874871        psTime *time1 = psTimeAlloc(PS_TIME_UTC);
    875         psTime *time2 = psTimeConvert(time1,-100);
    876         ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
    877         psFree(time1);
    878         psFree(time2);
     872        bool status = psTimeConvert(time1,-100);
     873        ok(status == false, "psTimeConvert(time1, -100) returned false");
     874        psFree(time1);
    879875        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    880876    }
    … …  
    888884        psMemId id = psMemGetId();
    889885        psTime *time1 = psTimeAlloc(PS_TIME_TT);
    890         psTime *time2 = psTimeConvert(time1,-100);
    891         ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
    892         psFree(time1);
    893         psFree(time2);
     886        bool status = psTimeConvert(time1,-100);
     887        ok(status == false, "psTimeConvert(time1, -100) returned false");
     888        psFree(time1);
    894889        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    895890    }
    … …  
    903898        psTime *time1 = psTimeAlloc(PS_TIME_TAI);
    904899        time1->type = -100;
    905         psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
    906         ok(time2 == NULL, "psTimeConvert(time1, PS_TIME_TAI) returned NULL");
    907         psFree(time1);
    908         psFree(time2);
     900        bool status = psTimeConvert(time1,PS_TIME_TAI);
     901        ok(status == false, "psTimeConvert(time1, PS_TIME_TAI) returned false");
     902        psFree(time1);
    909903        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    910904    }
    … …  
    919913        psTime *time1 = psTimeAlloc(PS_TIME_TAI);
    920914        time1->nsec = 2e9;
    921         psTime *time2 = psTimeConvert(time1, PS_TIME_TAI);
    922         ok(time2 == NULL, "psTimeConvert(time1, PS_TIME_TAI) returns NULL for incorrect psTime object");
    923         psFree(time1);
    924         psFree(time2);
     915        bool status = psTimeConvert(time1, PS_TIME_TAI);
     916        ok(status == false, "psTimeConvert(time1, PS_TIME_TAI) returns NULL for incorrect psTime object");
     917        psFree(time1);
    925918        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    926919    }
    … …  
    929922    // psTimeConvert()
    930923    //Attempt to convert a time to the same type
     924    //Should return true because time->type == type
    931925    {
    932926        psMemId id = psMemGetId();
    … …  
    936930        time1->type = PS_TIME_TAI;
    937931        time1->leapsecond = false;
    938         psTime *time2 = psTimeConvert(time1, PS_TIME_TAI);
    939         ok(time2 == time1, "psTimeConvert(time, ...) returns time for conversion to same type");
    940         is_long(time2->sec, 1, "time->sec");
    941         is_long(time2->nsec, 2, "time->nsec");
    942         ok(time2->type == PS_TIME_TAI, "time->type");
    943         is_bool(time2->leapsecond, false, "time->leapsecond");
     932        bool status = psTimeConvert(time1, PS_TIME_TAI);
     933        ok(status == true, "psTimeConvert(time, ...) returns true for conversion to same type");
    944934
    945935        psFree(time1);
    … …  
    957947        time1->leapsecond = false;
    958948
    959         psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
    960         ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
    961         is_long(time2->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
    962         is_long(time2->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
    963         ok(time2->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
    964         is_bool(time2->leapsecond, false, "time->leapsecond");
     949        bool status = psTimeConvert(time1,PS_TIME_TAI);
     950        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
     951        is_long(time1->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
     952        is_long(time1->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
     953        ok(time1->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
     954        is_bool(time1->leapsecond, false, "time->leapsecond");
    965955
    966956        psFree(time1);
    … …  
    978968        time1->leapsecond = false;
    979969
    980         psTime *time2 = psTimeConvert(time1,PS_TIME_TT);
    981         ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
    982         is_long(time2->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
    983         is_long(time2->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
    984         ok(time2->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
    985         is_bool(time2->leapsecond, false, "time->leapsecond");
     970        bool status = psTimeConvert(time1,PS_TIME_TT);
     971        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
     972        is_long(time1->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
     973        is_long(time1->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
     974        ok(time1->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
     975        is_bool(time1->leapsecond, false, "time->leapsecond");
    986976
    987977        psFree(time1);
    … …  
    999989        time1->leapsecond = false;
    1000990
    1001         psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
    1002         ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
    1003         is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
    1004         is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
    1005         ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
    1006         is_bool(time2->leapsecond, false, "time->leapsecond");
     991        bool status = psTimeConvert(time1,PS_TIME_UT1);
     992        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
     993        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
     994        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
     995        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
     996        is_bool(time1->leapsecond, false, "time->leapsecond");
    1007997
    1008998        psFree(time1);
    … …  
    10191009        time1->leapsecond = false;
    10201010
    1021         psTime *time2 = psTimeConvert(time1,PS_TIME_UTC);
    1022         ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
    1023         is_long(time2->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
    1024         is_long(time2->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
    1025         ok(time2->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
    1026         is_bool(time2->leapsecond, false, "time->leapsecond");
     1011        bool status = psTimeConvert(time1,PS_TIME_UTC);
     1012        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
     1013        is_long(time1->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
     1014        is_long(time1->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
     1015        ok(time1->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
     1016        is_bool(time1->leapsecond, false, "time->leapsecond");
    10271017
    10281018        psFree(time1);
    … …  
    10411031        time1->leapsecond = false;
    10421032
    1043         psTime *time2 = psTimeConvert(time1,PS_TIME_TT);
    1044         ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
    1045         is_long(time2->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
    1046         is_long(time2->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
    1047         ok(time2->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
    1048         is_bool(time2->leapsecond, false, "time->leapsecond");
     1033        bool status = psTimeConvert(time1,PS_TIME_TT);
     1034        ok(status == true, "psTimeConvert() returned true for conversion to same type");
     1035        is_long(time1->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
     1036        is_long(time1->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
     1037        ok(time1->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
     1038        is_bool(time1->leapsecond, false, "time->leapsecond");
    10491039
    10501040        psFree(time1);
    … …  
    10621052        time1->leapsecond = false;
    10631053
    1064         psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
    1065         ok(time1 == time2, "psTimeConvert() returned time for conversion to same type");
    1066         is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
    1067         is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
    1068         ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
    1069         is_bool(time2->leapsecond, false, "time->leapsecond");
     1054        bool status = psTimeConvert(time1,PS_TIME_UT1);
     1055        ok(status == true, "psTimeConvert() returned true for conversion to same type");
     1056        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
     1057        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
     1058        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
     1059        is_bool(time1->leapsecond, false, "time->leapsecond");
    10701060
    10711061        psFree(time1);
    … …  
    10831073        time1->leapsecond = false;
    10841074
    1085         psTime *time2 = psTimeConvert(time1,PS_TIME_UTC);
    1086         ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
    1087         is_long(time2->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
    1088         is_long(time2->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
    1089         ok(time2->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
    1090         is_bool(time2->leapsecond, false, "time->leapsecond");
     1075        bool status = psTimeConvert(time1,PS_TIME_UTC);
     1076        ok(status == true, "psTimeConvert() returned true for conversion to same type");
     1077        is_long(time1->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
     1078        is_long(time1->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
     1079        ok(time1->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
     1080        is_bool(time1->leapsecond, false, "time->leapsecond");
    10911081
    10921082        psFree(time1);
    … …  
    11041094        time1->leapsecond = false;
    11051095
    1106         psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
    1107         ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
    1108         is_long(time2->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
    1109         is_long(time2->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
    1110         ok(time2->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
    1111         is_bool(time2->leapsecond, false, "time->leapsecond");
     1096        bool status = psTimeConvert(time1,PS_TIME_TAI);
     1097        ok(status == true, "psTimeConvert() returned true for conversion to same type");
     1098        is_long(time1->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
     1099        is_long(time1->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
     1100        ok(time1->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
     1101        is_bool(time1->leapsecond, false, "time->leapsecond");
    11121102
    11131103        psFree(time1);
    … …  
    11251115        time1->leapsecond = false;
    11261116
    1127         psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
    1128         ok(time1 == time2, "psTimeConvert() returned time for conversion to same type");
    1129         is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
    1130         is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
    1131         ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
    1132         is_bool(time2->leapsecond, false, "time->leapsecond");
     1117        bool status = psTimeConvert(time1,PS_TIME_UT1);
     1118        ok(status == true, "psTimeConvert() returned true for conversion to same type");
     1119        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
     1120        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
     1121        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
     1122        is_bool(time1->leapsecond, false, "time->leapsecond");
    11331123
    11341124        psFree(time1);
    … …  
    11471137        time1->leapsecond = false;
    11481138
    1149         psTime *time2 = psTimeConvert(time1, PS_TIME_UTC);
    1150         ok(time2 == NULL, "psTimeConvert() returned NULL for conversion from UT1");
    1151         psFree(time1);
    1152         psFree(time2);
     1139        bool status = psTimeConvert(time1, PS_TIME_UTC);
     1140        ok(status == false, "psTimeConvert() returned false for conversion from UT1");
     1141        psFree(time1);
    11531142        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    11541143    }

  • trunk/psLib/test/astro/tap_psTime_03.c

    r13936 r24303  
    494494            psFree(timeStr);
    495495
    496             time = psTimeConvert(time, PS_TIME_TT);
     496            bool status = psTimeConvert(time, PS_TIME_TT);
    497497            timeStr = psTimeToISO(time);
    498498            is_str(timeStr, testTimeBStrTT[i], "TT ISO string");
    … …  
    500500
    501501            // Verify UTC ISO string
    502             time = psTimeConvert(time, PS_TIME_UTC);
     502            status = psTimeConvert(time, PS_TIME_UTC);
    503503            time->leapsecond = testTimeBLeapsecond[i];
    504504            timeStr = psTimeToISO(time);
    … …  
    506506            psFree(timeStr);
    507507
    508             time = psTimeConvert(time, PS_TIME_UT1);
     508            status = psTimeConvert(time, PS_TIME_UT1);
    509509            timeStr = psTimeToISO(time);
    510510            is_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string");
Note: See TracChangeset for help on using the changeset viewer.