IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4871


Ignore:
Timestamp:
Aug 24, 2005, 1:06:48 PM (21 years ago)
Author:
drobbin
Message:

wrote tests for psMetadataLookupMD, psMetadataLookupString

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

Legend:

Unmodified
Added
Removed

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

    r4590 r4871  
    1414*     Test H - Lookup metadata item and return psF64 value
    1515*     Test I - Lookup metadata item and return psVector pointer
    16 *     Test J - Attempt to use null metadata
    17 *     Test K - Attempt to get non-existant metadata item
    18 *     Test L - Attempt to look up with an invalid metadata object
    19 *     Test M - Attempt get item  with an invalid metadata object
    20 *     Test N - Attempt get value of non-existant metadata item
    21 *     Test O - Free psMetadata
     16*     Test J - Lookup metadata item and return psMetadata pointer
     17*     Test K - Lookup metadata item and return psString value
     18*     Test L - Attempt to use null metadata
     19*     Test M - Attempt to get non-existant metadata item
     20*     Test N - Attempt to look up with an invalid metadata object
     21*     Test O - Attempt get item  with an invalid metadata object
     22*     Test P - Attempt get value of non-existant metadata item
     23*     Test Q - Free psMetadata
    2224*
    2325*  @author  Ross Harman, MHPCC
    2426*
    25 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
    26 *  @date  $Date: 2005-07-21 02:39:57 $
     27*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
     28*  @date  $Date: 2005-08-24 23:06:48 $
    2729*
    2830*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7476    psMetadataItem *item5 = NULL;
    7577    psMetadataItem *item6 = NULL;
     78    psMetadataItem *item7 = NULL;
     79    psMetadataItem *item8 = NULL;
    7680    psMetadataItem *item = NULL;
    7781    psMetadata *metadata = NULL;
     82    psMetadata *newMD = NULL;
     83    char string[50];
    7884    psHash* tmpTable = NULL;
    7985    psList* tmpList = NULL;
    … …  
    8490    psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
    8591    metadata = psMetadataAlloc();
     92    newMD = psMetadataAlloc();
     93    strncpy(string, "String was here", 50);
     94    psMetadataAddF64(newMD, PS_LIST_HEAD, "yourItem1", "I am a psF64", 4.14);
    8695    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
    8796    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
    … …  
    9099    item5 = psMetadataItemAlloc("myItem5", PS_META_F64, "I am a double", 3.14);
    91100    item6 = psMetadataItemAlloc("myItem6", PS_META_VEC, "I am a vector", vec);
     101    item7 = psMetadataItemAlloc("myItem7", PS_META_META, "I am a metadata", newMD);
     102    item8 = psMetadataItemAlloc("myItem8", PS_META_STR, "I am a string", string);
    92103    printMetadataItem(item1);
    93104    printMetadataItem(item2);
    … …  
    101112    psMetadataAddItem(metadata, item5, PS_LIST_HEAD, PS_META_DEFAULT);
    102113    psMetadataAddItem(metadata, item6, PS_LIST_HEAD, PS_META_DEFAULT);
     114    psMetadataAddItem(metadata, item7, PS_LIST_HEAD, PS_META_DEFAULT);
     115    psMetadataAddItem(metadata, item8, PS_LIST_HEAD, PS_META_DEFAULT);
    103116    psMemDecrRefCounter(vec); // vs. psFree, which now would set vec to NULL (want to keep it to comparison later)
    104117    printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
    … …  
    195208    printFooter(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer", true);
    196209
    197 
    198     // Test J - Attempt to use null metadata
    199     printNegativeTestHeader(stdout,"psMetadata", "Test J - Attempt to use null metadata",
     210    // Test J - Lookup metadata item and return psMetadata pointer
     211    printPositiveTestHeader(stdout, "psMetadata", "Test J - Lookup metadata item and return psMetadata pointer");
     212    psMetadata *metaData = NULL;
     213    metaData = psMetadataLookupMD(&status, metadata, "myItem7");
     214    if(metaData != newMD) {
     215        printf("ERROR: Bad metadata pointer\n");
     216        return 25;
     217    } else if(! status) {
     218        printf("ERROR: Bad status, %d\n", status);
     219        return 25;
     220    }
     221    printFooter(stdout, "psMetadata", "Test J - Lookup metadata item and return psMetadata pointer", true);
     222
     223    // Test K - Lookup metadata item and return psString value
     224    printPositiveTestHeader(stdout, "psMetadata", "Test K - Lookup metadata item and return psString value");
     225    char *newSTR;
     226    newSTR = psMetadataLookupString(&status, metadata, "myItem8");
     227    if( strncmp(newSTR, string, 50) ) {
     228        printf("ERROR: Bad string value \n");
     229        return 26;
     230    } else if(! status) {
     231        printf("ERROR: Bad status, %d\n", status);
     232        return 26;
     233    }
     234    printFooter(stdout, "psMetadata", "Test K - Lookup metadata item and return psString value", true);
     235
     236    // Test L - Attempt to use null metadata
     237    printNegativeTestHeader(stdout,"psMetadata", "Test L - Attempt to use null metadata",
    200238                            "Null metadata collection not allowed", 0);
    201239    item = psMetadataGet(NULL, 0);
    … …  
    204242        return 18;
    205243    }
    206     printFooter(stdout, "psMetadata", "Test J - Attempt to use null metadata", true);
    207 
    208 
    209     // Test K - Attempt to get non-existant metadata item
    210     printNegativeTestHeader(stdout,"psMetadata", "Test K - Attempt to get non-existant metadata item",
     244    printFooter(stdout, "psMetadata", "Test L - Attempt to use null metadata", true);
     245
     246
     247    // Test M - Attempt to get non-existant metadata item
     248    printNegativeTestHeader(stdout,"psMetadata", "Test M - Attempt to get non-existant metadata item",
    211249                            "Couldn't find metadata item with given index. Index: 22", 0);
    212250    if ( psMetadataGet(metadata, 22) != NULL ) {
    … …  
    214252        return 19;
    215253    }
    216     printFooter(stdout, "psMetadata", "Test K - Attempt to get non-existant metadata item", true);
    217 
    218     // Test L - Attempt to look up with an invalid metadata object
    219     printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata",
     254    printFooter(stdout, "psMetadata", "Test M - Attempt to get non-existant metadata item", true);
     255
     256    // Test N - Attempt to look up with an invalid metadata object
     257    printNegativeTestHeader(stdout,"psMetadata","Test N - Attemp to look up with an invalid metadata",
    220258                            "Lookup item with invalid metadata object.", 0 );
    221259    tmpTable = metadata->hash;
    … …  
    226264    }
    227265    metadata->hash = tmpTable;
    228     printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true);
    229 
    230     // Test M - Attempt get item with an invalid metadata object
    231     printNegativeTestHeader(stdout,"psMetadata","Test M - Attempt to get item with an invalid metadata",
     266    printFooter(stdout, "psMetadata","Test N - Attempt to lookup an invalid metadata object.",true);
     267
     268    // Test O - Attempt get item with an invalid metadata object
     269    printNegativeTestHeader(stdout,"psMetadata","Test O - Attempt to get item with an invalid metadata",
    232270                            "Get item with invalid metadata object.", 0 );
    233271    tmpList = metadata->list;
    … …  
    238276    }
    239277    metadata->list = tmpList;
    240     printFooter(stdout, "psMetadata","Test M - Attempt to get item with  invalid metadata object",true);
    241 
    242     // Test N - Attempt get psS32 value of non-existant metadata item
    243     printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
     278    printFooter(stdout, "psMetadata","Test O - Attempt to get item with  invalid metadata object",true);
     279
     280    // Test P - Attempt get psS32 value of non-existant metadata item
     281    printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psS32 value of non-existant metadata item");
    244282    valueS32 = psMetadataLookupS32(&status, metadata, "myItem22");
    245283    if(status) {
    … …  
    247285        return 22;
    248286    }
    249     printFooter(stdout, "psMetadata","Test N - Attempt get psS32 value of non-existant metadata item",true);
    250 
    251     // Test O - Attempt get psF64 value of non-existant metadata item
    252     printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
     287    printFooter(stdout, "psMetadata","Test P - Attempt get psS32 value of non-existant metadata item",true);
     288
     289    // Test P - Attempt get psF64 value of non-existant metadata item
     290    printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psF64 value of non-existant metadata item");
    253291    valueF64 = psMetadataLookupF64(&status, metadata, "myItem22");
    254292    if(status) {
    … …  
    256294        return 23;
    257295    }
    258     printFooter(stdout, "psMetadata","Test O - Attempt get psF64 value of non-existant metadata item",true);
     296    printFooter(stdout, "psMetadata","Test P - Attempt get psF64 value of non-existant metadata item",true);
    259297
    260298    // Test P - Attempt get psVector value of non-existant metadata item
    … …  
    269307    // Test Q - Free psMetadata
    270308    printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata");
     309    //    psFree(newSTR);
     310    //    psFree(string);
     311    psFree(newMD);
    271312    psFree(metadata);
    272313    psFree(item1);
    … …  
    276317    psFree(item5);
    277318    psFree(item6);
     319    psFree(item7);
     320    psFree(item8);
    278321    if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
    279322        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");

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

    r4547 r4871  
    6262\**********************************************************************************/
    6363
    64 Found item named myItem6
     64Found item named myItem8
    6565
    6666---> TESTPOINT PASSED (psMetadata{Test F - Lookup metadata item by index} | tst_psMetadata_04.c)
    … …  
    9595/***************************** TESTPOINT ******************************************\
    9696*             TestFile: tst_psMetadata_04.c                                        *
    97 *            TestPoint: psMetadata{Test J - Attempt to use null metadata}          *
     97*            TestPoint: psMetadata{Test J - Lookup metadata item and return psMetadata pointer} *
     98*             TestType: Positive                                                   *
     99\**********************************************************************************/
     100
     101
     102---> TESTPOINT PASSED (psMetadata{Test J - Lookup metadata item and return psMetadata pointer} | tst_psMetadata_04.c)
     103
     104/***************************** TESTPOINT ******************************************\
     105*             TestFile: tst_psMetadata_04.c                                        *
     106*            TestPoint: psMetadata{Test K - Lookup metadata item and return psString value} *
     107*             TestType: Positive                                                   *
     108\**********************************************************************************/
     109
     110
     111---> TESTPOINT PASSED (psMetadata{Test K - Lookup metadata item and return psString value} | tst_psMetadata_04.c)
     112
     113/***************************** TESTPOINT ******************************************\
     114*             TestFile: tst_psMetadata_04.c                                        *
     115*            TestPoint: psMetadata{Test L - Attempt to use null metadata}          *
    98116*             TestType: Negative                                                   *
    99117*    ExpectedErrorText: Null metadata collection not allowed                       *
    … …  
    102120
    103121
    104 ---> TESTPOINT PASSED (psMetadata{Test J - Attempt to use null metadata} | tst_psMetadata_04.c)
     122---> TESTPOINT PASSED (psMetadata{Test L - Attempt to use null metadata} | tst_psMetadata_04.c)
    105123
    106124/***************************** TESTPOINT ******************************************\
    107125*             TestFile: tst_psMetadata_04.c                                        *
    108 *            TestPoint: psMetadata{Test K - Attempt to get non-existant metadata item} *
     126*            TestPoint: psMetadata{Test M - Attempt to get non-existant metadata item} *
    109127*             TestType: Negative                                                   *
    110128*    ExpectedErrorText: Couldn't find metadata item with given index. Index: 22    *
    … …  
    113131
    114132
    115 ---> TESTPOINT PASSED (psMetadata{Test K - Attempt to get non-existant metadata item} | tst_psMetadata_04.c)
     133---> TESTPOINT PASSED (psMetadata{Test M - Attempt to get non-existant metadata item} | tst_psMetadata_04.c)
    116134
    117135/***************************** TESTPOINT ******************************************\
    118136*             TestFile: tst_psMetadata_04.c                                        *
    119 *            TestPoint: psMetadata{Test L - Attemp to look up with an invalid metadata} *
     137*            TestPoint: psMetadata{Test N - Attemp to look up with an invalid metadata} *
    120138*             TestType: Negative                                                   *
    121139*    ExpectedErrorText: Lookup item with invalid metadata object.                  *
    … …  
    124142
    125143
    126 ---> TESTPOINT PASSED (psMetadata{Test L - Attempt to lookup an invalid metadata object.} | tst_psMetadata_04.c)
     144---> TESTPOINT PASSED (psMetadata{Test N - Attempt to lookup an invalid metadata object.} | tst_psMetadata_04.c)
    127145
    128146/***************************** TESTPOINT ******************************************\
    129147*             TestFile: tst_psMetadata_04.c                                        *
    130 *            TestPoint: psMetadata{Test M - Attempt to get item with an invalid metadata} *
     148*            TestPoint: psMetadata{Test O - Attempt to get item with an invalid metadata} *
    131149*             TestType: Negative                                                   *
    132150*    ExpectedErrorText: Get item with invalid metadata object.                     *
    … …  
    135153
    136154
    137 ---> TESTPOINT PASSED (psMetadata{Test M - Attempt to get item with  invalid metadata object} | tst_psMetadata_04.c)
     155---> TESTPOINT PASSED (psMetadata{Test O - Attempt to get item with  invalid metadata object} | tst_psMetadata_04.c)
    138156
    139157/***************************** TESTPOINT ******************************************\
    140158*             TestFile: tst_psMetadata_04.c                                        *
    141 *            TestPoint: psMetadata{Test N - Attempt get psS32 value of non-existant metadata item} *
     159*            TestPoint: psMetadata{Test P - Attempt get psS32 value of non-existant metadata item} *
    142160*             TestType: Positive                                                   *
    143161\**********************************************************************************/
    144162
    145163
    146 ---> TESTPOINT PASSED (psMetadata{Test N - Attempt get psS32 value of non-existant metadata item} | tst_psMetadata_04.c)
     164---> TESTPOINT PASSED (psMetadata{Test P - Attempt get psS32 value of non-existant metadata item} | tst_psMetadata_04.c)
    147165
    148166/***************************** TESTPOINT ******************************************\
    149167*             TestFile: tst_psMetadata_04.c                                        *
    150 *            TestPoint: psMetadata{Test O - Attempt get psF64 value of non-existant metadata item} *
     168*            TestPoint: psMetadata{Test P - Attempt get psF64 value of non-existant metadata item} *
    151169*             TestType: Positive                                                   *
    152170\**********************************************************************************/
    153171
    154172
    155 ---> TESTPOINT PASSED (psMetadata{Test O - Attempt get psF64 value of non-existant metadata item} | tst_psMetadata_04.c)
     173---> TESTPOINT PASSED (psMetadata{Test P - Attempt get psF64 value of non-existant metadata item} | tst_psMetadata_04.c)
    156174
    157175/***************************** TESTPOINT ******************************************\
Note: See TracChangeset for help on using the changeset viewer.