Changeset 3690

Timestamp:

Apr 8, 2005, 2:04:58 PM (21 years ago)

Author:

desonia

Message:

moved around some files and modified FullUnitTest to use runTest.

Location:

trunk/psLib

Files:

• src/astronomy/Makefile.am (modified) (2 diffs)
• src/collections/Makefile.am (modified) (3 diffs)
• src/dataIO/Makefile.am (modified) (2 diffs)
• src/fileUtils/Makefile.am (modified) (2 diffs)
• test/FullUnitTest (modified) (5 diffs)
• test/astronomy (modified) (1 prop)
• test/astronomy/.cvsignore (modified) (2 diffs)
• test/astronomy/Makefile.am (modified) (6 diffs)
• test/astronomy/data/header_1.fits (deleted)
• test/astronomy/data/header_2.fits (deleted)
• test/astronomy/data/test.config (deleted)
• test/astronomy/tst_psAstrometry01.c (modified) (3 diffs)
• test/astronomy/verified/tst_psDB.stderr (deleted)
• test/astronomy/verified/tst_psMetadataIO.stderr (deleted)
• test/astronomy/verified/tst_psMetadataIO.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_01.stderr (deleted)
• test/astronomy/verified/tst_psMetadata_01.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_02.stderr (deleted)
• test/astronomy/verified/tst_psMetadata_02.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_03.stderr (deleted)
• test/astronomy/verified/tst_psMetadata_03.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_04.stderr (deleted)
• test/astronomy/verified/tst_psMetadata_04.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_05.stderr (deleted)
• test/astronomy/verified/tst_psMetadata_05.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_06.stdout (deleted)
• test/astronomy/verified/tst_psMetadata_07.stdout (deleted)
• test/collections (modified) (1 prop)
• test/collections/.cvsignore (modified) (1 diff)
• test/collections/Makefile.am (modified) (4 diffs)
• test/collections/data (added)
• test/collections/data/header_1.fits (added)
• test/collections/data/header_2.fits (added)
• test/collections/data/test.config (added)
• test/collections/tst_psHash01.c (modified) (1 diff)
• test/collections/tst_psHash02.c (modified) (1 diff)
• test/collections/tst_psHash03.c (modified) (1 diff)
• test/collections/tst_psHash04.c (modified) (1 diff)
• test/collections/verified/tst_psMetadataIO.stderr (added)
• test/collections/verified/tst_psMetadataIO.stdout (added)
• test/collections/verified/tst_psMetadata_01.stderr (added)
• test/collections/verified/tst_psMetadata_01.stdout (added)
• test/collections/verified/tst_psMetadata_02.stderr (added)
• test/collections/verified/tst_psMetadata_02.stdout (added)
• test/collections/verified/tst_psMetadata_03.stderr (added)
• test/collections/verified/tst_psMetadata_03.stdout (added)
• test/collections/verified/tst_psMetadata_04.stderr (added)
• test/collections/verified/tst_psMetadata_04.stdout (added)
• test/collections/verified/tst_psMetadata_05.stderr (added)
• test/collections/verified/tst_psMetadata_05.stdout (added)
• test/collections/verified/tst_psMetadata_06.stdout (added)
• test/collections/verified/tst_psMetadata_07.stdout (added)
• test/dataIO (modified) (1 prop)
• test/dataIO/.cvsignore (modified) (1 diff)
• test/dataIO/Makefile.am (modified) (3 diffs)
• test/dataIO/verified/tst_psDB.stderr (added)
• test/fileUtils (modified) (1 prop)
• test/fileUtils/.cvsignore (modified) (1 diff)
• test/fileUtils/Makefile.am (modified) (3 diffs)
• test/fileUtils/verified/tst_psDB.stderr (added)
• test/runTest (modified) (16 diffs)

trunk/psLib/src/astronomy/Makefile.am

@@ -14 +14 @@
 libpslibastronomy_la_SOURCES = \
         psTime.c \
-        psMetadata.c \
-        psMetadataIO.c \
         psCoord.c \
         psAstrometry.c \
-        psDB.c \
         aoppa.f aopqk.f oapqk.f airmas.f eqeqx.f geoc.f refco.f aoppat.f \
         dranrm.f dcs2c.f refz.f refro.f dcc2s.f gmst.f atms.f atmt.f nutc.f drange.f
@@ -32 +29 @@
 pslibinclude_HEADERS = \
         psTime.h \
-        psMetadata.h \
-        psMetadataIO.h \
         psCoord.h \
         psAstrometry.h \
         psPhotometry.h \
