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/astronomy/tst_psMetadata_04.c

    r2392 r2607  
    1313*     Test G - Attempt to use null metadata
    1414*     Test H - Attempt to get non-existant metadata item
    15 *     Test I - Free psMetadata
    16 *     Test J - Attempt to look up with an invalid metadata object
     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
    1718*
    1819*  @author  Ross Harman, MHPCC
    1920*
    20 *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2004-11-22 20:54:50 $
     21*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     22*  @date  $Date: 2004-12-03 23:19:07 $
    2223*
    2324*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2930#include <string.h>
    3031
    31 static void printMetadataItem(psMetadataItem *item)
     32static void printMetadataItem(psMetadataItem *metadataItem)
    3233{
    33     printf("Key Name: %8s  ", item->name);
    34     printf("Key Type: %2d  ", item->type);
    35 
    36     switch (item->type ) {
    37     case PS_META_BOOL:
    38         printf("Key Value: %15d  ", item->data.B);
     34    printf("Key Name: %8s  ", metadataItem->name);
     35    printf("Key pType: %2d  ", metadataItem->pType);
     36    printf("Key mdType: %2d  ", metadataItem->type);
     37
     38    switch (metadataItem->type) {
     39    case PS_META_LIST:
     40        printf("Key Value: %17c", ' ');
    3941        break;
    40     case PS_META_S32:
    41         printf("Key Value: %15d  ", item->data.S32);
    42         break;
    43     case PS_META_F32:
    44         printf("Key Value: %15.3f  ", item->data.F32);
    45         break;
    46     case PS_META_F64:
    47         printf("Key Value: %15.3f  ", item->data.F64);
     42    case PS_META_PRIMITIVE:
     43        switch(metadataItem->pType) {
     44        case PS_TYPE_BOOL:
     45            printf("Key Value: %15d  ", metadataItem->data.B);
     46            break;
     47        case PS_TYPE_S32:
     48            printf("Key Value: %15d  ", metadataItem->data.S32);
     49            break;
     50        case PS_TYPE_F32:
     51            printf("Key Value: %15.3f  ", metadataItem->data.F32);
     52            break;
     53        case PS_TYPE_F64:
     54            printf("Key Value: %15.3f  ", metadataItem->data.F64);
     55            break;
     56        default:
     57            printf("Bad type: %d ", metadataItem->pType);
     58        }
    4859        break;
    4960    case PS_META_STR:
    50         printf("Key Value: %15s  ", (char*)item->data.V);
    51         break;
    52     case PS_META_IMG:
    53     case PS_META_JPEG:
    54     case PS_META_PNG:
    55     case PS_META_ASTROM:
    56     case PS_META_UNKNOWN:
    57         printf("Value: unknown ");
     61        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
    5862        break;
    5963    default:
    60         printf("Bad type: %d ", item->type);
    61     }
    62     printf("Key Comment: %s\n", item->comment);
     64        printf("Bad type: %d ", metadataItem->type);
     65    }
     66    printf("Key Comment: %s\n", metadataItem->comment);
    6367}
    6468
    … …  
    7579    psList* tmpList = NULL;
    7680
     81
    7782    // Test A - Allocate metadata and items
    7883    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    7984    metadata = psMetadataAlloc();
    80     item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
    81     item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
    82     item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
    83     item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     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);
    8489    printMetadataItem(item1);
    8590    printMetadataItem(item2);
    … …  
    165170    printFooter(stdout, "psMetadata", "Test H - Attempt to get non-existant metadata item", true);
    166171
    167     // Test J - Attempt to look up with an invalid metadata object
    168     printNegativeTestHeader(stdout,"psMetadata","Test J - Attemp to look up with an invalid metadata",
     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",
    169174                            "Lookup item with invalid metadata object.", 0 );
    170175    tmpTable = metadata->table;
    … …  
    175180    }
    176181    metadata->table = tmpTable;
    177     printFooter(stdout, "psMetadata","Test J - Attempt to lookup an invalid metadata object.",true);
    178 
    179     // Test K - Attempt get item  with an invalid metadata object
    180     printNegativeTestHeader(stdout,"psMetadata","Test K - Attemp to get item with an invalid metadata",
     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",
    181186                            "Get item with invalid metadata object.", 0 );
    182187    tmpList = metadata->list;
    … …  
    187192    }
    188193    metadata->list = tmpList;
    189     printFooter(stdout, "psMetadata","Test K - Attempt to get item with  invalid metadata object.",true);
    190 
    191     // Test I - Free psMetadata
    192     printPositiveTestHeader(stdout, "psMetadata", "Test I - Free psMetadata");
     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");
    193198    psFree(metadata);
    194199    psFree(item1);
    … …  
    206211        return 21;
    207212    }
    208     printFooter(stdout, "psMetadata", "Test I - Free psMetadata", true);
     213    printFooter(stdout, "psMetadata", "Test K - Free psMetadata", true);
    209214
    210215
Note: See TracChangeset for help on using the changeset viewer.