IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 16, 2005, 3:58:43 PM (21 years ago)
Author:
desonia
Message:

changed the prototype of psMetadataLookup_.

Location:
trunk/psLib/test/astronomy
Files:
10 added
7 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/astronomy/Makefile.am

    r3237 r3246  
    1313AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    1414AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
     15 
    1516
    1617check_PROGRAMS = tst_psTime_01 \
    … …  
    3031         tst_psAstrometry01
    3132
    32 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
     33check_DATA = test.config \
     34        psTime.config \
     35        test.psTime.config1 \
     36        test.psTime.config2 \
     37        test.psTime.config3 \
     38        test.psTime.config4 \
     39        header_1.fits \
     40        header_2.fits \
     41        test.ser7.dat
     42
     43TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
    3344 
    3445TESTS = tst_psTime_01 \
    … …  
    4859         tst_psAstrometry01
    4960
    50 tests: $(TESTS) test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
    51  
     61tests: $(check_DATA) $(TESTS)
     62        
    5263tst_psTime_01_SOURCES = tst_psTime_01.c
    5364tst_psTime_02_SOURCES = tst_psTime_02.c
    … …  
    6677tst_psAstrometry01_SOURCES = tst_psAstrometry01.c
    6778
    68 BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
    69 CLEANFILES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
     79EXTRA_DIST = data/test.psTime.config1.template \
     80        data/test.psTime.config2.template \
     81        data/test.psTime.config3.template \
     82        data/test.psTime.config4.template \
     83        data/header_1.fits \
     84        data/header_2.fits \
     85        data/test.config \
     86        data/test.ser7.dat \
     87        verified
    7088
    71 EXTRA_DIST = test.psTime.config1.template \
    72         test.psTime.config2.template \
    73         test.psTime.config3.template \
    74         test.psTime.config4.template \
    75         verified \
    76         test.ser7.dat \
    77         header_1.fits \
    78         header_2.fits \
    79         test.config
     89psTime.config: $(top_srcdir)/etc/pslib/psTime.config.template
     90        sed 's|PREFIX|$(top_srcdir)|' $? > $@
    8091
    81 test.psTime.config1: test.psTime.config1.template
    82         sed 's|PREFIX|$(prefix)|' $? > $@
     92test.psTime.config1: data/test.psTime.config1.template
     93        cp $? $@
    8394
    84 test.psTime.config2: test.psTime.config2.template
    85         sed 's|PREFIX|$(prefix)|' $? > $@
     95test.psTime.config2: data/test.psTime.config2.template
     96        sed 's|PREFIX|$(top_srcdir)|' $? > $@
    8697
    87 test.psTime.config3: test.psTime.config3.template
    88         sed 's|PREFIX|$(prefix)|' $? > $@
     98test.psTime.config3: data/test.psTime.config3.template
     99        sed 's|PREFIX|$(top_srcdir)|' $? > $@
    89100
    90 test.psTime.config4: test.psTime.config4.template
    91         sed 's|PREFIX|$(prefix)|' $? > $@
     101test.psTime.config4: data/test.psTime.config4.template
     102        sed 's|PREFIX|$(srcdir)|' $? > $@
    92103
     104test.config: data/test.config
     105        cp $? $@
     106
     107header_1.fits: data/header_1.fits
     108        cp $? $@
     109
     110header_2.fits: data/header_2.fits
     111        cp $? $@

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

    r3232 r3246  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-02-16 00:22:05 $
     7 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-02-17 01:58:43 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    129129{
    130130    char* name = "The Kaiser Royal Observatory";
     131
    131132    psObservatory* obs = psObservatoryAlloc(name,
    132133                                            20.7*M_PI/180.0, 156.3*M_PI/180.0, 3055.0, 9.0);

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

    r3115 r3246  
    2323*  @author  Ross Harman, MHPCC
    2424*
    25 *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
    26 *  @date  $Date: 2005-02-03 00:54:12 $
     25*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2005-02-17 01:58:43 $
    2727*
    2828*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    165165    printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value");
    166166    psS32 valueS32 = 0;
    167     valueS32 = psMetadataLookupS32(metadata, "myItem2", &status);
     167    valueS32 = psMetadataLookupS32(&status, metadata, "myItem2");
    168168    if(valueS32 != 55) {
    169169        printf("ERROR: Bad value, %d, Expected 55\n", valueS32);
    … …  
    178178    printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value");
    179179    psF64 valueF64 = 0.0;
    180     valueF64 = psMetadataLookupF64(metadata, "myItem5", &status);
     180    valueF64 = psMetadataLookupF64(&status, metadata, "myItem5");
    181181    if(fabs(valueF64-3.14) > FLT_EPSILON) {
    182182        printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64);
    … …  
    191191    printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer");
    192192    psVector *valueVec = NULL;
    193     valueVec = psMetadataLookupPtr(metadata, "myItem6", &status);
     193    valueVec = psMetadataLookupPtr(&status, metadata, "myItem6");
    194194    if(valueVec != vec) {
    195195        printf("ERROR: Bad vector pointer\n");
    … …  
    248248    // Test N - Attempt get psS32 value of non-existant metadata item
    249249    printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item");
    250     valueS32 = psMetadataLookupS32(metadata, "myItem22", &status);
     250    valueS32 = psMetadataLookupS32(&status, metadata, "myItem22");
    251251    if(status) {
    252252        printf("ERROR: Bad status, %d, \n", status);
    … …  
    257257    // Test O - Attempt get psF64 value of non-existant metadata item
    258258    printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item");
    259     valueF64 = psMetadataLookupF64(metadata, "myItem22", &status);
     259    valueF64 = psMetadataLookupF64(&status, metadata, "myItem22");
    260260    if(status) {
    261261        printf("ERROR: Bad status, %d, \n", status);
    … …  
    266266    // Test P - Attempt get psVector value of non-existant metadata item
    267267    printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item");
    268     valueVec = psMetadataLookupPtr(metadata, "myItem22", &status);
     268    valueVec = psMetadataLookupPtr(&status, metadata, "myItem22");
    269269    if(status) {
    270270        printf("ERROR: Bad status, %d, \n", status);

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

    r3115 r3246  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2005-02-03 00:54:12 $
     24*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2005-02-17 01:58:43 $
    2626*
    2727*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    161161    // Test F - Write metadata item to file
    162162    printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file");
    163     fd = fopen("./tst_psMetadata05_OUT", "w");
     163    fd = fopen("temp/tst_psMetadata05_OUT", "w");
    164164    if(fd == NULL) {
    165165        printf("ERROR: Couldn't open file for writing\n");
    … …  
    198198    fclose(fd);
    199199
    200     fd = fopen("./tst_psMetadata05_OUT", "r");
     200    fd = fopen("temp/tst_psMetadata05_OUT", "r");
    201201    if(fd == NULL) {
    202202        printf("ERROR: Couldn't open file for reading\n");

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

    r3115 r3246  
    2323 *  @author  Ross Harman, MHPCC
    2424 *
    25  *  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
    26  *  @date  $Date: 2005-02-03 00:54:12 $
     25 *  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
     26 *  @date  $Date: 2005-02-17 01:58:43 $
    2727 *
    2828 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838    psTime *testTime;
    3939    char *testString = "2004-07-21T18:22:24.272Z";
     40
     41    psLibInit(true,"psTime.config");
    4042
    4143    // Test time was taken at July 21, 2004 at 18:22:24.272044

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

    r2966 r3246  
    1919 *  @author  Ross Harman, MHPCC
    2020 *
    21  *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
    22  *  @date  $Date: 2005-01-13 01:58:10 $
     21 *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
     22 *  @date  $Date: 2005-02-17 01:58:43 $
    2323 *
    2424 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434psS32 main(psS32 argc, char* argv[])
    3535{
     36
     37    psLibInit(true,"psTime.config");
    3638
    3739    // Test A - Add two times

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

    r3220 r3246  
    1414 *  @author  Ross Harman, MHPCC
    1515 *
    16  *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    17  *  @date  $Date: 2005-02-15 03:02:53 $
     16 *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     17 *  @date  $Date: 2005-02-17 01:58:43 $
    1818 *
    1919 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030    // Test A - Initialize time
    3131    printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time");
    32     psLibInit(true, p_psGetConfigFileName());
     32    psLibInit(true, "psTime.config");
    3333    psLibFinalize();
    3434    printFooter(stdout, "psTime", "Test A - Initialize time", true);
    … …  
    4545    printNegativeTestHeader(stdout,"psTime", "Test C - Attempt to open non-existant time data files",
    4646                            "Failed to open file 'zzz'.  Check if it exists and it has the proper permissions.", 0);
    47     psLibInit(true, "./test.psTime.config1");
     47    psLibInit(true, "test.psTime.config1");
    4848    psLibFinalize();
    4949    printFooter(stdout, "psTime", "Test C - Attempt to open non-existant time data files", true);
    … …  
    5353    printNegativeTestHeader(stdout,"psTime", "Test D - Attempt to read incorrect number of files",
    5454                            "Incorrect number of table files entered. Found: 3. Expected: 4.", 0);
    55     psLibInit(true, "./test.psTime.config2");
     55    psLibInit(true, "test.psTime.config2");
    5656    psLibFinalize();
    5757    printFooter(stdout, "psTime", "Test D - Attempt to read incorrect number of files", true);
    … …  
    6161    printNegativeTestHeader(stdout,"psTime", "Test E - Attempt to read incorrect number of from values",
    6262                            "Incorrect vector size. Size: 3, Expected 4.", 0);
    63     psLibInit(true, "./test.psTime.config3");
     63    psLibInit(true, "test.psTime.config3");
    6464    psLibFinalize();
    6565    printFooter(stdout, "psTime", "Test E - Attempt to read incorrect number of from values", true);
    … …  
    6969    printNegativeTestHeader(stdout,"psTime", "Test F - Attempt to read data file with typo in number",
    7070                            "Unable to parse string, number on line 16.", 0);
    71     psLibInit(true, "./test.psTime.config4");
     71    psLibInit(true, "test.psTime.config4");
    7272    psLibFinalize();
    7373    printFooter(stdout, "psTime", "Test F - Attempt to read data file with typo in number", true);
Note: See TracChangeset for help on using the changeset viewer.