-        psDB.h \
         slalib.h
 

trunk/psLib/src/collections/Makefile.am

@@ -1 +1 @@
 #Makefile for collections functions of psLib
 #
+
 INCLUDES = \
         -I$(top_srcdir)/src/astronomy \
@@ -18 +19 @@
         psCompare.c \
         psArray.c \
-        psHash.c
+        psHash.c \
+        psMetadata.c \
+        psMetadataIO.c
 
 BUILT_SOURCES = psCollectionsErrors.h
@@ -34 +37 @@
         psCompare.h \
         psArray.h \
-        psHash.h
+        psHash.h \
+        psMetadata.h \
+        psMetadataIO.h
 

trunk/psLib/src/dataIO/Makefile.am

@@ -13 +13 @@
 libpslibdataIO_la_SOURCES = \
         psLookupTable.c \
-        psFits.c
+        psFits.c \
+        psDB.c
+
 
 BUILT_SOURCES = psFileUtilsErrors.h
@@ -24 +26 @@
 pslibinclude_HEADERS = \
         psLookupTable.h \
-        psFits.h
+        psFits.h \
+        psDB.h
 

trunk/psLib/src/fileUtils/Makefile.am

@@ -13 +13 @@
 libpslibdataIO_la_SOURCES = \
         psLookupTable.c \
-        psFits.c
+        psFits.c \
+        psDB.c
+
 
 BUILT_SOURCES = psFileUtilsErrors.h
@@ -24 +26 @@
 pslibinclude_HEADERS = \
         psLookupTable.h \
-        psFits.h
+        psFits.h \
+        psDB.h
 

trunk/psLib/test/FullUnitTest

@@ -19 +19 @@
 #  RETURN : integer number of tests which failed
 #
-#  $Revision: 1.21 $  $Name: not supported by cvs2svn $
-#  $Date: 2005-03-31 23:37:09 $
+#  $Revision: 1.22 $  $Name: not supported by cvs2svn $
+#  $Date: 2005-04-09 00:04:57 $
 #
 #  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 #
 ##############################################################################
+
+use FindBin qw($Bin);
+
+$runTest = "$Bin/runTest";
 
 # Provide functions for determining the pathname of current working directory
@@ -311 +315 @@
             $totalTestDrivers++;
 
-            # Perform subdirectory checks only the first time a test
-            # file is found with the list of enteries
-            if ( $initialTest == 0 ) {
-                $initialTest++;
-
-                # Check for a temp subdirectory already exists and if not
-                # then create one
-                &checkForTempDirectory();
-
-                # Check for the presence of verified directory
-                if ( &checkForVerifiedDirectory() ) {
-
-    # Display message to user that verified directories do not
-    # exist eventhough TST files have been found
-    #                    print("Unable to execute test drivers in $base_dir\n");
-                    print("No verified subdirectory present.\n") if ($verbose);
-
-               # Increment test fail count
-               #                   $testDriverFailCount++;
-               # Save the file failed
-               #                    push(@testsFailed, $pwd . "/" . $files[$j]);
-               #                    return;
-                }
-            }
-
             # Display message to user of which test driver is being executed
             print("--- Executing test driver $files[$j]\n") if ( !$silent );
 
             # Execute the test driver
-            system(
-"./$files[$j] 1> temp/$files[$j].stdout 2> temp/$files[$j].stderr"
-            );
+            if ($silent) {
+                system("$runTest --quiet ./$files[$j]");
+            } elsif ($verbose) {
+                system("$runTest --printpassfail ./$files[$j]");
+            } else {
+                system("$runTest ./$files[$j]");
+            }
             $retVal = $?;
 
@@ -357 +340 @@
 
             # Check result of test driver
-            if (   ( ( $retVal != 0 ) && ( $files[$j] =~ /^TST/i ) )
-                || ( ( $retVal == 0 ) && ( $files[$j] =~ /^ATST/i ) ) )
+            if ( $retVal != 0 )
             {
 
@@ -372 +354 @@
                 push( @testsFailed, $pwd . "/" . $files[$j] );
             }
