IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10819


Ignore:
Timestamp:
Dec 21, 2006, 10:04:35 AM (20 years ago)
Author:
magnier
Message:

changed non-error diags to notes

Location:
trunk/psLib/test/types
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/types/tap_psArguments_all.c

    r9868 r10819  
    2323int main(void)
    2424{
    25     plan_tests(27);
    26 
    27     diag("Tests for psArguments Functions");
     25    plan_tests(30);
     26
     27    note("Tests for psArguments Functions");
    2828
    2929    testArgumentGetParse();
    … …  
    3636void testArgumentGetParse(void)
    3737{
    38     diag("  >>>Test 1:  psArgument Get, Remove, Parse, and Help Fxns");
     38    note("  >>>Test 1:  psArgument Get, Remove, Parse, and Help Fxns");
    3939    psMetadata *arg = NULL;
    4040    char *argv[25];
    … …  
    217217void testArgumentVerbosity(void)
    218218{
    219     diag("  >>>Test 2:  psArgumentRemove & psArgumentVerbosity Fxns");
     219    note("  >>>Test 2:  psArgumentRemove & psArgumentVerbosity Fxns");
    220220
    221221    //Return 2 (default) for NULL input argument
    … …  
    317317void testLogTraceArguments(void)
    318318{
    319     diag("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
     319    note("  >>>Test 3:  psLogArguments & psTraceArguments Fxns");
    320320 
    321321    //Return 2 (default) for NULL arguments input

  • trunk/psLib/test/types/tap_psArray_all.c

    r9847 r10819  
    2424int main(void)
    2525{
    26     plan_tests(29);
    27 
    28     diag("Tests for psArray Functions");
     26    plan_tests(34);
     27
     28    note("Tests for psArray Functions");
    2929
    3030    testArrayAllocs();
    … …  
    3838void testArrayAllocs(void)
    3939{
    40     diag("  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
     40    note("  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
    4141    psArray *a = NULL;
    4242
    … …  
    127127void testArrayAddRemove(void)
    128128{
    129     diag("  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
     129    note("  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
    130130    psArray *a = psArrayAlloc(0);
    131131    psS32 *s1 = (psS32*)psAlloc(sizeof(psS32));
    … …  
    200200void testArraySetGet(void)
    201201{
    202     diag("  >>>Test 3:  psArraySet & psArrayGet Fxns");
     202    note("  >>>Test 3:  psArraySet & psArrayGet Fxns");
    203203    psArray *a = NULL;
    204204    psArray *b = NULL;
    … …  
    285285void testArraySort(void)
    286286{
    287     diag("  >>>Test 4:  psArray Sort Function");
     287    note("  >>>Test 4:  psArray Sort Function");
    288288    psArray *a = NULL;
    289289    a = psArrayAlloc(3);

  • trunk/psLib/test/types/tap_psBitSet_all.c

    r9143 r10819  
    2222int main(void)
    2323{
    24     plan_tests(31);
    25 
    26     diag("Tests for psBitSet Functions");
     24    plan_tests(34);
     25
     26    note("Tests for psBitSet Functions");
    2727
    2828    testBitSetBasics();
    … …  
    3434void testBitSetBasics(void)
    3535{
    36     diag("  >>>Test 1:  psBitSet Basic Fxns");
     36    note("  >>>Test 1:  psBitSet Basic Fxns");
    3737
    3838    psBitSet *noBits = NULL;
    … …  
    159159void testBitSetOps(void)
    160160{
    161     diag("  >>>Test 2:  psBitSet Operation Fxns");
     161    note("  >>>Test 2:  psBitSet Operation Fxns");
    162162    psBitSet *noBits = NULL;
    163163    psBitSet *bs = NULL;

  • trunk/psLib/test/types/tap_psHash_all.c

    r9082 r10819  
    2323int main(void)
    2424{
    25     plan_tests(25);
    26 
    27     diag("Tests for psHash Functions");
     25    plan_tests(29);
     26
     27    note("Tests for psHash Functions");
    2828
    2929    testHashCreate();
    … …  
    3636void testHashCreate(void)
    3737{
    38     diag("  >>>Test 1:  psHash Creation Fxns");
     38    note("  >>>Test 1:  psHash Creation Fxns");
    3939
    4040    psHash *h1 = NULL;
    … …  
    112112void testHashManip(void)
    113113{
    114     diag("  >>>Test 2:  psHash Manipulation Fxns");
     114    note("  >>>Test 2:  psHash Manipulation Fxns");
    115115
    116116    psHash *h1 = NULL;
    … …  
    181181void testHashConvert(void)
    182182{
    183     diag("  >>>Test 3:  psHash Conversion/List Fxns");
     183    note("  >>>Test 3:  psHash Conversion/List Fxns");
    184184
    185185    psHash *h1 = NULL;

  • trunk/psLib/test/types/tap_psListIterator.c

    r8995 r10819  
    7272int main (void)
    7373{
    74     plan_tests(66);
     74    plan_tests(73);
    7575
    76     diag("psListIterator tests");
     76    note("psListIterator tests");
    7777
    7878    {
    79         diag("Forwards");
     79        note("Forwards");
    8080        psList *list = listGenerate();
    8181        psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, false);
    … …  
    9797
    9898    {
    99         diag("Backwards");
     99        note("Backwards");
    100100        psList *list = listGenerate();
    101101        psListIterator *iter = psListIteratorAlloc(list, PS_LIST_TAIL, NULL);
    … …  
    117117
    118118    {
    119         diag("Jumping in halfway through (using allocator), forwards");
     119        note("Jumping in halfway through (using allocator), forwards");
    120120        psList *list = listGenerate();
    121121        psListIterator *iter = psListIteratorAlloc(list, 3, NULL);
    … …  
    134134
    135135    {
    136         diag("Jumping in halfway through (using allocator), backwards");
     136        note("Jumping in halfway through (using allocator), backwards");
    137137        psList *list = listGenerate();
    138138        psListIterator *iter = psListIteratorAlloc(list, -4, NULL);
    … …  
    151151
    152152    {
    153         diag("Jumping in halfway through (using set), forwards");
     153        note("Jumping in halfway through (using set), forwards");
    154154        psList *list = listGenerate();
    155155        psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, NULL);
    … …  
    169169
    170170    {
    171         diag("Jumping in halfway through (using set), backwards");
     171        note("Jumping in halfway through (using set), backwards");
    172172        psList *list = listGenerate();
    173173        psListIterator *iter = psListIteratorAlloc(list, PS_LIST_HEAD, NULL);

  • trunk/psLib/test/types/tap_psList_all.c

    r9143 r10819  
    2626int main(void)
    2727{
    28     plan_tests(60);
    29 
    30     diag("Tests for psList Functions");
     28    plan_tests(64);
     29
     30    note("Tests for psList Functions");
    3131
    3232    testListCreate();
    … …  
    3939void testListCreate(void)
    4040{
    41     diag("  >>>Test 1:  psList Creation Fxns");
     41    note("  >>>Test 1:  psList Creation Fxns");
    4242    psList *noList = NULL;
    4343    psListIterator *noIter = NULL;
    … …  
    243243void testListManip(void)
    244244{
    245     diag("  >>>Test 2:  psList Manipulation Fxns");
     245    note("  >>>Test 2:  psList Manipulation Fxns");
    246246    psMetadata *md = psMetadataAlloc();
    247247    psList *emptyList = psListAlloc(NULL);
    … …  
    427427void testListConvertSort(void)
    428428{
    429     diag("  >>>Test 3:  psList Conversion and Sorting Fxns");
     429    note("  >>>Test 3:  psList Conversion and Sorting Fxns");
    430430    psList *emptyList = psListAlloc(NULL);
    431431    psS32 *s1 = (psS32*)psAlloc(sizeof(psS32));

  • trunk/psLib/test/types/tap_psLookupTable_all.c

    r9745 r10819  
    2424int main(void)
    2525{
    26     plan_tests(28);
    27 
    28     diag("Tests for psLookupTable Functions");
     26    plan_tests(30);
     27
     28    note("Tests for psLookupTable Functions");
    2929
    3030    testLookupTableAlloc();
    … …  
    3737void testLookupTableAlloc(void)
    3838{
    39     diag("  >>>Test 1:  psLookupTableAlloc & psMemCheckLookupTable Fxns");
     39    note("  >>>Test 1:  psLookupTableAlloc & psMemCheckLookupTable Fxns");
    4040
    4141    psLookupTable *lt = NULL;

  • trunk/psLib/test/types/tap_psMetadataConfigParse_time.c

    r8774 r10819  
    77int main (void)
    88{
    9     plan_tests(40);
     9    plan_tests(41);
    1010
    11     diag("psMetadataParseConfig time format tests");
     11    note("psMetadataParseConfig time format tests");
    1212
    1313    {

  • trunk/psLib/test/types/tap_psMetadataConfigRead.c

    r8995 r10819  
    147147int main (void)
    148148{
    149     plan_tests(52);
    150 
    151     diag("psMetadataConfigRead tests");
     149    plan_tests(58);
     150
     151    note("psMetadataConfigRead tests");
    152152
    153153    generateMDConfig();
    … …  
    155155    unsigned int numBadLines = 0;            // Number of bad lines
    156156    psMetadata *md = psMetadataConfigRead(NULL, &numBadLines, FILENAME, false);
     157    unlink (FILENAME);
     158
    157159    ok(md, "md = %x", md);
    158160    ok(numBadLines == 1, "number of bad lines = %d", numBadLines); // One bad line from boolean
    … …  
    165167        psMetadataIterator *iterator = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
    166168
    167         diag("Checking the output");
     169        note("Checking the output");
    168170        {
    169171            psMetadataItem *item = psMetadataGetAndIncrement(iterator);
    … …  
    174176
    175177        {
    176             diag("Checking the nested METADATA");
     178            note("Checking the nested METADATA");
    177179            psMetadataItem *item = psMetadataGetAndIncrement(iterator);
    178180            mixedType value;            // Needed only to check the other stuff
    … …  
    200202        }
    201203
    202         diag("Checking the rest");
     204        note("Checking the rest");
    203205        {
    204206            psMetadataItem *item = psMetadataGetAndIncrement(iterator);
    … …  
    232234    }
    233235
    234     diag("Checking the MULTI");
     236    note("Checking the MULTI");
    235237    {
    236238        // Check that the correct item is MULTI
    … …  
    266268    }
    267269
    268     diag("Checking the bad line");
     270    note("Checking the bad line");
    269271    {
    270272        // Check that the bad one isn't there

  • trunk/psLib/test/types/tap_psMetadataConfig_input.c

    r9910 r10819  
    2525int main(void)
    2626{
    27     plan_tests(33);
    28 
    29     diag("Tests for psMetadataConfig Input Functions");
     27    plan_tests(36);
     28
     29    note("Tests for psMetadataConfig Input Functions");
    3030
    3131    testMetaConfigRead();
    … …  
    3737void testMetaConfigRead(void)
    3838{
    39     diag("  >>>Test 1:  psMetadataConfigRead");
     39    note("  >>>Test 1:  psMetadataConfigRead");
    4040
    4141    //Return NULL for NULL filename input
    … …  
    9797            "returned metadata.");
    9898        skip_end();
    99         psMetadataConfigWrite(out, "mdc-overwrite_false.txt");
     99        // psMetadataConfigWrite(out, "mdc-overwrite_false.txt");
    100100        psFree(out);
    101101    }
    … …  
    128128            "returned metadata.");
    129129        skip_end();
    130         psMetadataConfigWrite(out, "mdc-overwrite_true.txt");
     130        // psMetadataConfigWrite(out, "mdc-overwrite_true.txt");
    131131        psFree(out);
    132132    }
    … …  
    138138void testMetaConfigParse(void)
    139139{
    140     diag("  >>>Test 2:  psMetadataConfigParse");
     140    note("  >>>Test 2:  psMetadataConfigParse");
    141141    char str1[70];
    142142    char str2[70];

  • trunk/psLib/test/types/tap_psMetadataItemCompare.c

    r9936 r10819  
    1919int main (void)
    2020{
    21     plan_tests(22);
    22 
    23     diag("psMetadataItemCompare() tests");
     21    plan_tests(24);
     22
     23    note("psMetadataItemCompare() tests");
    2424
    2525    testItemCompare();
    … …  
    3030void testItemCompare(void)
    3131{
    32     diag("  >>>Test 1:  psMetadataItemCompare");
     32    note("  >>>Test 1:  psMetadataItemCompare");
    3333
    3434    psMetadataItem *compare = NULL;

  • trunk/psLib/test/types/tap_psMetadataItemParse.c

    r9941 r10819  
    2020int main (void)
    2121{
    22     plan_tests(112);
    23 
    24     diag("psMetadataItemParse() tests");
     22    plan_tests(114);
     23
     24    note("psMetadataItemParse() tests");
    2525
    2626    testItemParse();
    … …  
    3131void testItemParse(void)
    3232{
    33     diag("  >>>Test 1:  psMetadataItemParse");
     33    note("  >>>Test 1:  psMetadataItemParse");
    3434
    3535    psMetadataItem *itemBool = psMetadataItemAlloc("bool", PS_DATA_BOOL, "No Comment", true);

  • trunk/psLib/test/types/tap_psMetadataIterator.c

    r8995 r10819  
    102102int main (void)
    103103{
    104     plan_tests(242);
    105 
    106     diag("psMetadataIterator tests");
    107 
    108     {
    109         diag("No regular expressions, forwards");
     104    plan_tests(255);
     105
     106    note("psMetadataIterator tests");
     107
     108    {
     109        note("No regular expressions, forwards");
    110110        psMetadata *md = mdGenerate();
    111111        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
    … …  
    127127
    128128    {
    129         diag("No regular expressions, backwards");
     129        note("No regular expressions, backwards");
    130130        psMetadata *md = mdGenerate();
    131131        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_TAIL, NULL);
    … …  
    147147
    148148    {
    149         diag("No regular expressions, jumping in halfway through (using allocator), forwards");
     149        note("No regular expressions, jumping in halfway through (using allocator), forwards");
    150150        psMetadata *md = mdGenerate();
    151151        psMetadataIterator *iter = psMetadataIteratorAlloc(md, 3, NULL);
    … …  
    164164
    165165    {
    166         diag("No regular expressions, jumping in halfway through (using allocator), backwards");
     166        note("No regular expressions, jumping in halfway through (using allocator), backwards");
    167167        psMetadata *md = mdGenerate();
    168168        psMetadataIterator *iter = psMetadataIteratorAlloc(md, -4, NULL);
    … …  
    181181
    182182    {
    183         diag("No regular expressions, jumping in halfway through (using set), forwards");
     183        note("No regular expressions, jumping in halfway through (using set), forwards");
    184184        psMetadata *md = mdGenerate();
    185185        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
    … …  
    199199
    200200    {
    201         diag("No regular expressions, jumping in halfway through (using set), backwards");
     201        note("No regular expressions, jumping in halfway through (using set), backwards");
    202202        psMetadata *md = mdGenerate();
    203203        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL);
    … …  
    217217
    218218    {
    219         diag("With regular expressions, forwards");
     219        note("With regular expressions, forwards");
    220220        psMetadata *md = mdGenerate();
    221221        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");
    … …  
    234234
    235235    {
    236         diag("With regular expressions, backwards");
     236        note("With regular expressions, backwards");
    237237        psMetadata *md = mdGenerate();
    238238        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_TAIL, "^" MULTI_NAME "$");
    … …  
    251251
    252252    {
    253         diag("With regular expressions, jumping in halfway through (using allocator), forwards");
     253        note("With regular expressions, jumping in halfway through (using allocator), forwards");
    254254        psMetadata *md = mdGenerate();
    255255        psMetadataIterator *iter = psMetadataIteratorAlloc(md, 2, "^" MULTI_NAME "$");
    … …  
    266266
    267267    {
    268         diag("With regular expressions, jumping in halfway through (using allocator), backwards");
     268        note("With regular expressions, jumping in halfway through (using allocator), backwards");
    269269        psMetadata *md = mdGenerate();
    270270        psMetadataIterator *iter = psMetadataIteratorAlloc(md, -3, "^" MULTI_NAME "$");
    … …  
    281281
    282282    {
    283         diag("With regular expressions, jumping in halfway through (using set), forwards");
     283        note("With regular expressions, jumping in halfway through (using set), forwards");
    284284        psMetadata *md = mdGenerate();
    285285        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");
    … …  
    297297
    298298    {
    299         diag("With regular expressions, jumping in halfway through (using set), backwards");
     299        note("With regular expressions, jumping in halfway through (using set), backwards");
    300300        psMetadata *md = mdGenerate();
    301301        psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, "^" MULTI_NAME "$");

  • trunk/psLib/test/types/tap_psMetadata_copying.c

    r9805 r10819  
    2323int main(void)
    2424{
    25     plan_tests(36);
    26 
    27     diag("psMetadataCopy and psMetadataItemCopy tests");
     25    plan_tests(40);
     26
     27    note("psMetadataCopy and psMetadataItemCopy tests");
    2828
    2929    testMetadataCopy();
    … …  
    3636void testMetadataCopy(void)
    3737{
    38     diag("  >>>Test 1:  psMetadataCopy");
     38    note("  >>>Test 1:  psMetadataCopy");
    3939    psMetadata *in = NULL;
    4040    psMetadata *out = NULL;
    … …  
    165165void testMetadataItemCopy(void)
    166166{
    167     diag("  >>>Test 2:  psMetadataItemCopy");
     167    note("  >>>Test 2:  psMetadataItemCopy");
    168168
    169169    //Return NULL for NULL input psMetadataItem
    … …  
    426426void testMetadataItemTransfer(void)
    427427{
    428     diag("  >>>Test 3:  psMetadataItemTransfer");
     428    note("  >>>Test 3:  psMetadataItemTransfer");
    429429    psMetadata *out = psMetadataAlloc();
    430430    psMetadata *in = psMetadataAlloc();

  • trunk/psLib/test/types/tap_psMetadata_creating.c

    r8995 r10819  
    2525int main(void)
    2626{
    27     plan_tests(42);
    28 
    29     diag("psMetadata & psMetadataItem Creation Functions");
     27    plan_tests(46);
     28
     29    note("psMetadata & psMetadataItem Creation Functions");
    3030
    3131    testItemAllocs();
    … …  
    3838void testItemAllocs(void)
    3939{
    40     diag("  >>>Test 1:  psMetadataItemAlloc Fxns");
     40    note("  >>>Test 1:  psMetadataItemAlloc Fxns");
    4141    psMetadataItem *itemStr = psMetadataItemAllocStr("itemStr", "", "itemStr");
    4242    psMetadataItem *itemF32 = psMetadataItemAllocF32("itemF32", "", 6.66);
    … …  
    263263void testMDAlloc_AddItem(void)
    264264{
    265     diag("  >>>Test 2:  psMetadataAlloc & psMetadataAdd Fxns");
     265    note("  >>>Test 2:  psMetadataAlloc & psMetadataAdd Fxns");
    266266    psMetadata *md = NULL;
    267267    md = psMetadataAlloc();
    … …  
    438438void testIterAlloc(void)
    439439{
    440     diag("  >>>Test 3:  psMetadataIteratorAlloc");
     440    note("  >>>Test 3:  psMetadataIteratorAlloc");
    441441    psMetadata *md = psMetadataAlloc();
    442442    psMetadata *md2 = NULL;

  • trunk/psLib/test/types/tap_psMetadata_manip.c

    r9582 r10819  
    2323int main(void)
    2424{
    25     plan_tests(48);
    26 
    27     diag("psMetadataLookup, Remove, and Iterator Fxns");
     25    plan_tests(52);
     26
     27    note("psMetadataLookup, Remove, and Iterator Fxns");
    2828
    2929    testLookups();
    … …  
    3636void testLookups(void)
    3737{
    38     diag("  >>>Test 1:  psMetadataLookup Functions");
     38    note("  >>>Test 1:  psMetadataLookup Functions");
    3939    psMetadata *md = psMetadataAlloc();
    4040    psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
    … …  
    315315void testRemoves(void)
    316316{
    317     diag("  >>>Test 2:  psMetadataRemove Functions");
     317    note("  >>>Test 2:  psMetadataRemove Functions");
    318318    psMetadata *md = psMetadataAlloc();
    319319    psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
    … …  
    403403void testIter(void)
    404404{
    405     diag("  >>>Test 3:  psMetadataIterator Functions");
     405    note("  >>>Test 3:  psMetadataIterator Functions");
    406406    psMetadata *md = psMetadataAlloc();
    407407    psMetadataAddS32(md, PS_LIST_HEAD, "S32_1", PS_META_NO_REPLACE, "", 1);

  • trunk/psLib/test/types/tap_psMetadata_polynomials.c

    r9597 r10819  
    2424int main(void)
    2525{
    26     plan_tests(89);
    27 
    28     diag("psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests");
     26    plan_tests(96);
     27
     28    note("psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests");
    2929
    3030    test1Dcase();
    … …  
    3939void test1Dcase(void)
    4040{
    41     diag("  >>>Test 1:  psPolynomial1DtoMetadata & psPolynomial1DfromMetadata functions");
     41    note("  >>>Test 1:  psPolynomial1DtoMetadata & psPolynomial1DfromMetadata functions");
    4242    psMetadata *md = psMetadataAlloc();
    4343    psPolynomial1D *p1d = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 1);
    … …  
    5050    //Return a valid metadata containing a polynomial-metadata structure
    5151    {
    52         diag ("example of 1DtoMD using the names not the sequence");
     52        note ("example of 1DtoMD using the names not the sequence");
    5353
    5454        ok( psPolynomial1DtoMetadata(md, p1d, "polyMD"),
    … …  
    198198void test2Dcase(void)
    199199{
    200     diag("  >>>Test 2:  psPolynomial2DtoMetadata & psPolynomial2DfromMetadata functions");
     200    note("  >>>Test 2:  psPolynomial2DtoMetadata & psPolynomial2DfromMetadata functions");
    201201    psMetadata *md = psMetadataAlloc();
    202202    psPolynomial2D *p2d = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1);
    … …  
    216216            "psPolynomial2DtoMetadata:     return true for valid inputs.");
    217217
    218         psMetadataConfigWrite (md, "test.md");
     218        // psMetadataConfigWrite (md, "test.md");
    219219
    220220        //XXX        ok (0, "these tests are relying on the ORDER of the MD components not the NAMES");
    … …  
    249249    //Return a valid metadata containing a polynomial-metadata structure
    250250    {
    251         diag ("example of 2DtoMD using the names not the sequence");
     251        note ("example of 2DtoMD using the names not the sequence");
    252252
    253253        ok( psPolynomial2DtoMetadata(md, p2d, "polyMD"),
    254254            "psPolynomial2DtoMetadata:     return true for valid inputs.");
    255255
    256         psMetadataConfigWrite (md, "test.md");
     256        // psMetadataConfigWrite (md, "test.md");
    257257
    258258        // of the components.  these seem like irrelevant tests.
    … …  
    418418void test3Dcase(void)
    419419{
    420     diag("  >>>Test 3:  psPolynomial3DtoMetadata & psPolynomial3DfromMetadata functions");
     420    note("  >>>Test 3:  psPolynomial3DtoMetadata & psPolynomial3DfromMetadata functions");
    421421    psMetadata *md = psMetadataAlloc();
    422422    psPolynomial3D *p3d = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, 1, 1, 1);
    … …  
    616616void test4Dcase(void)
    617617{
    618     diag("  >>>Test 4:  psPolynomial4DtoMetadata & psPolynomial4DfromMetadata functions");
     618    note("  >>>Test 4:  psPolynomial4DtoMetadata & psPolynomial4DfromMetadata functions");
    619619    psMetadata *md = psMetadataAlloc();
    620620    psPolynomial4D *p4d = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, 1, 1, 1, 1);

  • trunk/psLib/test/types/tap_psMetadata_printing.c

    r9900 r10819  
    2323int main(void)
    2424{
    25     plan_tests(30);
    26 
    27     diag("psMetadataPrint and psMetadataItemPrint tests");
     25    plan_tests(33);
     26
     27    note("psMetadataPrint and psMetadataItemPrint tests");
    2828
    2929    testMetaPrint();
    … …  
    180180void testMetaPrint(void)
    181181{
    182     diag("  >>Test 1:  psMetadataPrint");
     182    note("  >>Test 1:  psMetadataPrint");
    183183    FILE *fd = fopen("psMetadataPrint.out", "w+");
    184184    FILE *fd_read = fopen("Makefile", "r");
    … …  
    268268void testMetaItemPrint(void)
    269269{
    270     diag("  >>Test2:  psMetadataItemPrint");
     270    note("  >>Test2:  psMetadataItemPrint");
    271271    FILE *fd;
    272272    //bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item)
    … …  
    402402    {
    403403        fclose(fd);
     404        unlink ("psMetadataItemPrint.out");
    404405        psFree(item1);
    405406        psFree(item2);

  • trunk/psLib/test/types/tap_psPixels_all.c

    r8966 r10819  
    2323int main(void)
    2424{
    25     plan_tests(38);
    26 
    27     diag("Tests for psPixels Functions");
     25    plan_tests(41);
     26
     27    note("Tests for psPixels Functions");
    2828
    2929    testPixelsCreate();
    … …  
    3535void testPixelsCreate(void)
    3636{
    37     diag("  >>>Test 1:  psPixels Creation Fxns");
     37    note("  >>>Test 1:  psPixels Creation Fxns");
    3838
    3939    //Return allocated psPixels of length 0 with NULL data.
    … …  
    123123void testPixelsManip(void)
    124124{
    125     diag("  >>>Test 2:  psPixels Manipulation Fxns");
     125    note("  >>>Test 2:  psPixels Manipulation Fxns");
    126126
    127127    //Tests for psPixelsSet
Note: See TracChangeset for help on using the changeset viewer.