IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2986


Ignore:
Timestamp:
Jan 13, 2005, 1:34:56 PM (22 years ago)
Author:
evanalst
Message:

Update test to remove case for PS_META_UNKNOWN print.

Location:
trunk/psLib/test
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2981 r2986  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2005-01-13 21:45:13 $
     24*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2005-01-13 23:34:56 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8080    psMetadataItem *item6 = NULL;
    8181    psMetadataItem *item7 = NULL;
    82     psMetadataItem *item8 = NULL;
     82    //    psMetadataItem *item8 = NULL;
    8383    psMetadata *metadata = NULL;
    8484    FILE *fd = NULL;
    … …  
    9494    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_F64, PS_META_PRIMITIVE,"I am a double", 6.28);
    9595    item7 = psMetadataItemAlloc("myItem7", PS_TYPE_PTR, PS_META_STR, "I am a string", "GNIRTS");
    96     item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
     96    //    item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
    9797    printMetadataItem(item1);
    9898    printMetadataItem(item2);
    … …  
    190190        return 14;
    191191    }
    192     psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
    193     if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
    194         printf("ERROR: Return type should be false\n");
    195         fclose(fd);
    196         return 15;
    197     }
     192    //    psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
     193    //    if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
     194    //        printf("ERROR: Return type should be false\n");
     195    //        fclose(fd);
     196    //        return 15;
     197    //    }
    198198    fclose(fd);
    199199
    … …  
    310310    psFree(item6);
    311311    psFree(item7);
    312     psFree(item8);
     312    //    psFree(item8);
    313313    if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) {
    314314        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");

  • trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr

    r2981 r2986  
    1 <DATE><TIME>|<HOST>|I|main
    2     Attempt to print item of invalid type, should generate error message
    3 <DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
    4     Specified psMetadataType, 10, is not supported.
    51<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
    62    Unallowable operation: fd is NULL.

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

    r2981 r2986  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2005-01-13 21:45:13 $
     24*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2005-01-13 23:34:56 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8080    psMetadataItem *item6 = NULL;
    8181    psMetadataItem *item7 = NULL;
    82     psMetadataItem *item8 = NULL;
     82    //    psMetadataItem *item8 = NULL;
    8383    psMetadata *metadata = NULL;
    8484    FILE *fd = NULL;
    … …  
    9494    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_F64, PS_META_PRIMITIVE,"I am a double", 6.28);
    9595    item7 = psMetadataItemAlloc("myItem7", PS_TYPE_PTR, PS_META_STR, "I am a string", "GNIRTS");
    96     item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
     96    //    item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
    9797    printMetadataItem(item1);
    9898    printMetadataItem(item2);
    … …  
    190190        return 14;
    191191    }
    192     psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
    193     if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
    194         printf("ERROR: Return type should be false\n");
    195         fclose(fd);
    196         return 15;
    197     }
     192    //    psLogMsg(__func__,PS_LOG_INFO,"Attempt to print item of invalid type, should generate error message");
     193    //    if (psMetadataItemPrint(fd, "UNK = \n", item8) == true) {
     194    //        printf("ERROR: Return type should be false\n");
     195    //        fclose(fd);
     196    //        return 15;
     197    //    }
    198198    fclose(fd);
    199199
    … …  
    310310    psFree(item6);
    311311    psFree(item7);
    312     psFree(item8);
     312    //    psFree(item8);
    313313    if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) {
    314314        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
Note: See TracChangeset for help on using the changeset viewer.