-            else {
-
-               # Create filter versions of STDOUT and STDERR to replace variable
-               # items such as date, time and host
-                &filterStdFiles( $files[$j] );
-
-                # Perform difference on STDOUT file collected
-                # with verified files
-                $exitValue = &compareStream("verified/$files[$j].stdout");
-                if ( $exitValue & 2 ) {
-
-                    # STDOUT verified doesn't exist. Search STDOUT capture
-                    # for strings indicating error or failure
-                    $exitValue |= &errorStrSearch("$files[$j].stdout");
-                }
-                if ( ( $exitValue & 8 ) || ( $exitValue & 64 ) ) {
-
-                    # Increment the total number of test failed
-                    $testDriverFailCount++;
-
-                    # Push test on failed list
-                    print(
-"Test failed ($failPoints out of $totalPoints testpoints failed)\n"
-                      )
-                      if ( !$silent );
-                    push( @testsFailed, $pwd . "/" . $files[$j] );
-                }
-                else {
-
-                    # Perform difference on STDERR file collection with verified
-                    $exitValue = &compareStream("verified/$files[$j].stderr");
-                    if ( $exitValue & 4 ) {
-
-                        # STDERR verified doesn't exist. Search STDERR capture
-                        # for strings indicating error or failure
-                        $exitValue |= &errorStrSearch("$files[$j].stderr");
-                    }
-                    if ( ( $exitValue & 16 ) || ( $exitValue & 128 ) ) {
-
-                        # Increment the total number of tests failed
-                        $testDriverFailCount++;
-
-                        # Push test on failed list
-                        print(
-"Test failed ($failPoints out of $totalPoints testpoints failed)\n"
-                          )
-                          if ( !$silent );
-                        push( @testsFailed, $pwd . "/" . $files[$j] );
-                    }
-                    else {
-                        print("Test successful ($totalPoints testpoints)\n")
-                          if ( !$silent );
-                    }
-                }
-            }
         }
         $j++;
@@ -432 +359 @@
 }
 
