IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2657


Ignore:
Timestamp:
Dec 7, 2004, 12:59:11 PM (22 years ago)
Author:
harman
Message:

Updated new functions in SDRS 10 per latest polycon

Location:
trunk/psLib
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astronomy/psMetadata.c

    r2648 r2657  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-12-07 19:09:05 $
     14*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-12-07 22:58:59 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    437437}
    438438
    439 void* psMetadataLookupPtr(psMetadata *md, const char *key)
     439void* psMetadataLookupPtr(psMetadata *md, const char *key, psU32 *status)
    440440{
    441441    void *value = NULL;
    … …  
    445445
    446446    metadataItem = psMetadataLookup(md, key);
    447     PS_PTR_CHECK_NULL(metadataItem,NULL);
     447    if(metadataItem == NULL) {
     448        *status = 1;
     449        return value;
     450    }
     451
    448452    pType = metadataItem->pType;
    449453    value = metadataItem->data.V;
    … …  
    456460}
    457461
    458 psS32 psMetadataLookupS32(psMetadata *md, const char *key)
     462psS32 psMetadataLookupS32(psMetadata *md, const char *key, psU32 *status)
    459463{
    460464    psS32 value = 0;
    … …  
    464468
    465469    metadataItem = psMetadataLookup(md, key);
    466     PS_PTR_CHECK_NULL(metadataItem,0);
     470    if(metadataItem == NULL) {
     471        *status = 1;
     472        return value;
     473    }
     474
    467475    pType = metadataItem->pType;
    468476    value = metadataItem->data.S32;
    … …  
    475483}
    476484
    477 psF64 psMetadataLookupF64(psMetadata *md, const char *key)
     485psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status)
    478486{
    479487    psF64 value = 0.0;
    … …  
    483491
    484492    metadataItem = psMetadataLookup(md, key);
    485     PS_PTR_CHECK_NULL(metadataItem,0.0);
     493    if(metadataItem == NULL) {
     494        *status = 1;
     495        return value;
     496    }
     497
    486498    pType = metadataItem->pType;
    487499    value = metadataItem->data.F64;

  • trunk/psLib/src/astronomy/psMetadata.h

    r2648 r2657  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-12-07 19:08:58 $
     13*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-12-07 22:59:05 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    208208psF64 psMetadataLookupF64(
    209209    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    210     const char *key            ///< Name of metadata key.
     210    const char *key,           ///< Name of metadata key.
     211    psU32 *status              ///< Status of lookup.
    211212);
    212213
    … …  
    221222psS32 psMetadataLookupS32(
    222223    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    223     const char *key            ///< Name of metadata key.
     224    const char *key,           ///< Name of metadata key.
     225    psU32 *status              ///< Status of lookup.
    224226);
    225227
    … …  
    234236void* psMetadataLookupPtr(
    235237    psMetadata* md,            ///< Metadata collection to lookup metadata item.
    236     const char *key            ///< Name of metadata key.
     238    const char *key,           ///< Name of metadata key.
     239    psU32 *status              ///< Status of lookup.
    237240);
    238241

  • trunk/psLib/src/collections/psMetadata.c

    r2648 r2657  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-12-07 19:09:05 $
     14*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-12-07 22:58:59 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    437437}
    438438
    439 void* psMetadataLookupPtr(psMetadata *md, const char *key)
     439void* psMetadataLookupPtr(psMetadata *md, const char *key, psU32 *status)
    440440{
    441441    void *value = NULL;
    … …  
    445445
    446446    metadataItem = psMetadataLookup(md, key);
    447     PS_PTR_CHECK_NULL(metadataItem,NULL);
     447    if(metadataItem == NULL) {
     448        *status = 1;
     449        return value;
     450    }
     451
    448452    pType = metadataItem->pType;
    449453    value = metadataItem->data.V;
    … …  
    456460}
    457461
    458 psS32 psMetadataLookupS32(psMetadata *md, const char *key)
     462psS32 psMetadataLookupS32(psMetadata *md, const char *key, psU32 *status)
    459463{
    460464    psS32 value = 0;
    … …  
    464468
    465469    metadataItem = psMetadataLookup(md, key);
    466     PS_PTR_CHECK_NULL(metadataItem,0);
     470    if(metadataItem == NULL) {
     471        *status = 1;
     472        return value;
     473    }
     474
    467475    pType = metadataItem->pType;
    468476    value = metadataItem->data.S32;
    … …  
    475483}
    476484
    477 psF64 psMetadataLookupF64(psMetadata *md, const char *key)
     485psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status)
    478486{
    479487    psF64 value = 0.0;
    … …  
    483491
    484492    metadataItem = psMetadataLookup(md, key);
    485     PS_PTR_CHECK_NULL(metadataItem,0.0);
     493    if(metadataItem == NULL) {
     494        *status = 1;
     495        return value;
     496    }
     497
    486498    pType = metadataItem->pType;
    487499    value = metadataItem->data.F64;

  • trunk/psLib/src/collections/psMetadata.h

    r2648 r2657  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-12-07 19:08:58 $
     13*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-12-07 22:59:05 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    208208psF64 psMetadataLookupF64(
    209209    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    210     const char *key            ///< Name of metadata key.
     210    const char *key,           ///< Name of metadata key.
     211    psU32 *status              ///< Status of lookup.
    211212);
    212213
    … …  
    221222psS32 psMetadataLookupS32(
    222223    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    223     const char *key            ///< Name of metadata key.
     224    const char *key,           ///< Name of metadata key.
     225    psU32 *status              ///< Status of lookup.
    224226);
    225227
    … …  
    234236void* psMetadataLookupPtr(
    235237    psMetadata* md,            ///< Metadata collection to lookup metadata item.
    236     const char *key            ///< Name of metadata key.
     238    const char *key,           ///< Name of metadata key.
     239    psU32 *status              ///< Status of lookup.
    237240);
    238241

  • trunk/psLib/src/types/psMetadata.c

    r2648 r2657  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-12-07 19:09:05 $
     14*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-12-07 22:58:59 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    437437}
    438438
    439 void* psMetadataLookupPtr(psMetadata *md, const char *key)
     439void* psMetadataLookupPtr(psMetadata *md, const char *key, psU32 *status)
    440440{
    441441    void *value = NULL;
    … …  
    445445
    446446    metadataItem = psMetadataLookup(md, key);
    447     PS_PTR_CHECK_NULL(metadataItem,NULL);
     447    if(metadataItem == NULL) {
     448        *status = 1;
     449        return value;
     450    }
     451
    448452    pType = metadataItem->pType;
    449453    value = metadataItem->data.V;
    … …  
    456460}
    457461
    458 psS32 psMetadataLookupS32(psMetadata *md, const char *key)
     462psS32 psMetadataLookupS32(psMetadata *md, const char *key, psU32 *status)
    459463{
    460464    psS32 value = 0;
    … …  
    464468
    465469    metadataItem = psMetadataLookup(md, key);
    466     PS_PTR_CHECK_NULL(metadataItem,0);
     470    if(metadataItem == NULL) {
     471        *status = 1;
     472        return value;
     473    }
     474
    467475    pType = metadataItem->pType;
    468476    value = metadataItem->data.S32;
    … …  
    475483}
    476484
    477 psF64 psMetadataLookupF64(psMetadata *md, const char *key)
     485psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status)
    478486{
    479487    psF64 value = 0.0;
    … …  
    483491
    484492    metadataItem = psMetadataLookup(md, key);
    485     PS_PTR_CHECK_NULL(metadataItem,0.0);
     493    if(metadataItem == NULL) {
     494        *status = 1;
     495        return value;
     496    }
     497
    486498    pType = metadataItem->pType;
    487499    value = metadataItem->data.F64;

  • trunk/psLib/src/types/psMetadata.h

    r2648 r2657  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-12-07 19:08:58 $
     13*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-12-07 22:59:05 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    208208psF64 psMetadataLookupF64(
    209209    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    210     const char *key            ///< Name of metadata key.
     210    const char *key,           ///< Name of metadata key.
     211    psU32 *status              ///< Status of lookup.
    211212);
    212213
    … …  
    221222psS32 psMetadataLookupS32(
    222223    psMetadata *md,            ///< Metadata collection to lookup metadata item.
    223     const char *key            ///< Name of metadata key.
     224    const char *key,           ///< Name of metadata key.
     225    psU32 *status              ///< Status of lookup.
    224226);
    225227
    … …  
    234236void* psMetadataLookupPtr(
    235237    psMetadata* md,            ///< Metadata collection to lookup metadata item.
    236     const char *key            ///< Name of metadata key.
     238    const char *key,           ///< Name of metadata key.
     239    psU32 *status              ///< Status of lookup.
    237240);
    238241

  • trunk/psLib/test/astronomy/tst_psMetadata_04.c

    r2607 r2657  
    1111*     Test E - Attempt to lookup non-existant metadata item
    1212*     Test F - Lookup metadata item by index
    13 *     Test G - Attempt to use null metadata
    14 *     Test H - Attempt to get non-existant metadata item
    15 *     Test I - Attempt to look up with an invalid metadata object
    16 *     Test J - Attempt get item  with an invalid metadata object
    17 *     Test K - Free psMetadata
     13*     Test G - Lookup metadata item and return psS32 value
     14*     Test H - Lookup metadata item and return psF64 value
     15*     Test I - Lookup metadata item and return psVector pointer
     16*     Test J - Attempt to use null metadata
     17*     Test K - Attempt to get non-existant metadata item
     18*     Test L - Attempt to look up with an invalid metadata object
     19*     Test M - Attempt get item  with an invalid metadata object
     20*     Test N - Attempt get value of non-existant metadata item
     21*     Test O - Free psMetadata
    1822*
    1923*  @author  Ross Harman, MHPCC
    2024*
    21 *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
    22 *  @date  $Date: 2004-12-03 23:19:07 $
     25*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2004-12-07 22:59:11 $
    2327*
    2428*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7074psS32 main( psS32 argc, char* argv[] )
    7175{
     76    psU32 status = 0;
    7277    psMetadataItem *item1 = NULL;
    7378    psMetadataItem *item2 = NULL;
    7479    psMetadataItem *item3 = NULL;
    7580    psMetadataItem *item4 = NULL;
     81    psMetadataItem *item5 = NULL;
     82    psMetadataItem *item6 = NULL;
    7683    psMetadataItem *item = NULL;
    7784    psMetadata *metadata = NULL;
    … …  
    8289    // Test A - Allocate metadata and items
    8390    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
     91    psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
    8492    metadata = psMetadataAlloc();
    8593    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    … …  
    8795    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
    8896    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
     97    item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double", 3.14);
     98    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_PTR, PS_META_VEC, "I am a vector", vec);
    8999    printMetadataItem(item1);
    90100    printMetadataItem(item2);
    91101    printMetadataItem(item3);
    92102    printMetadataItem(item4);
     103    printMetadataItem(item5);
    93104    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
    94105    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
    95106    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
    96107    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     108    psMetadataAddItem(metadata, item5, PS_LIST_HEAD);
     109    psMetadataAddItem(metadata, item6, PS_LIST_HEAD);
    97110    printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
    98111
    … …  
    149162    printFooter(stdout, "psMetadata", "Test F - Lookup metadata item by index", true);
    150163
    151 
    152     // Test G - Attempt to use null metadata
    153     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use null metadata",
     164    // Test G - Lookup metadata item and return psS32 value
     165    printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
     166    psS32 valueS32 = 0;
     167    status = 0;
     168    valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
     169    if(valueS32 != 55) {
     170        printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
     171        return 15;
     172    } else if(status != 0) {
     173        printf("ERROR: Bad status, %d\n", status);
     174        return 15;
     175    }
     176    printFooter(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value", true);
     177
     178    // Test H - Lookup metadata item and return psF64 value
     179    printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
     180    psF64 valueF64 = 0.0;
     181    status = 0;
     182    valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
     183    if(fabs(valueF64-3.14) > FLT_EPSILON) {
     184        printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
     185        return 16;
     186    } else if(status != 0) {
     187        printf("ERROR: Bad status, %d\n", status);
     188        return 16;
     189    }
     190    printFooter(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value", true);
     191
     192    // Test I - Lookup metadata item and return psVector pointer
     193    printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
     194    psVector *valueVec = NULL;
     195    status = 0;
     196    valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
     197    if(valueVec != vec) {
     198        printf("ERROR: Bad vector pointer\n");
     199        return 17;
     200    } else if(status != 0) {
     201        printf("ERROR: Bad status, %d\n", status);
     202        return 17;
     203    }
     204    printFooter(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer", true);
     205
     206
     207    // Test J - Attempt to use null metadata
     208    printNegativeTestHeader(stdout,"psMetadata", "Test J - Attempt to use null metadata",
    154209                            "Null metadata collection not allowed", 0);
    155210    item = psMetadataGet(NULL, 0);
    156211    if ( item != NULL ) {
    157         psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure.");
    158         return 15;
    159     }
    160     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata", true);
    161 
    162 
    163     // Test H - Attempt to get non-existant metadata item
    164     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to get non-existant metadata item",
     212        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure");
     213        return 18;
     214    }
     215    printFooter(stdout, "psMetadata", "Test J - Attempt to use null metadata", true);
     216
     217
     218    // Test K - Attempt to get non-existant metadata item
     219    printNegativeTestHeader(stdout,"psMetadata", "Test K - Attempt to get non-existant metadata item",
    165220                            "Couldn't find metadata item with given index. Index: 22", 0);
    166221    if ( psMetadataGet(metadata, 22) != NULL ) {
    167         psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item.");
    168         return 16;
    169     }
    170     printFooter(stdout, "psMetadata", "Test H - Attempt to get non-existant metadata item", true);
    171 
    172     // Test I - Attempt to look up with an invalid metadata object
    173     printNegativeTestHeader(stdout,"psMetadata","Test I - Attemp to look up with an invalid metadata",
     222        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item");
     223        return 19;
     224    }
     225    printFooter(stdout, "psMetadata", "Test K - Attempt to get non-existant metadata item", true);
     226
     227    // Test L - Attempt to look up with an invalid metadata object
     228    printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata",
    174229                            "Lookup item with invalid metadata object.", 0 );
    175230    tmpTable = metadata->table;
    176231    metadata->table = NULL;
    177232    if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
    178         psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
     233        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
    179234        return 20;
    180235    }
    181236    metadata->table = tmpTable;
    182     printFooter(stdout, "psMetadata","Test I - Attempt to lookup an invalid metadata object.",true);
    183 
    184     // Test J - Attempt get item with an invalid metadata object
    185     printNegativeTestHeader(stdout,"psMetadata","Test J - Attemp to get item with an invalid metadata",
     237    printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true);
     238
     239    // Test M - Attempt get item with an invalid metadata object
     240    printNegativeTestHeader(stdout,"psMetadata","Test M - Attempt to get item with an invalid metadata",
    186241                            "Get item with invalid metadata object.", 0 );
    187242    tmpList = metadata->list;
    188243    metadata->list = NULL;
    189244    if ( psMetadataGet(metadata,0) != NULL ) {
    190         psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
    191         return 20;
     245        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
     246        return 21;
    192247    }
    193248    metadata->list = tmpList;
    194     printFooter(stdout, "psMetadata","Test J - Attempt to get item with  invalid metadata object.",true);
    195 
    196     // Test K - Free psMetadata
    197     printPositiveTestHeader(stdout, "psMetadata", "Test K - Free psMetadata");
     249    printFooter(stdout, "psMetadata","Test M - Attempt to get item with  invalid metadata object",true);
     250
     251    // Test N - Attempt get psS32 value of non-existant metadata item
     252    printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
     253    status = 0;
     254    valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
     255    if(status != 1) {
     256        printf("ERROR: Bad status, %d, \n", status);
     257        return 22;
     258    }
     259    printFooter(stdout, "psMetadata","Test N - Attempt get psS32 value of non-existant metadata item",true);
     260
     261    // Test O - Attempt get psF64 value of non-existant metadata item
     262    printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
     263    status = 0;
     264    valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
     265    if(status != 1) {
     266        printf("ERROR: Bad status, %d, \n", status);
     267        return 23;
     268    }
     269    printFooter(stdout, "psMetadata","Test O - Attempt get psF64 value of non-existant metadata item",true);
     270
     271    // Test P - Attempt get psVector value of non-existant metadata item
     272    printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
     273    status = 0;
     274    valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
     275    if(status != 1) {
     276        printf("ERROR: Bad status, %d, \n", status);
     277        return 24;
     278    }
     279    printFooter(stdout, "psMetadata","Test P - Attempt get psVector value of non-existant metadata item",true);
     280
     281    // Test Q - Free psMetadata
     282    printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata");
    198283    psFree(metadata);
    199284    psFree(item1);
    … …  
    201286    psFree(item3);
    202287    psFree(item4);
     288    psFree(item5);
     289    psFree(item6);
    203290    if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
    204291        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");
    205         return 20;
     292        return 23;
    206293    }
    207294    psMemCheckCorruption(0);
    … …  
    209296    if(nBad) {
    210297        printf("ERROR: Found %d bad memory blocks\n", nBad);
    211         return 21;
    212     }
    213     printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true);
     298        return 24;
     299    }
     300    printFooter(stdout, "psMetadata", "Test Q - Free psMetadata", true);
    214301
    215302

  • trunk/psLib/test/collections/tst_psMetadata_04.c

    r2607 r2657  
    1111*     Test E - Attempt to lookup non-existant metadata item
    1212*     Test F - Lookup metadata item by index
    13 *     Test G - Attempt to use null metadata
    14 *     Test H - Attempt to get non-existant metadata item
    15 *     Test I - Attempt to look up with an invalid metadata object
    16 *     Test J - Attempt get item  with an invalid metadata object
    17 *     Test K - Free psMetadata
     13*     Test G - Lookup metadata item and return psS32 value
     14*     Test H - Lookup metadata item and return psF64 value
     15*     Test I - Lookup metadata item and return psVector pointer
     16*     Test J - Attempt to use null metadata
     17*     Test K - Attempt to get non-existant metadata item
     18*     Test L - Attempt to look up with an invalid metadata object
     19*     Test M - Attempt get item  with an invalid metadata object
     20*     Test N - Attempt get value of non-existant metadata item
     21*     Test O - Free psMetadata
    1822*
    1923*  @author  Ross Harman, MHPCC
    2024*
    21 *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
    22 *  @date  $Date: 2004-12-03 23:19:07 $
     25*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2004-12-07 22:59:11 $
    2327*
    2428*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7074psS32 main( psS32 argc, char* argv[] )
    7175{
     76    psU32 status = 0;
    7277    psMetadataItem *item1 = NULL;
    7378    psMetadataItem *item2 = NULL;
    7479    psMetadataItem *item3 = NULL;
    7580    psMetadataItem *item4 = NULL;
     81    psMetadataItem *item5 = NULL;
     82    psMetadataItem *item6 = NULL;
    7683    psMetadataItem *item = NULL;
    7784    psMetadata *metadata = NULL;
    … …  
    8289    // Test A - Allocate metadata and items
    8390    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
     91    psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
    8492    metadata = psMetadataAlloc();
    8593    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    … …  
    8795    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
    8896    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
     97    item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double", 3.14);
     98    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_PTR, PS_META_VEC, "I am a vector", vec);
    8999    printMetadataItem(item1);
    90100    printMetadataItem(item2);
    91101    printMetadataItem(item3);
    92102    printMetadataItem(item4);
     103    printMetadataItem(item5);
    93104    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
    94105    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
    95106    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
    96107    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     108    psMetadataAddItem(metadata, item5, PS_LIST_HEAD);
     109    psMetadataAddItem(metadata, item6, PS_LIST_HEAD);
    97110    printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
    98111
    … …  
    149162    printFooter(stdout, "psMetadata", "Test F - Lookup metadata item by index", true);
    150163
    151 
    152     // Test G - Attempt to use null metadata
    153     printNegativeTestHeader(stdout,"psMetadata", "Test G - Attempt to use null metadata",
     164    // Test G - Lookup metadata item and return psS32 value
     165    printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
     166    psS32 valueS32 = 0;
     167    status = 0;
     168    valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
     169    if(valueS32 != 55) {
     170        printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
     171        return 15;
     172    } else if(status != 0) {
     173        printf("ERROR: Bad status, %d\n", status);
     174        return 15;
     175    }
     176    printFooter(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value", true);
     177
     178    // Test H - Lookup metadata item and return psF64 value
     179    printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
     180    psF64 valueF64 = 0.0;
     181    status = 0;
     182    valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
     183    if(fabs(valueF64-3.14) > FLT_EPSILON) {
     184        printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
     185        return 16;
     186    } else if(status != 0) {
     187        printf("ERROR: Bad status, %d\n", status);
     188        return 16;
     189    }
     190    printFooter(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value", true);
     191
     192    // Test I - Lookup metadata item and return psVector pointer
     193    printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
     194    psVector *valueVec = NULL;
     195    status = 0;
     196    valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
     197    if(valueVec != vec) {
     198        printf("ERROR: Bad vector pointer\n");
     199        return 17;
     200    } else if(status != 0) {
     201        printf("ERROR: Bad status, %d\n", status);
     202        return 17;
     203    }
     204    printFooter(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer", true);
     205
     206
     207    // Test J - Attempt to use null metadata
     208    printNegativeTestHeader(stdout,"psMetadata", "Test J - Attempt to use null metadata",
    154209                            "Null metadata collection not allowed", 0);
    155210    item = psMetadataGet(NULL, 0);
    156211    if ( item != NULL ) {
    157         psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure.");
    158         return 15;
    159     }
    160     printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata", true);
    161 
    162 
    163     // Test H - Attempt to get non-existant metadata item
    164     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to get non-existant metadata item",
     212        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure");
     213        return 18;
     214    }
     215    printFooter(stdout, "psMetadata", "Test J - Attempt to use null metadata", true);
     216
     217
     218    // Test K - Attempt to get non-existant metadata item
     219    printNegativeTestHeader(stdout,"psMetadata", "Test K - Attempt to get non-existant metadata item",
    165220                            "Couldn't find metadata item with given index. Index: 22", 0);
    166221    if ( psMetadataGet(metadata, 22) != NULL ) {
    167         psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item.");
    168         return 16;
    169     }
    170     printFooter(stdout, "psMetadata", "Test H - Attempt to get non-existant metadata item", true);
    171 
    172     // Test I - Attempt to look up with an invalid metadata object
    173     printNegativeTestHeader(stdout,"psMetadata","Test I - Attemp to look up with an invalid metadata",
     222        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item");
     223        return 19;
     224    }
     225    printFooter(stdout, "psMetadata", "Test K - Attempt to get non-existant metadata item", true);
     226
     227    // Test L - Attempt to look up with an invalid metadata object
     228    printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata",
    174229                            "Lookup item with invalid metadata object.", 0 );
    175230    tmpTable = metadata->table;
    176231    metadata->table = NULL;
    177232    if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
    178         psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
     233        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
    179234        return 20;
    180235    }
    181236    metadata->table = tmpTable;
    182     printFooter(stdout, "psMetadata","Test I - Attempt to lookup an invalid metadata object.",true);
    183 
    184     // Test J - Attempt get item with an invalid metadata object
    185     printNegativeTestHeader(stdout,"psMetadata","Test J - Attemp to get item with an invalid metadata",
     237    printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true);
     238
     239    // Test M - Attempt get item with an invalid metadata object
     240    printNegativeTestHeader(stdout,"psMetadata","Test M - Attempt to get item with an invalid metadata",
    186241                            "Get item with invalid metadata object.", 0 );
    187242    tmpList = metadata->list;
    188243    metadata->list = NULL;
    189244    if ( psMetadataGet(metadata,0) != NULL ) {
    190         psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
    191         return 20;
     245        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
     246        return 21;
    192247    }
    193248    metadata->list = tmpList;
    194     printFooter(stdout, "psMetadata","Test J - Attempt to get item with  invalid metadata object.",true);
    195 
    196     // Test K - Free psMetadata
    197     printPositiveTestHeader(stdout, "psMetadata", "Test K - Free psMetadata");
     249    printFooter(stdout, "psMetadata","Test M - Attempt to get item with  invalid metadata object",true);
     250
     251    // Test N - Attempt get psS32 value of non-existant metadata item
     252    printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
     253    status = 0;
     254    valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
     255    if(status != 1) {
     256        printf("ERROR: Bad status, %d, \n", status);
     257        return 22;
     258    }
     259    printFooter(stdout, "psMetadata","Test N - Attempt get psS32 value of non-existant metadata item",true);
     260
     261    // Test O - Attempt get psF64 value of non-existant metadata item
     262    printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
     263    status = 0;
     264    valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
     265    if(status != 1) {
     266        printf("ERROR: Bad status, %d, \n", status);
     267        return 23;
     268    }
     269    printFooter(stdout, "psMetadata","Test O - Attempt get psF64 value of non-existant metadata item",true);
     270
     271    // Test P - Attempt get psVector value of non-existant metadata item
     272    printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
     273    status = 0;
     274    valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
     275    if(status != 1) {
     276        printf("ERROR: Bad status, %d, \n", status);
     277        return 24;
     278    }
     279    printFooter(stdout, "psMetadata","Test P - Attempt get psVector value of non-existant metadata item",true);
     280
     281    // Test Q - Free psMetadata
     282    printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata");
    198283    psFree(metadata);
    199284    psFree(item1);
    … …  
    201286    psFree(item3);
    202287    psFree(item4);
     288    psFree(item5);
     289    psFree(item6);
    203290    if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
    204291        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");
    205         return 20;
     292        return 23;
    206293    }
    207294    psMemCheckCorruption(0);
    … …  
    209296    if(nBad) {
    210297        printf("ERROR: Found %d bad memory blocks\n", nBad);
    211         return 21;
    212     }
    213     printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true);
     298        return 24;
     299    }
     300    printFooter(stdout, "psMetadata", "Test Q - Free psMetadata", true);
    214301
    215302
Note: See TracChangeset for help on using the changeset viewer.