IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 24, 2005, 12:00:57 PM (21 years ago)
Author:
drobbin
Message:

Added functions psMetadataConfigFormat and psMetadataConfigWrite

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

Legend:

Unmodified
Added
Removed

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

    r4547 r4870  
    1313 *  @author  Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    16  *  @date  $Date: 2005-07-13 02:47:01 $
     15 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     16 *  @date  $Date: 2005-08-24 22:00:57 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929static psS32 testMetadataParseConfig3(void);
    3030static psS32 testMetadataParseConfig4(void);
     31static psS32 testMetadataPrint(void);
    3132
    3233testDescription tests[] = {
    … …  
    3637                              {testMetadataParseConfig3,000,"psMetadataConfigParse",0,false},
    3738                              {testMetadataParseConfig4,000,"psMetadataConfigParse",0,false},
     39                              {testMetadataPrint,000,"psMetadataPrint",0,false},
    3840                              {NULL}
    3941                          };
    … …  
    4850static psBool checkItemType(psMetadataItem* mdItem, psS32 expectedType, char* configFile);
    4951static psBool checkItemComment(psMetadataItem* mdItem, char* expectedComment, char* configFile);
     52static psMetadata *setupMeta(void);
    5053
    5154#define ERROR_TOL  0.0001
    … …  
    236239        0, 0, 0, 24
    237240    };
     241
     242static psMetadata *setupMeta(void)
     243{
     244    psMetadata *md = NULL;
     245    md = psMetadataAlloc();
     246
     247    psMetadataAddBool(md, PS_LIST_TAIL, "item1", "I am a boolean", true);
     248    psMetadataAddS32(md, PS_LIST_TAIL, "item2", "I am a integer", 55);
     249    psMetadataAddF32(md, PS_LIST_TAIL, "item3", "I am a float", 3.14);
     250    psMetadataAddF64(md, PS_LIST_TAIL, "item4", "I am a double", 6.28);
     251    psMetadataAddStr(md, PS_LIST_TAIL, "item5", "I am a string", "GNIRTS");
     252
     253    return md;
     254}
    238255
    239256static void writeMetadata(psMetadata* metadata, char* indentStr)
    … …  
    10201037}
    10211038
     1039psS32 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_07.c

    r4856 r4870  
    88*     Test C - Get and Increment a psMetadataIterator
    99*     Test D - Get and Decrement a psMetadataIterator
     10*     Test E - psMetadataConfigWrite (also tests psMetadataConfigFormat)
    1011*
    1112*  @author  David Robbins, MHPCC
    1213*
    13 *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
    14 *  @date  $Date: 2005-08-23 02:48:31 $
     14*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
     15*  @date  $Date: 2005-08-24 22:00:57 $
    1516*
    1617*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2021#include "pslib_strict.h"
    2122#include "psTest.h"
    22 #include "psMetadata.h"
     23//#include "psMetadata.h"
    2324
    24 static psS32 testMetaIter00(void);
     25static psS32 testMetaIter(void);
     26static psS32 testMetaWrite(void);
    2527
    2628testDescription tests[] = {
    27                               {testMetaIter00, 0, "Test psMetadataIterator fxns", 0, false},
     29                              {testMetaIter, 0, "Test psMetadataIterator fxns", 0, false},
     30                              {testMetaWrite, 0, "Test psMetadataConfigWrite", 0, false},
    2831                              {NULL}
    2932                          };
    … …  
    3437{
    3538    psMetadata *md = NULL;
     39    psVector *vec = NULL;
     40    psMetadata *newMD = NULL;
     41    int i = 0;
    3642    md = psMetadataAlloc();
    37 
     43    newMD = psMetadataAlloc();
     44    vec = psVectorAlloc(60, PS_DATA_S32);
     45    for (i = 0; i < 5; i++) {
     46        vec->data.S32[i] = i+1;
     47    }
    3848    psMetadataAddBool(md, PS_LIST_TAIL, "item1", "I am a boolean", true);
    3949    psMetadataAddS32(md, PS_LIST_TAIL, "item2", "I am a integer", 55);
    … …  
    4151    psMetadataAddF64(md, PS_LIST_TAIL, "item4", "I am a double", 6.28);
    4252    psMetadataAddStr(md, PS_LIST_TAIL, "item5", "I am a string", "GNIRTS");
     53    psMetadataAddVector(md, PS_LIST_TAIL, "vector6", "I am a vector", vec);
    4354
     55    psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", "I AM INT", 666);
     56    psMetadata *newestMD = NULL;
     57    newestMD = psMetadataAlloc();
     58    psMetadataAddVector(newestMD, PS_LIST_TAIL, "VECTORNEW", "Newest VECTOR", vec);
     59    psMetadataAddStr(newestMD, PS_LIST_TAIL, "cell", "I am a p-Star", "pStArRs");
     60    psMetadataAddMetadata(newMD, PS_LIST_TAIL, "META NEW", "I AM Newest METADATA", newestMD);
     61    psMetadataAddF32(newMD, PS_LIST_TAIL, "ITEM02", "I AM FLOAT", 666.6);
     62    psMetadataAddF64(newMD, PS_LIST_TAIL, "ITEM03", "I AM DOUBLE", 666.666);
     63
     64    psMetadataAddMetadata(md, PS_LIST_TAIL, "metadata7", "I am a metadata", newMD);
     65
     66    psFree(newestMD);
     67    psFree(vec);
     68    psFree(newMD);
    4469    return md;
    4570}
    … …  
    4772int main(int argc, char* argv[])
    4873{
    49 
    5074    psLogSetLevel( PS_LOG_INFO );
    51 
    5275    if( !runTestSuite(stderr,"psMetadata_07",tests,argc,argv)) {
    5376        return 1;
    5477    }
    55 
    56 
    57     // Test A - Read an XML config file
    58     //    printPositiveTestHeader(stdout, "psMetadata", "Test A - Read an XML config file");
    59     /*
    60         int res = 0;
    61         psU32 nFail = 0;
    62         psMetadata *md = NULL;
    63         md = psMetadataConfigParseXml(md, &nFail, XML_CONFIG_FILE, true);
    64         if (nFail != 0) {
    65             printf("psMetadataConfigParseXml returned error %d\n", res);
    66         }
    67 
    68         psFree(md);
    69     */
    70     //    printFooter(stdout, "psMetadata", "Test A - Read an XML config file", true);
    71     /*
    72         // Test B - Free data
    73         printPositiveTestHeader(stdout, "psMetadata", "Test B - Free data");
    74         psMemCheckLeaks(0, NULL, stdout, false);
    75         psS32 nBad = psMemCheckCorruption(0);
    76         if(nBad) {
    77             printf("ERROR: Found %d bad memory blocks\n", nBad);
    78         }
    79         printFooter(stdout, "psMetadata", "Test B - Free data", true);
    80     */
    8178    return 0;
    8279}
    8380
    8481//Set a psMetadataIterator //
    85 static psS32 testMetaIter00(void)
     82static psS32 testMetaIter(void)
    8683{
    8784    psMetadata *metadata = NULL;
    … …  
    116113    }
    117114    printFooter(stdout, "psMetadata", "Test D - Get and Decrement Iterator", true);
    118     //    psFree(item1);
    119     //    psFree(item2);
    120     //    psFree(item3);
    121115    psFree(iter);
    122116    psFree(metadata);
    123117    return 0;
    124118}
     119
     120static psS32 testMetaWrite(void)
     121{
     122    psMetadata *newMD = NULL;
     123    newMD = setupMeta();
     124    printPositiveTestHeader(stdout, "psMetadata", "Test E - psMetadataConfigWrite");
     125    if ( !psMetadataConfigWrite(newMD, "mdcfgwrt.out") ) {
     126        fprintf(stderr, "Failed test point E - Failed to write metadata to file. \n");
     127    }
     128
     129    printFooter(stdout, "psMetadata", "Test E - psMetadataConfigWrite", true);
     130    psFree(newMD);
     131    return 0;
     132}

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

    r4589 r4870  
    116116---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)
    117117
     118/***************************** TESTPOINT ******************************************\
     119*             TestFile: tst_psMetadataIO.c                                         *
     120*            TestPoint: psMetadataConfigParse{psMetadataPrint}                     *
     121*             TestType: Positive                                                   *
     122\**********************************************************************************/
     123
     124
     125---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataPrint} | tst_psMetadataIO.c)
     126

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

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

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

    r4856 r4870  
    3535---> TESTPOINT PASSED (psMetadata{Test D - Get and Decrement Iterator} | tst_psMetadata_07.c)
    3636
     37/***************************** TESTPOINT ******************************************\
     38*             TestFile: tst_psMetadata_07.c                                        *
     39*            TestPoint: psMetadata{Test E - psMetadataConfigWrite}                 *
     40*             TestType: Positive                                                   *
     41\**********************************************************************************/
     42
     43
     44---> TESTPOINT PASSED (psMetadata{Test E - psMetadataConfigWrite} | tst_psMetadata_07.c)
     45
Note: See TracChangeset for help on using the changeset viewer.