-################################################################################
-#
-#  SUBROUTINE: errorStrSearch
-#
-#      Description:  This subroutine will search the file specified in its
-#                    parameter for error strings and if they do exists
-#                    the appropriate value will be returned.
-#
-#      Parameter(s): fileName - input file to search for strings
-#
-#      Return:   0  -  No error strings found
-#               64  -  Error strings found in STDOUT
-#              128  -  Error strings found in STDERR
-#
-###############################################################################
-
-sub errorStrSearch {
-    local ($fileName)  = @_;
-    local ($returnVal) = 0;
-
-    # Open the captured file
-    open( CAPT_FILE, "<temp/$fileName" );
-
-    # Scan through all the lines of the file searching for error strings
-    while (<CAPT_FILE>) {
-        if (   m/FAIL/i
-            || m/FAULT/i
-            || m/ERROR/i
-            || m/Not Found/i
-            || m/SIGNAL/i
-            || m/NO SUCH FILE/i
-            || m/\|E\|/i
-            || m/\|A\|/i )
-        {
-            print;
-            if ( $fileName =~ m/out/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
-                $returnVal = 64;
-            }
-            elsif ( $fileName =~ m/err/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
-                $returnVal = 128;
-            }
-            last;
-        }
-    }
-
-    # Close the capture file
-    close(CAPT_FILE);
-
-    # Return the return value
-    return ($returnVal);
-}
-
-################################################################################
-#
-#  SUBROUTINE: compareStream
-#
-#      Description:  This subroutine will compare the captured stream file with
-#                    a file in the verified directory if one exists.
-#
-#      Parameter(s): streamFile - input file to compare
-#
-#      Return:   0  -  Compare successful
-#                2  -  STDOUT verified file doesn't exist
-#                4  -  STDERR verified file doesn't exist
-#                8  -  STDOUT verified file doesn't compare
-#               16  -  STDERR verified file doesn't compare
-#
-###############################################################################
-
-sub compareStream {
-    local ($streamFile) = @_;
-    local ($returnVal)  = 0;
-    local ($tempFile)   = "";
-
-    # Check for existence of verified STD stream files
-    if ( !( -e $streamFile ) ) {
-
-        # Display message to user that verified STDOUT file doesn't exist
-        print("        File $streamFile doesn't exist.\n") if ($verbose);
-
-        # Set exit value bit 1 to indicate proper failure
-        if ( $streamFile =~ /out$/ ) {
-            $returnVal |= 2;
-        }
-        elsif ( $streamFile =~ /err$/ ) {
-            $returnVal |= 4;
-        }
-    }
-    else {
-
-        # Verified STD stream file exists
-
-        # Create name of the temp file to compare
-        $tempFile = $streamFile;
-        $tempFile =~ s/verified/temp/;
-        $tempFile = $tempFile . ".mod";
-
-        # Perform difference on the STD stream files
-        $diffstdout = `diff $streamFile $tempFile`;
-
-        # Check the return value of the difference
-        if ( $? != 0 ) {
-
-            # Difference of STD stream files failed
-
-            # Check for STDOUT in file name to convey appropirate return value
-            if ( $streamFile =~ /out$/ ) {
-
-                # Display message of the failure of difference to user
-                print("        Failed - STDOUT difference\n$diffstdout\n");
-
-                # Exit value to indicate STDOUT did not compare
-                $returnVal |= 8;
-            }
-            elsif ( $streamFile =~ /err$/ ) {
-
-                # Display message of the failure of difference to user
-                print("        Failed - STDERR difference\n$diffstdout\n");
-
-                # Exit value to indicate STDERR did not compare
-                $returnVal |= 16;
-            }
-        }
-    }
-
-    # Return the result of the compare
-    return ($returnVal);
-}
-
-################################################################################
-#
-#  SUBROUTINE: checkForTempDirectory
-#
-#      Description:  This subroutine will check for the existence of a temp
-#                    directory to store STDOUT, STDERR files during test.  If
-#                    the subdirectory doesn't exist, it will be created.
-#
-#      Parameter(s):  None
-#
-#      Return: None
-#
-################################################################################
-
-sub checkForTempDirectory {
-
-    # Check if a temp directory already exists in the current work directory
-    if ( !( -e "temp" ) ) {
-
-        # Create temp directory to store STDOUT, STDERR files during test
-        `mkdir temp`;
-
-        # Display message of new directory created
-        print("Creating temp directory\n") if ($verbose);
-    }
-}
-
-################################################################################
-#
-#  SUBROUTINE: checkForVerifiedDirectory
-#
-#      Description:  This subroutine will check for the existence of a verified
-#                    directory which stores verified STDOUT, STDERR files for
-#                    comparison during the test.
-#
-#      Parameter(s):  None
-#
-#      Return: 0 - subdirectory present
-#              1 - subdirectory not present
-#
-################################################################################
-
-sub checkForVerifiedDirectory {
-    $returnValue = 0;
-
-    # Check if verified subdirectory exists in the current working directory
-    if ( !( -e "verified" ) ) {
-
-        # Set return value to 1
-        $returnValue = 1;
-    }
-    return ($returnValue);
-}
-
-################################################################################
-#
-#  SUBROUTINE: filterStdFiles
-#
-#      Description:  This subroutine will filter variable items in the STDOUT
-#                    and STDERR files captured.  Date, time and host names
-#                    are variable items in the log messages captured.
-#
-#      Parameter(s):  test file name
-#
-#      Return: None
-#
-################################################################################
-
-sub filterStdFiles {
-
-    local ($fileName) = @_;
-
-    # Open the STDOUT file for reading
-    open( OUTFILE, "< temp/$fileName.stdout" );
-
-    # Open mod file to place filtered STDOUT
-    open( MODFILE, "> temp/$fileName.stdout.mod" );
-
-    # Replace the variable data, time and host information with constants
-    $hostname = `hostname`;
-    chop $hostname;
-    while (<OUTFILE>) {
-        s/\s+\d+:\d+:\d+\w/<TIME>/g;
-        s/\d+:\d+:\d+/<DATE>/g;
-        s/$hostname\s*/<HOST>/g;
-        s/: Line \d+/: Line <LINENO>/g;
-        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-        s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
-        s/allocate \d+ bytes at/allocate <N> bytes at/g;
-        s/v\d+.\d+.\d+/vX.X.X/g;
-
-        # Filter lines with *** malloc.  This is an artifact of Mac testing of
-        # memory functions
-        if ( !m/\*\*\*\smalloc/ ) {
-            print MODFILE ($_);
-        }
-    }
-
-    # Close mod file
-    close(MODFILE);
-
-    # Close STDERR file
-    close(OUTFILE);
-
-    # Open the STDERR file for reading
-    open( OUTFILE, "< temp/$fileName.stderr" );
-
-    # Open mod file to place filtered STDERR
-    open( MODFILE, "> temp/$fileName.stderr.mod" );
-
-    # Replace the variable date, time and host information with constants
-    while (<OUTFILE>) {
-        s/\s+\d+:\d+:\d+\w/<TIME>/g;
-        s/\d+:\d+:\d+/<DATE>/g;
-        s/$hostname\s*/<HOST>/g;
-        s/: Line \d+/: Line <LINENO>/g;
-        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-        s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
-        s/allocate \d+ bytes at/allocate <N> bytes at/g;
-        s/v\d+.\d+.\d+/vX.X.X/g;
-
-        # Filter lines with *** malloc.  This is an artifact of Mac testing of
-        # memory functions
-        if ( !m/\*\*\*\smalloc/ ) {
-            print MODFILE ($_);
-        }
-    }
-
-    # Close mod file
-    close(MODFILE);
-
-    # Close STDERR file
-    close(OUTFILE);
-}
-

