IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 3, 2004, 3:05:00 PM (22 years ago)
Author:
desonia
Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

Location:
trunk/psLib/test/astronomy
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r2204 r2273  
    1717*  @author  Ross Harman, MHPCC
    1818*
    19 *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
    20 *  @date  $Date: 2004-10-27 00:57:33 $
     19*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
     20*  @date  $Date: 2004-11-04 01:05:00 $
    2121*
    2222*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    227227    metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
    228228    if (metadata1 != NULL ) {
    229         psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
     229        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null when invalid ext given.");
    230230        return 10;
    231231    }
    … …  
    238238    metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
    239239    if (metadata1 != NULL ) {
    240         psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
     240        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null invalid extname give.");
    241241        return 11;
    242242    }
    … …  
    249249    metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
    250250    if (metadata1 != NULL ) {
    251         psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
     251        psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
    252252        return 12;
    253253    }

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

    r2204 r2273  
    1414*  @author  Ross Harman, MHPCC
    1515*
    16 *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2004-10-27 00:57:33 $
     16*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
     17*  @date  $Date: 2004-11-04 01:05:00 $
    1818*
    1919*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9292    badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD");
    9393    if (badItem != NULL) {
    94         psError(__func__,"psMetadataItemAlloc did not return null with null name item.");
     94        psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item.");
    9595        return 10;
    9696    }

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

    r2204 r2273  
    1414*  @author  Ross Harman, MHPCC
    1515*
    16 *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2004-10-27 00:57:33 $
     16*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     17*  @date  $Date: 2004-11-04 01:05:00 $
    1818*
    1919*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9191    printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
    9292    if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) {
    93         psError(__func__,"psMetadataAddItem did not return true when adding by name.");
     93        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    9494        return 10;
    9595    }
    9696    if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) {
    97         psError(__func__,"psMetadataAddItem did not return true when adding by name.");
     97        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    9898        return 11;
    9999    }
    100100    if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) {
    101         psError(__func__,"psMetadataRemove did not return true when removing by name.");
     101        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    102102        return 12;
    103103    }
    104104    if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) {
    105         psError(__func__,"psMetadataRemove did not return true when removing by name.");
     105        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    106106        return 13;
    107107    }
    … …  
    112112    printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index");
    113113    if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) {
    114         psError(__func__,"psMetadataAddItem did not return true when adding by index.");
     114        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    115115        return 14;
    116116    }
    117117    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) {
    118         psError(__func__,"psMetadataAddItem did not return true when adding by index.");
     118        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    119119        return 15;
    120120    }
    121121    if( ! psMetadataRemove(metadata, 0, NULL) ) {
    122         psError(__func__,"psMetadataRemove did not return true when removing by index.");
     122        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
    123123        return 16;
    124124    }
    125125    if ( ! psMetadataRemove(metadata, 0, NULL ) ) {
    126         psError(__func__,"psMetadataRemove did not return true when removing by index.");
     126        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
    127127        return 17;
    128128    }
    … …  
    134134                            "Null metadata collection not allowed", 0);
    135135    if ( psMetadataRemove(NULL, 0, NULL) ) {
    136         psError(__func__,"psMetadataRemove did not return false when removing from null metadata.");
     136        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing from null metadata.");
    137137        return 18;
    138138    }
    … …  
    144144                            "Couldn't find metadata item. Name: AARGH", 0);
    145145    if( psMetadataRemove(metadata, 0, "AARGH") ) {
    146         psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
     146        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
    147147        return 19;
    148148    }
    … …  
    154154                            "Couldn't find metadata item in list. Index: 22", 0);
    155155    if( psMetadataRemove(metadata, 22, NULL) ) {
    156         psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
     156        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
    157157        return 20;
    158158    }
    … …  
    167167    errMetadata->table = NULL;
    168168    if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
    169         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
     169        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    170170        return 21;
    171171    }
    172172    if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
    173         psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
     173        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
    174174        return 31;
    175175    }
    … …  
    183183    errMetadata->list = NULL;
    184184    if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
    185         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
     185        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
    186186        return 22;
    187187    }
    188188    if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
    189         psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
     189        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
    190190        return 32;
    191191    }
    … …  
    199199    errItem->name = NULL;
    200200    if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) {
    201         psError(__func__,"psMetadataAddItem did not return false with item with null name.");
     201        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false with item with null name.");
    202202        return 23;
    203203    }
    … …  
    211211    errMetadata->table = NULL;
    212212    if ( psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32,"Integer",22) ) {
    213         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
     213        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    214214        return 24;
    215215    }
    … …  
    227227    psFree(errMetadata);
    228228    if( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
    229         psError(__func__,"Memory leaks detected.");
     229        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
    230230        return 25;
    231231    }

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

    r2204 r2273  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2004-10-27 00:57:33 $
     20*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2004-11-04 01:05:00 $
    2222*
    2323*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    108108                            "Null metadata collection not allowed", 0);
    109109    if ( psMetadataLookup(NULL, "myItem2") != NULL ) {
    110         psError(__func__,"psMetadataLookup did not return NULL with null metadata.");
     110        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return NULL with null metadata.");
    111111        return 11;
    112112    }
    … …  
    118118                            "Null key name not allowed", 0);
    119119    if ( psMetadataLookup(metadata, NULL) != NULL ) {
    120         psError(__func__,"psMetadata did not return NULL with null key.");
     120        psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with null key.");
    121121        return 12;
    122122    }
    … …  
    128128                            "Couldn't find metadata item. Name: AARGH", 0);
    129129    if ( psMetadataLookup(metadata, "AARGH") != NULL ) {
    130         psError(__func__,"psMetadata did not return NULL with a non-existant item.");
     130        psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with a non-existant item.");
    131131        return 13;
    132132    }
    … …  
    150150    item = psMetadataGet(NULL, 0);
    151151    if ( item != NULL ) {
    152         psError(__func__,"psMetadataGet did not return NULL with null metadata structure.");
     152        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure.");
    153153        return 15;
    154154    }
    … …  
    160160                            "Couldn't find metadata item with given index. Index: 22", 0);
    161161    if ( psMetadataGet(metadata, 22) != NULL ) {
    162         psError(__func__,"psMetadataGet did not return NULL with non-existant metadata item.");
     162        psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item.");
    163163        return 16;
    164164    }
    … …  
    171171    metadata->table = NULL;
    172172    if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
    173         psError(__func__,"psMetadataLookup did not return null for invalid metadata object.");
     173        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
    174174        return 20;
    175175    }
    … …  
    183183    metadata->list = NULL;
    184184    if ( psMetadataGet(metadata,0) != NULL ) {
    185         psError(__func__,"psMetadataLookup did not return null for invalid metadata object.");
     185        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object.");
    186186        return 20;
    187187    }
    … …  
    197197    psFree(item4);
    198198    if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
    199         psError(__func__,"memory leaks detected.");
     199        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");
    200200        return 20;
    201201    }

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

    r2204 r2273  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2004-10-27 00:57:33 $
     24*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2004-11-04 01:05:00 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    145145    }
    146146    if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) {
    147         psError(__func__,"psMetadataGetPrevious did not return an item from metadata.");
     147        psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return an item from metadata.");
    148148        return 45;
    149149    }
    … …  
    151151    metadata->list = NULL;
    152152    if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) {
    153         psError(__func__,"psMetadataGetPrevious did not return null for invalid metadata.");
     153        psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return null for invalid metadata.");
    154154        return 50;
    155155    }
    … …  
    213213                            "Null metadata collection not allowed", 0);
    214214    if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) {
    215         psError(__func__,"psMetadataGetNext did not return null for null metadata.");
     215        psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for null metadata.");
    216216        return 40;
    217217    }
    … …  
    219219    metadata->list = NULL;
    220220    if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) {
    221         psError(__func__,"psMetadataGetNext did not return null for invalid metadata.");
     221        psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for invalid metadata.");
    222222        return 41;
    223223    }
    … …  
    267267    psFree(item8);
    268268    if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
    269         psError(__func__,"Memory leaks detected.");
     269        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
    270270        return 50;
    271271    }

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

    r2204 r2273  
    1313*  @author  Ross Harman, MHPCC
    1414*
    15 *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
    16 *  @date  $Date: 2004-10-27 00:57:33 $
     15*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
     16*  @date  $Date: 2004-11-04 01:05:00 $
    1717*
    1818*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8888    printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
    8989    if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) {
    90         psError(__func__,"psMetadataAddItem returned false for adding a node top.");
     90        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
    9191        return 20;
    9292    }
    9393    if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) {
    94         psError(__func__,"psMetadataAddItem returned false for adding a node top.");
     94        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
    9595        return 21;
    9696    }
    … …  
    102102    printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
    103103    if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) {
    104         psError(__func__,"psMetadataAddItem return false for adding a not to existing node.");
     104        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem return false for adding a not to existing node.");
    105105        return 22;
    106106    }
    … …  
    111111    printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
    112112    if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) {
    113         psError(__func__,"psMetadataAddItem returned false for adding a node to existing leaf node.");
     113        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node to existing leaf node.");
    114114        return 23;
    115115    }
    116116    if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) {
    117         psError(__func__,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
     117        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
    118118        return 24;
    119119    }
    … …  
    130130    psFree(metadata);
    131131    if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
    132         psError(__func__,"Memory leaks detected.");
     132        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
    133133        return 25;
    134134    }
Note: See TracChangeset for help on using the changeset viewer.