IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 3, 2004, 1:19:07 PM (22 years ago)
Author:
harman
Message:

Updates for version 10 of SDRS

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2392 r2607  
    1010*     Test E - Attempt to remove non-existant metadata item by name
    1111*     Test F - Attempt to remove non-existant metadata item by index
    12 *     Test G - Free psMetadata
    13  *
     12*     Test G - Attempt to add item to an invalid metadata structure
     13*     Test H - Attempt to add item to an invalid metadata structure
     14*     Test I - Attempt to add item with a null name
     15*     Test J - Attempt to add item to an invalid metadata structure
     16*     Test K - Free psMetadata
     17*
    1418*  @author  Ross Harman, MHPCC
    1519*
    16 *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2004-11-22 20:54:50 $
     20*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2004-12-03 23:19:07 $
    1822*
    1923*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2529#include <string.h>
    2630
    27 static void printMetadataItem(psMetadataItem *item)
     31static void printMetadataItem(psMetadataItem *metadataItem)
    2832{
    29     printf("Key Name: %8s  ", item->name);
    30     printf("Key Type: %2d  ", item->type);
    31 
    32     switch (item->type ) {
    33     case PS_META_BOOL:
    34         printf("Key Value: %15d  ", item->data.B);
     33    printf("Key Name: %8s  ", metadataItem->name);
     34    printf("Key pType: %2d  ", metadataItem->pType);
     35    printf("Key mdType: %2d  ", metadataItem->type);
     36
     37    switch (metadataItem->type) {
     38    case PS_META_LIST:
     39        printf("Key Value: %17c", ' ');
    3540        break;
    36     case PS_META_S32:
    37         printf("Key Value: %15d  ", item->data.S32);
    38         break;
    39     case PS_META_F32:
    40         printf("Key Value: %15.3f  ", item->data.F32);
    41         break;
    42     case PS_META_F64:
    43         printf("Key Value: %15.3f  ", item->data.F64);
     41    case PS_META_PRIMITIVE:
     42        switch(metadataItem->pType) {
     43        case PS_TYPE_BOOL:
     44            printf("Key Value: %15d  ", metadataItem->data.B);
     45            break;
     46        case PS_TYPE_S32:
     47            printf("Key Value: %15d  ", metadataItem->data.S32);
     48            break;
     49        case PS_TYPE_F32:
     50            printf("Key Value: %15.3f  ", metadataItem->data.F32);
     51            break;
     52        case PS_TYPE_F64:
     53            printf("Key Value: %15.3f  ", metadataItem->data.F64);
     54            break;
     55        default:
     56            printf("Bad type: %d ", metadataItem->pType);
     57        }
    4458        break;
    4559    case PS_META_STR:
    46         printf("Key Value: %15s  ", (char*)item->data.V);
    47         break;
    48     case PS_META_IMG:
    49     case PS_META_JPEG:
    50     case PS_META_PNG:
    51     case PS_META_ASTROM:
    52     case PS_META_UNKNOWN:
    53         printf("Value: unknown ");
     60        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
    5461        break;
    5562    default:
    56         printf("Bad type: %d ", item->type);
    57     }
    58     printf("Key Comment: %s\n", item->comment);
     63        printf("Bad type: %d ", metadataItem->type);
     64    }
     65    printf("Key Comment: %s\n", metadataItem->comment);
    5966}
    6067
    … …  
    7683    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    7784    metadata = psMetadataAlloc();
    78     item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
    79     item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
    80     item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
    81     item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
    82     errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99);
     85    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
     86    item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
     87    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
     88    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
     89    errItem = psMetadataItemAlloc("errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 99);
    8390    printMetadataItem(item1);
    8491    printMetadataItem(item2);
    … …  
    9097    // Test B - Remove items from metadata by name
    9198    printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
    92     if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) {
     99    if(!psMetadataAddItem(metadata, item1, PS_LIST_HEAD)) {
    93100        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    94101        return 10;
    95102    }
    96     if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) {
     103    if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",77)) {
    97104        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    98105        return 11;
    99106    }
    100     if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) {
     107    if (!psMetadataRemove(metadata, 0, "myItem1")) {
    101108        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    102109        return 12;
    103110    }
    104     if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) {
     111    if (!psMetadataRemove(metadata, 0, "myItem2")) {
    105112        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    106113        return 13;
    … …  
    115122        return 14;
    116123    }
    117     if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) {
     124    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",88) ) {
    118125        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    119126        return 15;
    … …  
    160167
    161168
    162     // Test H - Attempt to add item to an invalid metadata structure
    163     printNegativeTestHeader(stdout,"psMetadata","Test H - Attempt to add item to metadata w/o hash table",
     169    // Test G - Attempt to add item to an invalid metadata structure
     170    printNegativeTestHeader(stdout,"psMetadata","Test G - Attempt to add item to metadata w/o hash table",
    164171                            "Couldn't add item to invalid metadata structure.",0);
    165172    errMetadata = psMetadataAlloc();
    … …  
    175182    }
    176183    errMetadata->table = mdTable;
    177     printFooter(stdout,"psMetadata","Test H - Attempt to add item to invalid metadata w/o hash table", true);
    178 
    179     // Test J - Attempt to add item to an invalid metadata structure
    180     printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o link list",
     184    printFooter(stdout,"psMetadata","Test G - Attempt to add item to invalid metadata w/o hash table", true);
     185
     186    // Test H - Attempt to add item to an invalid metadata structure
     187    printNegativeTestHeader(stdout,"psMetadata","Test H - Attempt to add item to metadata w/o link list",
    181188                            "Couldn't add item to invalid metadata structure.",0);
    182189    mdList = errMetadata->list;
    … …  
    191198    }
    192199    errMetadata->list = mdList;
    193     printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o link list", true);
    194 
    195     // Test K - Attempt to add item with a null name
    196     printNegativeTestHeader(stdout,"psMetadata","Test K - Attempt to add item with null name",
     200    printFooter(stdout,"psMetadata","Test H - Attempt to add item to invalid metadata w/o link list", true);
     201
     202    // Test I - Attempt to add item with a null name
     203    printNegativeTestHeader(stdout,"psMetadata","Test I - Attempt to add item with null name",
    197204                            "Couldn't add item with null name.",0);
    198205    errName = errItem->name;
    … …  
    203210    }
    204211    errItem->name = errName;
    205     printFooter(stdout,"psMetadata","Test K - Attempt to add item with null name", true);
    206 
    207     // Test L - Attempt to add item to an invalid metadata structure
    208     printNegativeTestHeader(stdout,"psMetadata","Test L - Attempt to add item to metadata w/o hash table",
     212    printFooter(stdout,"psMetadata","Test I - Attempt to add item with null name", true);
     213
     214    // Test J - Attempt to add item to an invalid metadata structure
     215    printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o hash table",
    209216                            "Couldn't add item to invalid metadata structure.",0);
    210217    mdTable = errMetadata->table;
    211218    errMetadata->table = NULL;
    212     if ( psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32,"Integer",22) ) {
     219    if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "Integer",22) ) {
    213220        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    214221        return 24;
    215222    }
    216223    errMetadata->table = mdTable;
    217     printFooter(stdout,"psMetadata","Test L - Attempt to add item to invalid metadata w/o hash table", true);
    218 
    219     // Test G - Free psMetadata
    220     printPositiveTestHeader(stdout, "psMetadata", "Test G - Free psMetadata");
     224    printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o hash table", true);
     225
     226    // Test K - Free psMetadata
     227    printPositiveTestHeader(stdout, "psMetadata", "Test K - Free psMetadata");
    221228    psFree(metadata);
    222229    psFree(item1);
    … …  
    235242        printf("ERROR: Found %d bad memory blocks\n", nBad);
    236243    }
    237     printFooter(stdout, "psMetadata", "Test G - Free psMetadata", true);
     244    printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true);
    238245
    239246
Note: See TracChangeset for help on using the changeset viewer.