trunk/psLib/test/astronomy

@@ -7 +7 @@
 tst_psTime_01
 tst_psTime_02
-tst_psMetadata05_OUT
-tst_psMetadata_01
-tst_psMetadata_02
-tst_psMetadata_03
-tst_psMetadata_04
-tst_psMetadata_05
-tst_psMetadata_06
 tst_psAstrometry
 tst_psAstrometry01
 tst_psCoord
-tst_psMetadataIO
-tst_psMetadata_07
 tst_psTime_03
 tst_psTime_04
@@ -26 +17 @@
 .deps
 .libs
-header_1.fits
-header_2.fits
-test.config
 test.ser7.dat
 tst_psCoord01
-tst_psDB

@@ -7 +7 @@
 tst_psTime_01
 tst_psTime_02
-tst_psMetadata05_OUT
-tst_psMetadata_01
-tst_psMetadata_02
-tst_psMetadata_03
-tst_psMetadata_04
-tst_psMetadata_05
-tst_psMetadata_06
 tst_psAstrometry
 tst_psAstrometry01
 tst_psCoord
-tst_psMetadataIO
-tst_psMetadata_07
 tst_psTime_03
 tst_psTime_04
@@ -26 +17 @@
 .deps
 .libs
-header_1.fits
-header_2.fits
-test.config
 test.ser7.dat
 tst_psCoord01
-tst_psDB

trunk/psLib/test/astronomy/.cvsignore

@@ -7 +7 @@
 tst_psTime_01
 tst_psTime_02
-tst_psMetadata05_OUT
-tst_psMetadata_01
-tst_psMetadata_02
-tst_psMetadata_03
-tst_psMetadata_04
-tst_psMetadata_05
-tst_psMetadata_06
 tst_psAstrometry
 tst_psAstrometry01
 tst_psCoord
-tst_psMetadataIO
-tst_psMetadata_07
 tst_psTime_03
 tst_psTime_04
@@ -26 +17 @@
 .deps
 .libs
-header_1.fits
-header_2.fits
-test.config
 test.ser7.dat
 tst_psCoord01
-tst_psDB
 

trunk/psLib/test/astronomy/Makefile.am

@@ -12 +12 @@
 
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
-AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
 TESTS = tst_psTime_01 \
@@ -18 +17 @@
          tst_psTime_03 \
          tst_psTime_04 \
-         tst_psMetadataIO  \
-         tst_psMetadata_01 \
-         tst_psMetadata_02 \
-         tst_psMetadata_03 \
-         tst_psMetadata_04 \
-         tst_psMetadata_05 \
-         tst_psMetadata_06 \
-         tst_psMetadata_07 \
          tst_psCoord \
          tst_psCoord01 \
-         @TST_PSDB@ \
          tst_psAstrometry \
          tst_psAstrometry01
@@ -34 +24 @@
 check_PROGRAMS = $(TESTS)
 
-check_DATA = test.config \
-        psTime.config \
+check_DATA = psTime.config \
         test.psTime.config1 \
         test.psTime.config2 \
         test.psTime.config3 \
         test.psTime.config4 \
-        header_1.fits \
-        header_2.fits \
         test.ser7.dat
 
 TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
-
-EXTRA_PROGRAMS = tst_psDB
 
 tests: $(check_DATA) $(TESTS)
@@ -54 +39 @@
 tst_psTime_03_SOURCES = tst_psTime_03.c
 tst_psTime_04_SOURCES = tst_psTime_04.c
-tst_psDB_SOURCES = tst_psDB.c
-tst_psMetadataIO_SOURCES = tst_psMetadataIO.c
-tst_psMetadata_01_SOURCES = tst_psMetadata_01.c
-tst_psMetadata_02_SOURCES = tst_psMetadata_02.c
-tst_psMetadata_03_SOURCES = tst_psMetadata_03.c
-tst_psMetadata_04_SOURCES = tst_psMetadata_04.c
-tst_psMetadata_05_SOURCES = tst_psMetadata_05.c
-tst_psMetadata_06_SOURCES = tst_psMetadata_06.c
-tst_psMetadata_07_SOURCES = tst_psMetadata_07.c
 tst_psAstrometry_SOURCES = tst_psAstrometry.c
 tst_psCoord_SOURCES = tst_psCoord.c
@@ -72 +48 @@
         data/test.psTime.config3.template \
         data/test.psTime.config4.template \
