IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12442 for trunk/psLib


Ignore:
Timestamp:
Mar 14, 2007, 4:43:49 PM (19 years ago)
Author:
jhoblitt
Message:

split tap_psMetadataConfigParse.c out of tap_psMetadataConfig_input.c

Location:
trunk/psLib/test/types
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/types/Makefile.am

    r10779 r12442  
    3232        tap_psMetadataConfigWrite \
    3333        tap_psMetadataConfigPrint \
     34        tap_psMetadataConfigParse \
    3435        tap_psMetadataConfigFormat \
    3536        tap_psMetadataConfig_input \

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

    r12441 r12442  
    2121int main(void)
    2222{
    23     plan_tests(42);
     23    plan_tests(24 + 1);
    2424
    2525    psLogSetFormat("HLNM");
    … …  
    3030    {
    3131        unsigned int nfail = 0;
    32         psMetadata *out = psMetadataConfigRead(NULL, &nfail, NULL, false);
     32        psMetadata *md = psMetadataConfigRead(NULL, &nfail, NULL, false);
    3333
    34         ok(out == NULL, "return NULL for NULL filename input.");
     34        ok(md == NULL, "return NULL for NULL filename input.");
    3535    }
    3636
    … …  
    3838    {
    3939        unsigned int nfail = 0;
    40         psMetadata *out = psMetadataConfigRead(NULL, &nfail, ".", false);
     40        psMetadata *md = psMetadataConfigRead(NULL, &nfail, ".", false);
    4141
    42         ok(out == NULL, "return NULL for invalid filename input.");
     42        ok(md == NULL, "return NULL for invalid filename input.");
    4343    }
    4444
    … …  
    4646    {
    4747        unsigned int nfail = 0;
    48         psMetadata *out = psMetadataConfigRead(NULL, &nfail, "table4.dat", false);
    49         ok(out == NULL, "return NULL for missing file input.");
     48        psMetadata *md = psMetadataConfigRead(NULL, &nfail, "table4.dat", false);
     49        ok(md == NULL, "return NULL for missing file input.");
    5050    }
    5151
    … …  
    5454    {
    5555        unsigned int nfail = 0;
    56         psMetadata *out = psMetadataConfigRead(NULL, &nfail, "table3.dat", false);
    57         ok(out == NULL, "return NULL for all bad syntax");
     56        psMetadata *md = psMetadataConfigRead(NULL, &nfail, "table3.dat", false);
     57        ok(md == NULL, "return NULL for all bad syntax");
    5858        is_int(nfail, 0, "correct nfail");
    5959
    60         psFree(out);
     60        psFree(md);
    6161    }
    6262
    … …  
    6464    {
    6565        unsigned int nfail = 0;
    66         psMetadata *out = psMetadataConfigRead(NULL, &nfail, "metaconf.in", false);
     66        psMetadata *md = psMetadataConfigRead(NULL, &nfail, "metaconf.in", false);
    6767
    68         ok(out != NULL, "return metadata for valid input");
     68        ok(md != NULL, "return metadata for valid input");
    6969        is_int(nfail, 27, "return correct nFail count");
    7070
    71         skip_start(out == NULL, 8,
     71        skip_start(md == NULL, 8,
    7272                     "Skipping 1 tests because metadata container is empty!");
    7373
    7474        // look at the first item
    75         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    76         // XXX shouldn't assume tempItem isn't NULL
    77         ok_str(tempItem->name, "item1", "metadataItem name");
    78         ok(tempItem->type == PS_DATA_BOOL, "metadataItem type");
    79         is_bool(tempItem->data.B, true, "metdataItem value");
    80         ok_str(tempItem->comment, "I am a boolean", "metadataItem comment.");
     75        psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
     76        // XXX shouldn't assume item isn't NULL
     77        ok_str(item->name, "item1", "metadataItem name");
     78        ok(item->type == PS_DATA_BOOL, "metadataItem type");
     79        is_bool(item->data.B, true, "metdataItem value");
     80        ok_str(item->comment, "I am a boolean", "metadataItem comment.");
    8181
    8282        // look at the last item
    83         tempItem = psMetadataGet(out, PS_LIST_TAIL);
    84         // XXX shouldn't assume tempItem isn't NULL
    85         ok_str(tempItem->name, "M2", "metadataItem name");
    86         ok(tempItem->type == PS_DATA_S32, "metdataItem type");
    87         is_int(tempItem->data.S32, 666, "metdataItem value");
    88         ok_str(tempItem->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment.");
     83        item = psMetadataGet(md, PS_LIST_TAIL);
     84        // XXX shouldn't assume item isn't NULL
     85        ok_str(item->name, "M2", "metadataItem name");
     86        ok(item->type == PS_DATA_S32, "metdataItem type");
     87        is_int(item->data.S32, 666, "metdataItem value");
     88        ok_str(item->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment.");
    8989
    9090        skip_end();
    91         psFree(out);
     91        psFree(md);
    9292    }
    9393
    … …  
    9595    {
    9696        unsigned int nfail = 0;
    97         psMetadata *out = psMetadataConfigRead(NULL, &nfail, "metaconf.in", true);
    98 //        psMetadataConfigPrint(stdout, out);
     97        psMetadata *md = psMetadataConfigRead(NULL, &nfail, "metaconf.in", true);
    9998
    100         ok(out != NULL, "return metadata for valid input");
     99        ok(md != NULL, "return metadata for valid input");
    101100        is_int(nfail, 23, "return correct nFail count");
    102101
    103         skip_start(out == NULL, 7,
     102        skip_start(md == NULL, 7,
    104103                     "Skipping 1 tests because metadata container is empty!");
    105104
    106105        // look at the first item
    107         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    108         // XXX shouldn't assume tempItem isn't NULL
     106        psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
     107        // XXX shouldn't assume item isn't NULL
    109108        // note that item1 gets added to the "tail" of the metdata was it's
    110109        // replaced
    111         ok_str(tempItem->name, "item2", "metadataItem name");
    112         ok(tempItem->type == PS_DATA_S32, "metdataItem type");
    113         is_bool(tempItem->data.S32, 55, "metadataItem value");
    114         ok_str(tempItem->comment, "I am int", "metadataItem value");
     110        ok_str(item->name, "item2", "metadataItem name");
     111        ok(item->type == PS_DATA_S32, "metdataItem type");
     112        is_bool(item->data.S32, 55, "metadataItem value");
     113        ok_str(item->comment, "I am int", "metadataItem value");
    115114
    116115        // look at the last item
    117         tempItem = psMetadataGet(out, PS_LIST_TAIL);
    118         // XXX shouldn't assume tempItem isn't NULL
     116        item = psMetadataGet(md, PS_LIST_TAIL);
     117        // XXX shouldn't assume item isn't NULL
    119118        // meta1 is from "the bad section"
    120         ok_str(tempItem->name, "meta1", "metadataItem name");
    121         ok(tempItem->type == PS_DATA_METADATA, "metadataItem type");
     119        ok_str(item->name, "meta1", "metadataItem name");
     120        ok(item->type == PS_DATA_METADATA, "metadataItem type");
    122121
    123         ok_str(tempItem->comment, "", "metadataItem comment");
     122        ok_str(item->comment, "", "metadataItem comment");
    124123
    125124        skip_end();
    126         psFree(out);
     125        psFree(md);
    127126    }
    128127
    129     // Check for Memory leaks
    130     checkMem();
    131 
    132     // Return NULL for NULL string input
    133     {
    134         psMemId id = psMemGetId();
    135         unsigned int nfail = 0;
    136         psMetadata *out = psMetadataConfigParse(NULL, &nfail, NULL, false);
    137 
    138         ok(out == NULL, "psMetadataConfigParse: return NULL for NULL string input.");
    139 
    140         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    141     }
    142 
    143     // Return empty metadata for incorrect string input
    144     {
    145         psMemId id = psMemGetId();
    146         char str1[70];
    147         strcpy(str1, "-10.05    2        4");
    148         psMetadata *out = psMetadataConfigParse(NULL, NULL, str1, false);
    149         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    150         ok( out != NULL && tempItem == NULL,
    151             "psMetadataConfigParse: return empty metadata for invalid "
    152             "string input.");
    153         psFree(out);
    154         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    155     }
    156 
    157     // Return correct metadata for correct string input - S32
    158     {
    159         psMemId id = psMemGetId();
    160         char str2[70];
    161         strcpy(str2, "new S32       666");
    162         psMetadata *out = psMetadataConfigParse(NULL, NULL, str2, false);
    163         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    164         ok( out != NULL && tempItem != NULL,
    165             "psMetadataConfigParse: return correct metadata for valid "
    166             "string input. (S32)");
    167         skip_start(  tempItem == NULL, 2,
    168                      "Skipping 1 tests because metadata container is empty!");
    169         ok( tempItem->type == PS_TYPE_S32 && tempItem->data.S32 == 666,
    170             "psMetadataConfigParse: return correct metadataItem data (S32)");
    171         ok_str( tempItem->name, "new",
    172                 "psMetadataConfigParse: return correct metadataItem name (S32)");
    173         skip_end();
    174         psFree(out);
    175         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    176     }
    177 
    178     // Return correct metadata for correct string input - F64
    179     {
    180         psMemId id = psMemGetId();
    181         char str3[70];
    182         strcpy(str3, "item4            F64       6.28");
    183         psMetadata *out = psMetadataConfigParse(NULL, NULL, str3, false);
    184         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    185         ok( out != NULL && tempItem != NULL,
    186             "psMetadataConfigParse: return correct metadata for valid "
    187             "string input. (F64)");
    188         skip_start(  tempItem == NULL, 2,
    189                      "Skipping 1 tests because metadata container is empty!");
    190         ok( tempItem->type == PS_DATA_F64,
    191             "psMetadataConfigParse: return correct metadataItem data (F64) "
    192             "from outputted metadata.");
    193         ok_float(6.28, tempItem->data.F64,
    194                  "psMetadataConfigParse: return correct metadataItem data (F64) "
    195                  "value.");
    196         ok_str( tempItem->name, "item4",
    197                 "psMetadataConfigParse: return correct metadataItem name (F64)");
    198         skip_end();
    199         psFree(out);
    200         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    201     }
    202 
    203     // Return correct metadata for string with duplicate entry - S8
    204     {
    205         psMemId id = psMemGetId();
    206         char str4[70];
    207         strcpy(str4, "item8            S8        3\nitem8            S8        5");
    208         unsigned int nfail = 0;
    209         psMetadata *out = psMetadataConfigParse(NULL, &nfail, str4, false);
    210         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    211         ok( out != NULL && tempItem != NULL && out->list->n == 1  && nfail == 1,
    212             "psMetadataConfigParse: return correct metadata for string "
    213             "with duplicate entry. (S8)");
    214         skip_start(  tempItem == NULL, 2,
    215                      "Skipping 1 tests because metadata container is empty!");
    216         ok( tempItem->type == PS_TYPE_S8 && tempItem->data.S8 == 3,
    217             "psMetadataConfigParse: return correct metadataItem data (S8)");
    218         ok_str( tempItem->name, "item8",
    219                 "psMetadataConfigParse: return correct metadataItem name (S8)");
    220         skip_end();
    221         psFree(out);
    222         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    223     }
    224 
    225     //Return correct metadata for correct string input - Vector
    226     {
    227         psMemId id = psMemGetId();
    228         char str7[70];
    229         strcpy(str7, "@vector6 U8 1 2 3 4 5   # I am a vector");
    230         psMetadata *out = psMetadataConfigParse(NULL, NULL, str7, true);
    231         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    232         ok( out != NULL && tempItem != NULL,
    233             "psMetadataConfigParse: return correct metadata for valid "
    234             "string input. (Vector)");
    235         skip_start(  tempItem == NULL, 2,
    236                      "Skipping 1 tests because metadata container is empty!");
    237         ok( tempItem->type == PS_DATA_VECTOR
    238             && ((psVector*)(tempItem->data.V))->data.U8[0] == 1,
    239             "psMetadataConfigParse: return correct metadataItem data (Vector) ");
    240         ok_str( tempItem->name, "vector6",
    241                 "psMetadataConfigParse: return correct metadataItem name (Vector)");
    242         skip_end();
    243         psFree(out);
    244         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    245     }
    246 
    247     //Return empty metadata for incorrect string input
    248     {
    249         psMemId id = psMemGetId();
    250         char str9[70];
    251         strcpy(str9, "END\n");
    252         psMetadata *out = psMetadataConfigParse(NULL, NULL, str9, false);
    253         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
    254         ok( out != NULL && tempItem == NULL,
    255             "psMetadataConfigParse: return empty metadata for invalid "
    256             "string input.");
    257         psFree(out);
    258         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    259     }
     128    done();
    260129}
    261 
Note: See TracChangeset for help on using the changeset viewer.