IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7223


Ignore:
Timestamp:
May 25, 2006, 1:58:57 PM (20 years ago)
Author:
drobbin
Message:

fixed some tests and reset verified output.

Location:
trunk/psLib/test/types
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/test/types/tst_psMetadataIO.c

    r6484 r7223  
    1313 *  @author  Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    16  *  @date  $Date: 2006-02-24 23:43:16 $
     15 *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
     16 *  @date  $Date: 2006-05-25 23:58:57 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    963963    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL failed lines arg");
    964964    metadata1 = psMetadataConfigParse(metadata1,NULL,testConfig2,true);
    965     if(metadata1 != NULL) {
    966         psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL failed lines argument");
     965    if(metadata1 == NULL) {
     966        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return for NULL failed lines argument");
    967967        return 4;
    968968    }
    969 
     969    psFree(metadata1);
    970970    // Attempt parse with NULL file name
    971971    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL file name arg");
  • trunk/psLib/test/types/verified/tst_psArguments.stdout

    r6187 r7223  
    77Optional arguments, with default values:
    88    -string    (SomeString)      Test String
     9    -float     (0.000000e+00)    Test Float
    910    -int       (1)               Int1
    1011               (2)               Int2
    11     -float     (0.000000e+00)    Test Float
    12 Updating -string
    1312    -string (Test String): new
    14     -int (Int1): 1
    15     -int (Int2): 2
    1613    -float (Test Float): 0.000000
     14    -int (Integers):
     15     int1 (Int1): 1
     16     int2 (Int2): 2
     17
  • trunk/psLib/test/types/verified/tst_psMetadataIO.stderr

    r6484 r7223  
    5858<DATE><TIME>|<HOST>|I|testMetadataParseConfig1
    5959    Following should generate an error message for NULL failed lines arg
    60 <DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
    61     Unallowable operation: nFail is NULL.
     60<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     61    Failed to parse the value 'X' of metadata item boolean, type BOOL, on line 2 of test2.config.
     62<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     63    Failed to read a metadata value on line 4 of test2.config.
     64<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     65    Failed to read a metadata value on line 7 of test2.config.
     66<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     67    Failed to parse the value 'x,y,z' of metadata item @vector1, type U8, on line 8 of test2.config.
     68<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     69    Failed to read a metadata type on line 9 of test2.config.
     70<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     71    Failed to read a metadata value on line 9 of test2.config.
     72<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     73    Failed to parse the value '' of metadata item @vector3, type F8, on line 10 of test2.config.
     74<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     75    Duplicate MULTI specifier on line 14 of test2.config.
     76<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     77    Metadata type 'CELL', found on line 17 of test2.config, is invalid.
     78<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     79    Failed to parse the value 'aabb' of metadata item value1, type F64, on line 20 of test2.config.
     80<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     81    Failed to parse the value 'ccdd' of metadata item value2, type S32, on line 21 of test2.config.
     82<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
     83    More than one '@' character not allowed.  Found on line 24 of test2.config.
     84<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
     85    Failed to read a metadata type on line 27 of test2.config.
     86<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
     87    Specified type, CELL, on line 31 of test2.config is already defined.
     88<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     89    Duplicate metadata item name is not allowed.  Use a psMetadataFlags option to allow such action.
     90<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
     91    Metadata type 'NEWCELL', found on line 37 of test2.config, is invalid.
     92<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
     93    Failed to read a metadata OURCELL on line 40 of test2.config.
     94<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
     95    Metadata type 'NEWCELL1', found on line 43 of test2.config, is invalid.
    6296<DATE><TIME>|<HOST>|I|testMetadataParseConfig1
    6397    Following should generate an error message for NULL file name arg
  • trunk/psLib/test/types/verified/tst_psMetadata_01.stdout

    r6986 r7223  
    1212
    1313Contents of metadata table:
    14  Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
    15  Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
    16  Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
    17  Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     14 Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment:
     15    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
     16 Key Name:   SIMPLE  Key mdType: 0x00010020  Key Value:                  Key Comment:
     17    Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
     18 Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment:
     19    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
     20 Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment:
     21    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    1822
    1923---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
     
    4044
    4145Contents of metadata table:
    42  Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
    43  Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
    44  Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
    45  Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
    46  Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment:
    47     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    48     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    49  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
     46 Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment:
     47    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
     48 Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment:
     49    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
     50 Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     51    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
     52 Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment:
     53    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
     54 Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     55    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
     56 Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment:
     57    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
     58    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    5059 Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment:
    5160    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     
    5362    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    5463    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    55  Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_1'  Key Comment:
     64 Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment:
     65    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_1'  Key Comment:
    5666
    5767---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
     
    7585
    7686Contents of metadata table:
    77  Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
    78  Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
    79  Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
    80  Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
    81  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
    82  Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
     87 Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment:
     88    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
     89 Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment:
     90    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
     91 Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     92    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
     93 Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment:
     94    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
     95 Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     96    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
     97 Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment:
     98    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    8399 Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment:
    84100    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    85101    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    86  Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment:
     102 Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment:
     103    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment:
    87104
    88105---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
     
    106123
    107124Contents of metadata table:
    108  Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
    109  Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
    110  Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
    111  Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
    112  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
    113  Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    114  Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment:
     125 Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment:
     126    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
     127 Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment:
     128    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
     129 Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     130    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
     131 Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment:
     132    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
     133 Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment:
     134    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
     135 Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment:
     136    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
     137 Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment:
     138    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment:
    115139
    116140---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c)
Note: See TracChangeset for help on using the changeset viewer.