-        data/header_1.fits \
-        data/header_2.fits \
-        data/test.config \
         data/test.ser7.dat \
         verified 
@@ -95 +68 @@
         cp $? $@
 
-test.config: data/test.config
-        cp $? $@
-
-header_1.fits: data/header_1.fits
-        cp $? $@
-
-header_2.fits: data/header_2.fits
-        cp $? $@
-
 test.ser7.dat: data/test.ser7.dat
         cp $? $@

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-09 00:04:57 $
 *
 * XXX: Must test
@@ -106 +106 @@
 {\
     NAME = (psPlaneTransform *) psAlloc(sizeof(psPlaneTransform)); \
-    p_psMemSetDeallocator(NAME, (psFreeFcn) psPlaneTransformFree); \
+    psMemSetDeallocator(NAME, (psFreeFcn) psPlaneTransformFree); \
     NAME->x = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \
     NAME->y = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \
@@ -116 +116 @@
 {\
     NAME = (psPlaneDistort *) psAlloc(sizeof(psPlaneDistort)); \
-    p_psMemSetDeallocator(NAME, (psFreeFcn) psPlaneDistortFree); \
+    psMemSetDeallocator(NAME, (psFreeFcn) psPlaneDistortFree); \
     NAME->x = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \
     NAME->y = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \

trunk/psLib/test/collections

@@ -37 +37 @@
 tst_psArray01
 tst_psScalar
+tst_psMetadata05_OUT
+tst_psMetadata_01
+tst_psMetadata_02
+tst_psMetadata_03
+tst_psMetadata_04
+tst_psMetadata_05
+tst_psMetadata_06
+tst_psMetadata_07
+tst_psMetadataIO
+header_1.fits
+header_2.fits
+test.config

@@ -37 +37 @@
 tst_psArray01
 tst_psScalar
+tst_psMetadata05_OUT
+tst_psMetadata_01
+tst_psMetadata_02
+tst_psMetadata_03
+tst_psMetadata_04
+tst_psMetadata_05
+tst_psMetadata_06
+tst_psMetadata_07
+tst_psMetadataIO
+header_1.fits
+header_2.fits
+test.config

trunk/psLib/test/collections/.cvsignore

@@ -37 +37 @@
 tst_psArray01
 tst_psScalar
+tst_psMetadata05_OUT
+tst_psMetadata_01
+tst_psMetadata_02
+tst_psMetadata_03
+tst_psMetadata_04
+tst_psMetadata_05
+tst_psMetadata_06
+tst_psMetadata_07
+tst_psMetadataIO
+header_1.fits
+header_2.fits
+test.config

trunk/psLib/test/collections/Makefile.am

@@ -1 +1 @@
 #Makefile for collections functions of psLib
 #
-EXTRA_DIST = verified
+EXTRA_DIST = verified \
+        data/header_1.fits \
+        data/header_2.fits \
+        data/test.config
 
 INCLUDES = \
@@ -14 +17 @@
 
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
+AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
 TESTS = \
@@ -30 +34 @@
          tst_psHash04          \
          tst_psHash05          \
-         tst_psScalar
+         tst_psScalar \
+         tst_psMetadataIO  \
+         tst_psMetadata_01 \
+         tst_psMetadata_02 \
+         tst_psMetadata_03 \
+         tst_psMetadata_04 \
+         tst_psMetadata_05 \
+         tst_psMetadata_06 \
+         tst_psMetadata_07
 
 check_PROGRAMS =$(TESTS)
 
-check_DATA =
+check_DATA = test.config \
+        header_1.fits \
+        header_2.fits
+
 
 TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
@@ -57 +72 @@
 tst_psHash05_SOURCES = tst_psHash05.c
 tst_psScalar_SOURCES = tst_psScalar.c
+tst_psMetadataIO_SOURCES = tst_psMetadataIO.c
+tst_psMetadata_01_SOURCES = tst_psMetadata_01.c
+tst_psMetadata_02_SOURCES = tst_psMetadata_02.c
+tst_psMetadata_03_SOURCES = tst_psMetadata_03.c
+tst_psMetadata_04_SOURCES = tst_psMetadata_04.c
+tst_psMetadata_05_SOURCES = tst_psMetadata_05.c
+tst_psMetadata_06_SOURCES = tst_psMetadata_06.c
+tst_psMetadata_07_SOURCES = tst_psMetadata_07.c
+
+test.config: data/test.config
+        cp $? $@
+
+header_1.fits: data/header_1.fits
+        cp $? $@
+
+header_2.fits: data/header_2.fits
+        cp $? $@
 
 test: check

trunk/psLib/test/collections/tst_psHash01.c

@@ -21 +21 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFcn)IdFree);
     id->name = psStringCopy(name);
 

