IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2636


Ignore:
Timestamp:
Dec 6, 2004, 9:59:39 AM (22 years ago)
Author:
harman
Message:

Updated to SDRS 10

Location:
trunk/psLib/test
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r2607 r2636  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2004-12-03 23:19:07 $
     24*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2004-12-06 19:59:39 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    113113        }
    114114        printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
    115      
    116      
     115
     116
    117117        // Test C - Get next item at index
    118118        printPositiveTestHeader(stdout, "psMetadata", "Test C - Get next item at index");
    … …  
    124124        }
    125125        printFooter(stdout, "psMetadata", "Test C - Get next item at index", true);
    126      
    127      
     126
     127
    128128        // Test D - Get next item at index and string
    129129        printPositiveTestHeader(stdout, "psMetadata", "Test D - Get next item at index and string");
    … …  
    135135        }
    136136        printFooter(stdout, "psMetadata", "Test D - Get next item at index and string", true);
    137      
    138      
     137
     138
    139139        // Test E - Get previous item at index
    140140        printPositiveTestHeader(stdout, "psMetadata", "Test E - Get previous item at index");
    … …  
    157157        metadata->list = tmpList;
    158158        printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
    159      
     159
    160160    */
    161161    // Test F - Write metadata item to file
    … …  
    165165        printf("ERROR: Couldn't open file for writing\n");
    166166    }
    167     psMetadataItemPrint(fd, "S32 = %ld\n", item2);
    168     psMetadataItemPrint(fd, "BOL = %ld\n", item3);
    169     psMetadataItemPrint(fd, "F32 = %g\n", item5);
    170     psMetadataItemPrint(fd, "F64 = %g\n", item6);
    171     psMetadataItemPrint(fd, "STR = %s\n", item7);
    172     psMetadataItemPrint(fd, "UNK = \n", item8);
     167
     168    if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
     169        printf("ERROR: Return type should be trye\n");
     170        return 10;
     171    }
     172
     173    if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
     174        printf("ERROR: Return type should be trye\n");
     175        return 11;
     176    }
     177
     178    if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
     179        printf("ERROR: Return type should be trye\n");
     180        return 12;
     181    }
     182
     183    if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
     184        printf("ERROR: Return type should be trye\n");
     185        return 13;
     186    }
     187
     188    if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
     189        printf("ERROR: Return type should be trye\n");
     190        return 14;
     191    }
     192
     193    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
     194        printf("ERROR: Return type should be trye\n");
     195        return 15;
     196    }
    173197    fclose(fd);
     198
    174199    fd = fopen("./tst_psMetadata05_OUT", "r");
    175200    if(fd == NULL) {
    … …  
    226251        metadata->list = tmpList;
    227252        printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
    228      
    229      
     253
     254
    230255        // Test H - Attempt to use null metadata with getNext
    231256        printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
    … …  
    242267        }
    243268        metadata->list = tmpList;
    244      
     269
    245270        printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);
    246      
    247      
     271
     272
    248273        // Test I - Attempt to use null metadata with getPrevious
    249274        printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use null metadata with getPrevious",
    … …  
    251276        psMetadataGetPrevious(NULL, "myItem2", 0);
    252277        printFooter(stdout, "psMetadata", "Test I - Attempt to use null metadata with getPrevious", true);
    253      
     278
    254279    */
    255280    // Test J - Attempt to use null file with itemPrint

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

    r2607 r2636  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2004-12-03 23:19:07 $
     24*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2004-12-06 19:59:39 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    113113        }
    114114        printFooter(stdout, "psMetadata", "Test B - Set iterator at second index", true);
    115      
    116      
     115
     116
    117117        // Test C - Get next item at index
    118118        printPositiveTestHeader(stdout, "psMetadata", "Test C - Get next item at index");
    … …  
    124124        }
    125125        printFooter(stdout, "psMetadata", "Test C - Get next item at index", true);
    126      
    127      
     126
     127
    128128        // Test D - Get next item at index and string
    129129        printPositiveTestHeader(stdout, "psMetadata", "Test D - Get next item at index and string");
    … …  
    135135        }
    136136        printFooter(stdout, "psMetadata", "Test D - Get next item at index and string", true);
    137      
    138      
     137
     138
    139139        // Test E - Get previous item at index
    140140        printPositiveTestHeader(stdout, "psMetadata", "Test E - Get previous item at index");
    … …  
    157157        metadata->list = tmpList;
    158158        printFooter(stdout, "psMetadata", "Test E - Get previous item at index", true);
    159      
     159
    160160    */
    161161    // Test F - Write metadata item to file
    … …  
    165165        printf("ERROR: Couldn't open file for writing\n");
    166166    }
    167     psMetadataItemPrint(fd, "S32 = %ld\n", item2);
    168     psMetadataItemPrint(fd, "BOL = %ld\n", item3);
    169     psMetadataItemPrint(fd, "F32 = %g\n", item5);
    170     psMetadataItemPrint(fd, "F64 = %g\n", item6);
    171     psMetadataItemPrint(fd, "STR = %s\n", item7);
    172     psMetadataItemPrint(fd, "UNK = \n", item8);
     167
     168    if (psMetadataItemPrint(fd, "S32 = %ld\n", item2) == false) {
     169        printf("ERROR: Return type should be trye\n");
     170        return 10;
     171    }
     172
     173    if (psMetadataItemPrint(fd, "BOL = %ld\n", item3) == false) {
     174        printf("ERROR: Return type should be trye\n");
     175        return 11;
     176    }
     177
     178    if (psMetadataItemPrint(fd, "F32 = %g\n", item5) == false) {
     179        printf("ERROR: Return type should be trye\n");
     180        return 12;
     181    }
     182
     183    if (psMetadataItemPrint(fd, "F64 = %g\n", item6) == false) {
     184        printf("ERROR: Return type should be trye\n");
     185        return 13;
     186    }
     187
     188    if (psMetadataItemPrint(fd, "STR = %s\n", item7) == false) {
     189        printf("ERROR: Return type should be trye\n");
     190        return 14;
     191    }
     192
     193    if (psMetadataItemPrint(fd, "UNK = \n", item8) == false) {
     194        printf("ERROR: Return type should be trye\n");
     195        return 15;
     196    }
    173197    fclose(fd);
     198
    174199    fd = fopen("./tst_psMetadata05_OUT", "r");
    175200    if(fd == NULL) {
    … …  
    226251        metadata->list = tmpList;
    227252        printFooter(stdout, "psMetadata", "Test G - Attempt to use null metadata with setIterator", true);
    228      
    229      
     253
     254
    230255        // Test H - Attempt to use null metadata with getNext
    231256        printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use null metadata with getNext",
    … …  
    242267        }
    243268        metadata->list = tmpList;
    244      
     269
    245270        printFooter(stdout, "psMetadata", "Test H - Attempt to use null metadata with getNext", true);
    246      
    247      
     271
     272
    248273        // Test I - Attempt to use null metadata with getPrevious
    249274        printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use null metadata with getPrevious",
    … …  
    251276        psMetadataGetPrevious(NULL, "myItem2", 0);
    252277        printFooter(stdout, "psMetadata", "Test I - Attempt to use null metadata with getPrevious", true);
    253      
     278
    254279    */
    255280    // Test J - Attempt to use null file with itemPrint
Note: See TracChangeset for help on using the changeset viewer.