IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7377


Ignore:
Timestamp:
Jun 6, 2006, 3:39:17 PM (20 years ago)
Author:
drobbin
Message:

took psMetadataPrint test out of IO and put it into 01

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

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/types/tst_psMetadataIO.c

    r7223 r7377  
    1313 *  @author  Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
    16  *  @date  $Date: 2006-05-25 23:58:57 $
     15 *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
     16 *  @date  $Date: 2006-06-07 01:39:17 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929static psS32 testMetadataParseConfig3(void);
    3030static psS32 testMetadataParseConfig4(void);
    31 static psS32 testMetadataPrint(void);
    3231
    3332testDescription tests[] = {
    … …  
    3736                              {testMetadataParseConfig3,3,"psMetadataConfigParse3",0,false},
    3837                              {testMetadataParseConfig4,4,"psMetadataConfigParse4",0,false},
    39                               {testMetadataPrint,666,"psMetadataPrint",0,false},
    4038                              {NULL}
    4139                          };
    … …  
    5048static psBool checkItemType(psMetadataItem* mdItem, psS32 expectedType, char* configFile);
    5149static psBool checkItemComment(psMetadataItem* mdItem, char* expectedComment, char* configFile);
    52 static psMetadata *setupMeta(void);
    5350
    5451#define ERROR_TOL  0.0001
    … …  
    239236        0, 0, 0, 24
    240237    };
    241 
    242 static psMetadata *setupMeta(void)
    243 {
    244     psMetadata *md = NULL;
    245     md = psMetadataAlloc();
    246 
    247     psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true);
    248     psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55);
    249     psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14);
    250     psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28);
    251     psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS");
    252 
    253     return md;
    254 }
    255238
    256239static void writeMetadata(psMetadata* metadata, char* indentStr)
    … …  
    10371020}
    10381021
    1039 psS32 testMetadataPrint(void)
    1040 {
    1041     psMetadata *meta = NULL;
    1042     meta = setupMeta();
    1043     psMetadataPrint(meta, 0);
    1044     psFree(meta);
    1045     return 0;
    1046 }

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

    r7368 r7377  
    33*  @brief Test driver for psMetadata functions
    44*
    5 *  This test driver contains the following tests for psMetadata:
    6 *     Test A - Read 1st hdr from simple FITS file
    7 *     Test B - Read 2nd hdr from complex FITS file
    8 *     Test C - Read named hdr from complex FITS file
    9 *     Test D - Remove items with same name from all metadata
    10 *     Test E - Attempt to use null file descriptor
    11 *     Test F - Attempt to open nonexistant file
    12 *     Test G - Attempt to use two null inputs
    13 *     Test H - Attempt to use bad extNum
    14 *     Test I - Attempt to use bad extNameTest
    15 *     Test J - Read named hdr w/ invalid extnum
    16 *     Test K - Free psMetadata
     5*  @author  dRob, MHPCC
    176*
    18 *  @author  Ross Harman, MHPCC
    19 *
    20 *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2006-06-06 22:54:22 $
     7*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
     8*  @date  $Date: 2006-06-07 01:39:17 $
    229*
    2310*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3017
    3118static psS32 testMetadataItemCopy(void);
     19static psS32 testMetadataPrint(void);
    3220
    3321testDescription tests[] = {
    3422                              {testMetadataItemCopy, 666, "psMetadataItemCopy()", 0, false},
     23                              {testMetadataPrint,667,"psMetadataPrint",0,false},
    3524                              {NULL}
    3625                          };
    … …  
    4231    return ( !runTestSuite(stderr,"psMetadata_01",tests,argc,argv) );
    4332
     33}
     34
     35static psMetadata *setupMeta(void)
     36{
     37    psMetadata *md = NULL;
     38    md = psMetadataAlloc();
     39
     40    psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true);
     41    psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55);
     42    psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14);
     43    psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28);
     44    psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS");
     45
     46    return md;
    4447}
    4548
    … …  
    8083    psMetadataAddF32(metadata, PS_LIST_TAIL, "item02", 0, NULL, 3.14);
    8184    item = psMetadataItemAlloc("metaItem2", PS_DATA_METADATA, "newMeta", metadata);
    82     //    item->data.md = psMetadataCopy(item->data.md, metadata);
    8385    item2 = psMetadataItemCopy(item);
    8486    if (item2 == NULL || item2->data.md == NULL) {
    … …  
    108110}
    109111
     112psS32 testMetadataPrint(void)
     113{
     114    psMetadata *meta = NULL;
     115    meta = setupMeta();
     116    psMetadataPrint(meta, 0);
     117    psFree(meta);
     118    return 0;
     119}

  • trunk/psLib/test/types/verified/tst_psMetadataIO.stderr

    r7318 r7377  
    182182---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse4} | tst_psMetadataIO.c)
    183183
    184 /***************************** TESTPOINT ******************************************\
    185 *             TestFile: tst_psMetadataIO.c                                         *
    186 *            TestPoint: psMetadataConfigParse{psMetadataPrint}                     *
    187 *             TestType: Positive                                                   *
    188 \**********************************************************************************/
    189 
    190 
    191 ---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataPrint} | tst_psMetadataIO.c)
    192 

  • trunk/psLib/test/types/verified/tst_psMetadataIO.stdout

    r4870 r7377  
    221221    c                         STR                                          z
    222222END
    223 item1 (I am a boolean): True
    224 item2 (I am a integer): 55
    225 item3 (I am a float): 3.140000
    226 item4 (I am a double): 6.280000
    227 item5 (I am a string): GNIRTS

  • trunk/psLib/test/types/verified/tst_psMetadata_01.stderr

    r7368 r7377  
    1212---> TESTPOINT PASSED (psMetadata_01{psMetadataItemCopy()} | tst_psMetadata_01.c)
    1313
     14/***************************** TESTPOINT ******************************************\
     15*             TestFile: tst_psMetadata_01.c                                        *
     16*            TestPoint: psMetadata_01{psMetadataPrint}                             *
     17*             TestType: Positive                                                   *
     18\**********************************************************************************/
     19
     20
     21---> TESTPOINT PASSED (psMetadata_01{psMetadataPrint} | tst_psMetadata_01.c)
     22

  • trunk/psLib/test/types/verified/tst_psMetadata_01.stdout

    r7296 r7377  
     1item1 (I am a boolean): True
     2item2 (I am a integer): 55
     3item3 (I am a float): 3.140000
     4item4 (I am a double): 6.280000
     5item5 (I am a string): GNIRTS
Note: See TracChangeset for help on using the changeset viewer.