trunk/psLib/test/collections/tst_psHash02.c

@@ -24 +24 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFcn)IdFree);
     id->name = psStringCopy(name);
 

trunk/psLib/test/collections/tst_psHash03.c

@@ -26 +26 @@
 
     id = psAlloc(sizeof(ID));
-    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFcn)IdFree);
 
     id->name = psStringCopy(name);

trunk/psLib/test/collections/tst_psHash04.c

@@ -19 +19 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFcn)IdFree);
 
     id->name = psStringCopy(name);

trunk/psLib/test/dataIO

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

trunk/psLib/test/dataIO/.cvsignore

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

trunk/psLib/test/dataIO/Makefile.am

@@ -2 +2 @@
 #
 EXTRA_DIST = verified
+
+EXTRA_PROGRAMS = tst_psDB
 
 INCLUDES = \
@@ -18 +20 @@
 TESTS = \
         tst_psLookupTable_01 \
-        tst_psFits
+        tst_psFits \
+        @TST_PSDB@
 
 check_PROGRAMS = $(TESTS)
@@ -32 +35 @@
 tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
 tst_psFits_SOURCES =  tst_psFits.c
+tst_psDB_SOURCES = tst_psDB.c
 
 %.dat: verified/%.dat

trunk/psLib/test/fileUtils

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

trunk/psLib/test/fileUtils/.cvsignore

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

trunk/psLib/test/fileUtils/Makefile.am

@@ -2 +2 @@
 #
 EXTRA_DIST = verified
+
+EXTRA_PROGRAMS = tst_psDB
 
 INCLUDES = \
@@ -18 +20 @@
 TESTS = \
         tst_psLookupTable_01 \
-        tst_psFits
+        tst_psFits \
+        @TST_PSDB@
 
 check_PROGRAMS = $(TESTS)
@@ -32 +35 @@
 tst_psLookupTable_01_SOURCES =  tst_psLookupTable_01.c
 tst_psFits_SOURCES =  tst_psFits.c
+tst_psDB_SOURCES = tst_psDB.c
 
 %.dat: verified/%.dat

trunk/psLib/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-04-07 20:27:41 $
+#  $Date: 2005-04-09 00:04:57 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -43 +43 @@
     "resetStdout!" => \$resetStdout,
     "verified=s"   => \$verifiedDir,
-    "help!"        => \$help
+    "help!"        => \$help,
+    "quiet!"       => \$quiet,
+    "printpassfail!"     => \$verbose
 );
 
 if ($help || $#ARGV < 0) {
-    print
-"Usage: runTest [--reset] [--resetStderr] [--resetStdout] testfile(s)\n\n";
+    print "Usage: runTest  [--help] [--verified=DIR] [--quiet] [--printpassfail] \\\n",
+          "                [--reset] [--resetStderr] [--resetStdout] testfile(s)\n\n";
     exit(0);
 }
@@ -75 +77 @@
     # Check if a temp directory already exists in the current work directory
     if ( !( -e "temp" ) ) {
-
         # Create temp directory to store STDOUT, STDERR files during test run
         `mkdir temp`;
-
-        # Display message of new directory created
-        print("Creating temp directory\n");
     }
 
@@ -87 +85 @@
 
         # Display message that verified subdirectory doesn't exist
-        print("        Verified directory doesn't exist.\n");
+        print STDERR "        Verified directory doesn't exist.\n";
 
         # Exit script since the test cannot be run with verified files
@@ -95 +93 @@
     # Check if the test driver file exists and is executable
     if ( ( -e $testFile ) && ( -x $testFile ) ) {
-
-        # Display message the test driver is being executed
-        print("--- Executing test driver: $testFile\n");
 
         # Invoke the test driver
@@ -112 +107 @@
             # Display failure message with return value to user
             if ( $? != 0 && ( $testFile !~ /^A/i ) ) {
-                print("Failed - Test Driver returned $?, expected 0.\n");
+                print STDERR "Failed - Test Driver returned $?, expected 0.\n";
             }
             elsif ( $? == 0 && ( $testFile =~ /^A/i ) ) {
-                print("Failed - Test Driver returned $?, expected abort.\n");
+                print STDERR "Failed - Test Driver returned $?, expected abort.\n";
             }
             $exitValue |= 64;
@@ -148 +143 @@
             }
             if (m/^---> TESTPOINT\s(\S+)/) {
-                print "\t$testfile- $1\n";
+                print "\t$testfile- $1\n" if ($verbose || $1 eq "FAILED");
+                if ($1 eq "FAILED") {
+                    print $testoutput;
+                }
             }
 
