IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2039


Ignore:
Timestamp:
Oct 8, 2004, 5:05:20 PM (22 years ago)
Author:
evanalst
Message:

Add addtional test cases for psMetadataSetIterator, psMetadataGetNext,
psMetadataGetPrevious, and psMetadataItemPrint.

Location:
trunk/psLib/test
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2014 r2039  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2004-10-08 00:48:01 $
     24*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2004-10-09 03:05:20 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171{
    7272    long data;
     73    psF32 fpdata;
    7374    psMetadataItem *item1 = NULL;
    7475    psMetadataItem *item2 = NULL;
    7576    psMetadataItem *item3 = NULL;
    7677    psMetadataItem *item4 = NULL;
     78    psMetadataItem *item5 = NULL;
     79    psMetadataItem *item6 = NULL;
     80    psMetadataItem *item7 = NULL;
     81    psMetadataItem *item8 = NULL;
    7782    psMetadataItem *item = NULL;
    7883    psMetadata *metadata = NULL;
    7984    FILE *fd = NULL;
    80 
     85    char str[7];
    8186
    8287    // Test A - Allocate metadata and items
    … …  
    8792    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
    8893    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     94    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
     95    item6 = psMetadataItemAlloc("myItem6", PS_META_F64, "I am a double", 6.28);
     96    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
     97    item8 = psMetadataItemAlloc("myItem8", PS_META_UNKNOWN, "I am unknown");
    8998    printMetadataItem(item1);
    9099    printMetadataItem(item2);
    … …  
    143152        printf("ERROR: Couldn't open file for writing\n");
    144153    }
    145     psMetadataItemPrint(fd, "%ld", item2);
     154    psMetadataItemPrint(fd, "S32  = %ld\n", item2);
     155    psMetadataItemPrint(fd, "BOL  = %ld\n", item3);
     156    psMetadataItemPrint(fd, "F32  = %g\n", item5);
     157    psMetadataItemPrint(fd, "F64  = %g\n", item6);
     158    psMetadataItemPrint(fd, "STR  = %s\n", item7);
     159    psMetadataItemPrint(fd, "UNK  = \n", item8);
    146160    printFooter(stdout, "psMetadata", "Test F - Write metadata item to file", true);
    147161    fclose(fd);
    … …  
    150164        printf("ERROR: Couldn't open file for reading\n");
    151165    }
    152     fscanf(fd, "%ld", &data);
    153     fclose(fd);
     166    fscanf(fd, "S32 = %ld\n", &data);
    154167    if(data != 55) {
    155168        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 55.\n", data);
    156169    }
    157 
     170    fscanf(fd, "BOL = %ld\n", &data);
     171    if(data != 0) {
     172        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 0.\n", data);
     173    }
     174    fscanf(fd, "F32 = %g\n", &fpdata);
     175    if ( (fpdata <= 3.1) || (fpdata >= 3.2) ) {
     176        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 3.14.\n", fpdata);
     177    }
     178    fscanf(fd, "F64 = %g\n", &fpdata);
     179    if ( (fpdata <= 6.2) || ( fpdata >= 6.3) ) {
     180        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 6.28.\n", fpdata);
     181    }
     182    fscanf(fd, "STR = %s\n", str);
     183    if ( strcmp(str,"GNIRTS") != 0 ) {
     184        printf("ERROR: Data is file is not as expected. Value: %s. Should be: GNIRTS.\n", str);
     185    }
     186    fclose(fd);
    158187
    159188    // Test G - Attempt to use null metadata with setIterator
    … …  
    206235    psFree(item3);
    207236    psFree(item4);
     237    psFree(item5);
     238    psFree(item6);
     239    psFree(item7);
     240    psFree(item8);
    208241    psMemCheckLeaks(0, NULL, stdout);
    209242    psMemCheckCorruption(0);

  • trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr

    r1761 r2039  
     1<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
     2    Invalid psMetadataType: 11
     3<DATE><TIME>|<HOST>|E|psMetadataItemPrint
     4     Invalid psMetadataType to print: 11
    15<DATE><TIME>|<HOST>|E|psMetadataSetIterator
    26    Null metadata collection not allowed

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

    r2014 r2039  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2004-10-08 00:48:01 $
     24*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2004-10-09 03:05:20 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171{
    7272    long data;
     73    psF32 fpdata;
    7374    psMetadataItem *item1 = NULL;
    7475    psMetadataItem *item2 = NULL;
    7576    psMetadataItem *item3 = NULL;
    7677    psMetadataItem *item4 = NULL;
     78    psMetadataItem *item5 = NULL;
     79    psMetadataItem *item6 = NULL;
     80    psMetadataItem *item7 = NULL;
     81    psMetadataItem *item8 = NULL;
    7782    psMetadataItem *item = NULL;
    7883    psMetadata *metadata = NULL;
    7984    FILE *fd = NULL;
    80 
     85    char str[7];
    8186
    8287    // Test A - Allocate metadata and items
    … …  
    8792    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
    8893    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     94    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
     95    item6 = psMetadataItemAlloc("myItem6", PS_META_F64, "I am a double", 6.28);
     96    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
     97    item8 = psMetadataItemAlloc("myItem8", PS_META_UNKNOWN, "I am unknown");
    8998    printMetadataItem(item1);
    9099    printMetadataItem(item2);
    … …  
    143152        printf("ERROR: Couldn't open file for writing\n");
    144153    }
    145     psMetadataItemPrint(fd, "%ld", item2);
     154    psMetadataItemPrint(fd, "S32  = %ld\n", item2);
     155    psMetadataItemPrint(fd, "BOL  = %ld\n", item3);
     156    psMetadataItemPrint(fd, "F32  = %g\n", item5);
     157    psMetadataItemPrint(fd, "F64  = %g\n", item6);
     158    psMetadataItemPrint(fd, "STR  = %s\n", item7);
     159    psMetadataItemPrint(fd, "UNK  = \n", item8);
    146160    printFooter(stdout, "psMetadata", "Test F - Write metadata item to file", true);
    147161    fclose(fd);
    … …  
    150164        printf("ERROR: Couldn't open file for reading\n");
    151165    }
    152     fscanf(fd, "%ld", &data);
    153     fclose(fd);
     166    fscanf(fd, "S32 = %ld\n", &data);
    154167    if(data != 55) {
    155168        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 55.\n", data);
    156169    }
    157 
     170    fscanf(fd, "BOL = %ld\n", &data);
     171    if(data != 0) {
     172        printf("ERROR: Data in file is not as expected. Value: %ld. Should be: 0.\n", data);
     173    }
     174    fscanf(fd, "F32 = %g\n", &fpdata);
     175    if ( (fpdata <= 3.1) || (fpdata >= 3.2) ) {
     176        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 3.14.\n", fpdata);
     177    }
     178    fscanf(fd, "F64 = %g\n", &fpdata);
     179    if ( (fpdata <= 6.2) || ( fpdata >= 6.3) ) {
     180        printf("ERROR: Data in file is not as expected. Value: %g. Should be: 6.28.\n", fpdata);
     181    }
     182    fscanf(fd, "STR = %s\n", str);
     183    if ( strcmp(str,"GNIRTS") != 0 ) {
     184        printf("ERROR: Data is file is not as expected. Value: %s. Should be: GNIRTS.\n", str);
     185    }
     186    fclose(fd);
    158187
    159188    // Test G - Attempt to use null metadata with setIterator
    … …  
    206235    psFree(item3);
    207236    psFree(item4);
     237    psFree(item5);
     238    psFree(item6);
     239    psFree(item7);
     240    psFree(item8);
    208241    psMemCheckLeaks(0, NULL, stdout);
    209242    psMemCheckCorruption(0);
Note: See TracChangeset for help on using the changeset viewer.