IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 28, 2005, 1:34:10 PM (21 years ago)
Author:
desonia
Message:

Changes to psMetadata to match latest SDRS.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r3264 r3341  
    1414*  @author  Ross Harman, MHPCC
    1515*
    16 *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2005-02-17 19:26:24 $
     16*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
     17*  @date  $Date: 2005-02-28 23:34:10 $
    1818*
    1919*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2828{
    2929    printf("Key Name: %8s  ", metadataItem->name);
    30     printf("Key pType: %2d  ", metadataItem->pType);
    3130    printf("Key mdType: %2d  ", metadataItem->type);
    3231
    … …  
    3534        printf("Key Value: %17c", ' ');
    3635        break;
    37     case PS_META_PRIMITIVE:
    38         switch(metadataItem->pType) {
    39         case PS_TYPE_BOOL:
    40             printf("Key Value: %15d  ", metadataItem->data.B);
    41             break;
    42         case PS_TYPE_S32:
    43             printf("Key Value: %15d  ", metadataItem->data.S32);
    44             break;
    45         case PS_TYPE_F32:
    46             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    47             break;
    48         case PS_TYPE_F64:
    49             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    50             break;
    51         default:
    52             printf("Bad type: %d ", metadataItem->pType);
    53         }
     36    case PS_META_BOOL:
     37        printf("Key Value: %15d  ", metadataItem->data.B);
     38        break;
     39    case PS_META_S32:
     40        printf("Key Value: %15d  ", metadataItem->data.S32);
     41        break;
     42    case PS_META_F32:
     43        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     44        break;
     45    case PS_META_F64:
     46        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    5447        break;
    5548    case PS_META_STR:
    … …  
    7669    // Test A - Allocate metadata items
    7770    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    78     item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    79     item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 111);
    80     item3 = psMetadataItemAlloc("myItem3", PS_TYPE_F32, PS_META_PRIMITIVE, "I am a single precision floating point", 222.222);
    81     item4 = psMetadataItemAlloc("myItem4", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double precision floating point", 333.333);
    82     item5 = psMetadataItemAlloc("myItem5", PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
     71    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     72    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 111);
     73    item3 = psMetadataItemAlloc("myItem3", PS_META_F32, "I am a single precision floating point", 222.222);
     74    item4 = psMetadataItemAlloc("myItem4", PS_META_F64, "I am a double precision floating point", 333.333);
     75    item5 = psMetadataItemAlloc("myItem5", PS_META_STR, "I am a string", "HELLO WORLD");
    8376    printMetadataItem(item1);
    8477    printMetadataItem(item2);
    … …  
    9386                            "Null value for name not allowed", 0);
    9487    psLogMsg(__func__,PS_LOG_INFO,"Following should produce error for null name.");
    95     badItem = psMetadataItemAlloc(NULL, PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
     88    badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD");
    9689    if (badItem != NULL) {
    9790        psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item.");
    … …  
    10497    printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type",
    10598                            "Invalid psMetadataType: 6", 0);
    106     badItem = psMetadataItemAlloc("badItem", PS_TYPE_PTR, PS_META_NTYPE, "I am bad", "Bad comment");
     99    badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment");
    107100    printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true);
    108101
Note: See TracChangeset for help on using the changeset viewer.