@@ -184 +182 @@
             s/v\d+.\d+.\d+/vX.X.X/g;
 
+            if (m/\*\*\*\*\*\* TESTPOINT \*\*\*\*\*\*/) {
+                $testoutput = $_;
+            }
+            $testoutput += $_;
+
             if (m/ TestPoint:\s*([^\*]+)/) {
                 $testfile = $1;
             }
             if (m/^---> TESTPOINT\s(\S+)/) {
-                print "\t$testfile- $1\n";
+                print "\t$testfile- $1\n" if ($verbose || $1 eq "FAILED");
+                if ($1 eq "FAILED") {
+                    print $testoutput;
+                }
             }
 
@@ -208 +214 @@
 
         # Compare STDOUT capture with verified file
-        $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
+        $exitValue = &compareStream("$verifiedDir/$testFile.stdout");
 
         # Check exit value to determine if verified file doesn't exist
@@ -233 +239 @@
         # Since test driver doesn't exist or is not executable then display
         # message to user.
-        print(
-"        Need to specify an executable test file within directory.\n"
-        );
+        print STDERR "\tNeed to specify an executable test file.\n";
 
         # Exit value set to indicate test driver doesn't exist or not executable
@@ -246 +250 @@
 # of a failed test
 if ( ( $exitValue >> 3 ) != 0 ) {
-    print("Test failed - return status = $exitValue\n\n");
+    print STDERR "Test failed - return status = $exitValue\n\n";
 }
 else {
-    print("Test successful\n\n");
+    exit(0);
 }
 exit($exitValue);
@@ -287 +291 @@
             || m/\|A\|/i )
         {
+            print STDERR "\tFailed - File $fileName contains error strings.\n";
             if ( $fileName =~ m/out/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
                 $returnVal = 64;
             }
             elsif ( $fileName =~ m/err/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
                 $returnVal = 128;
             }
@@ -320 +319 @@
 #
 #      Return:   0  -  Compare successful
+#                2  -  STDOUT verified file doesn't exist
+#                4  -  STDERR verified file doesn't exist
 #                8  -  STDOUT verified file doesn't compare
 #               16  -  STDERR verified file doesn't compare
@@ -331 +332 @@
 
     # Check for existence of verified STD stream files
-    if ( -e $streamFile ) {
+    if ( !( -e $streamFile ) ) {
+
+        # Set exit value bit 1 to indicate proper failure
+        if ( $streamFile =~ /out$/ ) {
+            $returnVal |= 2;
+        }
+        elsif ( $streamFile =~ /err$/ ) {
+            $returnVal |= 4;
+        }
+    }
+    else {
 
         # Verified STD stream file exists
@@ -352 +363 @@
 
                 # Display message of the failure of difference to user
-                print("        Failed - STDOUT difference\n$diffstdout\n");
+                print STDERR "\tFailed - STDOUT differences\n";
 
                 # Exit value to indicate STDOUT did not compare
@@ -360 +371 @@
 
                 # Display message of the failure of difference to user
-                print("        Failed - STDERR difference\n$diffstdout\n");
+                print STDERR "\tFailed - STDERR differences\n";
 
                 # Exit value to indicate STDERR did not compare

@@ -7 +7 @@
 tst_psTime_01
 tst_psTime_02
-tst_psMetadata05_OUT
-tst_psMetadata_01
-tst_psMetadata_02
-tst_psMetadata_03
-tst_psMetadata_04
-tst_psMetadata_05
-tst_psMetadata_06
 tst_psAstrometry
 tst_psAstrometry01
 tst_psCoord
-tst_psMetadataIO
-tst_psMetadata_07
 tst_psTime_03
 tst_psTime_04
@@ -26 +17 @@
 .deps
 .libs
-header_1.fits
-header_2.fits
-test.config
 test.ser7.dat
 tst_psCoord01
-tst_psDB

@@ -37 +37 @@
 tst_psArray01
 tst_psScalar
+tst_psMetadata05_OUT
+tst_psMetadata_01
+tst_psMetadata_02
+tst_psMetadata_03
+tst_psMetadata_04
+tst_psMetadata_05
+tst_psMetadata_06
+tst_psMetadata_07
+tst_psMetadataIO
+header_1.fits
+header_2.fits
+test.config

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits

@@ -6 +6 @@
 temp
 tst_psLookupTable_01
+tst_psDB
 tst_psFits
 multi.fits