Index: unk/psModules/test/FullUnitTest =================================================================== --- /trunk/psModules/test/FullUnitTest (revision 9721) +++ (revision ) @@ -1,360 +1,0 @@ -#!/usr/bin/perl -# -# This is a perl script test harness which will recursively search the -# directory tree looking for files named UnitTest and then execute -# the script -# -# SYNOSIS : FullUnitTest options arguements -# -# where options = -# --verbose Display extra information to user -# --noverbose Don't display extra information to user -# --recursiv e Recursively run tests in directory tree -# --norecursive Test only the specified or current directory -# --silent Don't display any information to user -# --nosilent Display progress of script to user -# -# arguements = directory(ies) to perform tests -# -# RETURN : integer number of tests which failed -# -# $Revision: 1.3 $ $Name: not supported by cvs2svn $ -# $Date: 2005-04-12 21:51:00 $ -# -# 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 -use Cwd; - -# Provides functions for handling psS64 command line options -use Getopt::Long; - -# Assign variables based on the presence of command line options to the script -# The ! option allows for --nooption to be set to zero -# (e.g. --noverbose --recursive causes $verbose=0 and $recursive=1) -GetOptions( - "verbose!" => \$verbose, - "recursive!" => \$recursive, - "silent!" => \$silent, - "clean!" => \$clean -); - -# Check if both silent and verbose options are set and if so stop the script -die "Can't specify both verbose and silent options." if ( $verbose && $silent ); - -# Set up the PSLIB_ROOT environment variable if the user doesn't have -if ( !$ENV{'PSLIB_ROOT'} ) { - - # Use the directory directly above where FullUnitTest script resides - $PSLIB_ROOT = `cd ..;pwd`; - - # Remove newline for the end of path returned - chomp($PSLIB_ROOT); - - # Set the environment variable - $ENV{'PSLIB_ROOT'} = $PSLIB_ROOT; - print("PSLIB_ROOT not found: set to $PSLIB_ROOT.\n") if $verbose; -} - -# add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment -# variables -$ENV{'LD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'LD_LIBRARY_PATH'}"; -$ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}"; - -# Initialize variables for counting the makes and test failures and the -# total makes and tests performed -$makeFailCount = 0; -$testpointFailCount = 0; -$testDriverFailCount = 0; -$totalTestpoints = 0; -$totalTestDrivers = 0; -$totalMakes = 0; - -# Initialize variable indicating how many arguements were passed -$args = 0; - -# Loop through all the arguements passed to the script -foreach (@ARGV) { - - # Remove newline if there is one - chomp; - - # Increment number of arguements found - $args++; - - # Set variable to current working directory - $cwd = cwd; - - # Change directory to the directory of the arguement - chdir($_); - - # Check for the recursive option - if ($recursive) { - - # Invoke subroutine to go to the lowest directory in tree - # starting at the specified directory - &worm($_); - } - else { - - # Invoke subroutines to run the test at the specified directory - &makeTestDrivers($_); - &executeTestDrivers($_); - } - - # Change directory back to the directory where FullUnitTest was invoked - chdir($cwd); -} - -# Check if there were no arguements specified -if ( $args == 0 ) { - - # Display message to user that all directories under the current will be - # tested - print("Recursively testing current directory tree.\n") if $verbose; - - # Invoke subroutine to go to recursively test each directory in tree - &worm( $ENV{"PWD"} ); -} - -# Check if there were any failures during make or testing -if ( $makeFailCount > 0 || $testDriverFailCount > 0 ) { - - # Display summary of failures - print("\nMake Failures = $makeFailCount out of $totalMakes"); - print( -"\nTest Driver Failures = $testDriverFailCount out of $totalTestDrivers\n" - ); - print( "\nMakes that failed:\n " . join( "\n ", @makesFailed ) . "\n" ) - if $makeFailCount; - print( "\nTests that failed:\n " . join( "\n ", @testsFailed ) . "\n" ) - if $testDriverFailCount; -} -else { - - # Display message of all makes and tests pass to user if silent option - # not specified - print( -"\nAll $totalTestDrivers Test Drivers Passed with $totalTestpoints Testpoints.\n" - ) - if ( !$silent ); -} - -# Exit with the number of tests that failed -exit($testDriverFailCount); - -################################################################################ -# -# SUBROUTINE: worm -# -# Description: This subroutine will perform the necessary unit tests be -# calling makeTestDrivers and executeTestDrivers subroutines -# and then check each subdirectory below the base directory -# recursively. -# -# Parameter(s): base directory to start testing -# -# Return: None -# -################################################################################ - -sub worm { - - # Assign local variable to input parameter - local ($base_dir) = @_; - local ( @files, $i ); - - # Invoke subroutine to make test driver in the base directory - &makeTestDrivers($base_dir); - - # Invoke subroutine to execute tests in the base directory - &executeTestDrivers($base_dir); - - # Create array of entries found in directory - @files = <*>; - - # Loop through the file list looking for another directory that is not - # labelled CVS and recursively invoke subroutine worm - $i = 0; - while ( $files[$i] ) { - - # Check for directory and directory not labelled CVS - if ( -d $files[$i] - && ( $files[$i] ne "CVS" ) - && ( $files[$i] ne "temp" ) - && ( $files[$i] ne "verified" ) ) - { - - # Change current directory to directory found - chdir( $files[$i] ); - - # Invoke subroutine worm again - &worm( $files[$i] ); - - # Change current directory back to parent - chdir(".."); - } - - # Increment file list index - $i++; - } -} - -################################################################################ -# -# SUBROUTINE: makeTestDrivers -# -# Description: This subroutine will perform a make for all the necessary -# test drivers. This will occur in the specified -# base directory which is passed as the only parameter. -# -# Parameter(s): base directory where make and test drivers are located -# -# Return: None -# -################################################################################ - -sub makeTestDrivers { - local ($base_dir) = @_; - local ($pwd); - - # Set variable pwd to current working directory - $pwd = cwd; - - # Display message to user in which directory testing is taken place only - # if the silent command option was not specified - print("---- Entering $pwd ----\n") if ( !$silent ); - - # Check for the existence of a file name Makefile in current directory - if ( -e "Makefile" ) { - - # Increment the total number of makes executed - $totalMakes++; - - if ($clean) { - - # Execute the make clean - `make clean`; - - } - - # Execute the make and save results - $_ = join( "\n|| ", split( "\n", "\n" . `make tests` ) ); - - # Check the output of make for return value != 0 or any of the - # following words: FAILED, FAULT, ERROR, Not found, SIGNAL - if ( $? != 0 ) { - - # Display the errored output of make if silent option not enabled - print("$_\n") if ( !$silent ); - - # Display the make failed in the current directory - print("\nMake for $pwd Failed\n"); - - # Increment the number of makes that have failed - $makeFailCount++; - - # Push the current working directory onto the list of failed - # make directories list - push( @makesFailed, $pwd ); - } - else { - - # Display the results of the successful make if verbose option set - print("$_\n") if $verbose; - - # Display the make was successful if silent option not set - print("\nMake successful.\n") if ( !$silent ); - } - } -} - -################################################################################ -# -# SUBROUTINE: executeTestDrivers -# -# Description: This subroutine will execute all the necessary -# test drivers. This will occur in the specified -# base directory which is passed as the only parameter. -# -# Parameter(s): base directory where make and test drivers are located -# -################################################################################ - -sub executeTestDrivers { - local ($base_dir) = @_; - local ( @files, $j ); - local ($pwd); - local ($exitValue) = 0; - - # Set variable to pwd to current test directory - $pwd = cwd; - - # Create a list of all elements in base directory - @files = <*>; - - # Loop through all the items in the files array - $initialTest = 0; - $j = 0; - while ( $files[$j] ) { - - # Check that the item is not a directory and is executable and - # conforms to the test driver naming convention TST - if ( !( -d $files[$j] ) - && ( -x $files[$j] ) - && ( $files[$j] =~ /^TST/i || $files[$j] =~ /^ATST/i ) ) - { - - # Increment total number of test drivers executed - $totalTestDrivers++; - - # Display message to user of which test driver is being executed - print("--- Executing test driver $files[$j]\n") if ( !$silent ); - - # Execute the test driver - if ($silent) { - system("$runTest --quiet ./$files[$j]"); - } elsif ($verbose) { - system("$runTest --printpassfail ./$files[$j]"); - } else { - system("$runTest ./$files[$j]"); - } - $retVal = $?; - - # Count testpoints - $testPattern = "\"\\*\\*\\*\\* TESTPOINT \\*\\*\\*\\*\""; - $totalPoints = `grep -c $testPattern temp/$files[$j].stdout`; - $totalPoints += `grep -c $testPattern temp/$files[$j].stderr`; - $failPoints = - `grep "> TESTPOINT FAILED" temp/$files[$j].stdout | wc -l`; - $failPoints += - `grep "> TESTPOINT FAILED" temp/$files[$j].stderr | wc -l`; - $testpointFailCount += $failPoints; - $totalTestpoints += $totalPoints; - - # Check result of test driver - if ( $retVal != 0 ) - { - - # Display test driver failed - $failPoints++; - print( - "Test driver: $files[$j] Failed (Return value $retVal).\n"); - - # Increment the total number of test failed - $testDriverFailCount++; - - # Push the current working directory on the list of failed - push( @testsFailed, $pwd . "/" . $files[$j] ); - } - } - $j++; - } -} - Index: /trunk/psModules/test/astrom/Makefile.am =================================================================== --- /trunk/psModules/test/astrom/Makefile.am (revision 9721) +++ /trunk/psModules/test/astrom/Makefile.am (revision 9722) @@ -3,20 +3,5 @@ AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -TESTS = \ - tst_pmAstrometry \ - tst_pmAstrometry01 - -tst_pmAstrometry_SOURCES = tst_pmAstrometry.c -tst_pmAstrometry01_SOURCES = tst_pmAstrometry01.c - -check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -EXTRA_DIST = verified - -CLEANFILES = $(TESTS) temp/* *~ +check_PROGRAMS = test: check Index: unk/psModules/test/astrom/verified/tst_pmAstrometry.stderr =================================================================== --- /trunk/psModules/test/astrom/verified/tst_pmAstrometry.stderr (revision 9721) +++ (revision ) @@ -1,36 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmAstrometry.c * -* TestPoint: pmAstrometry{pmFPAAlloc} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmAstrometry{pmFPAAlloc} | tst_pmAstrometry.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmAstrometry.c * -* TestPoint: pmAstrometry{pmChipAlloc} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmAstrometry{pmChipAlloc} | tst_pmAstrometry.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmAstrometry.c * -* TestPoint: pmAstrometry{pmCellAlloc} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmAstrometry{pmCellAlloc} | tst_pmAstrometry.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmAstrometry.c * -* TestPoint: pmAstrometry{pmReadoutAlloc} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmAstrometry{pmReadoutAlloc} | tst_pmAstrometry.c) - Index: /trunk/psModules/test/camera/Makefile.am =================================================================== --- /trunk/psModules/test/camera/Makefile.am (revision 9721) +++ /trunk/psModules/test/camera/Makefile.am (revision 9722) @@ -3,16 +3,5 @@ AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -TESTS =\ - tst_pmAstrometry - -tst_pmAstrometry_SOURCES = tst_pmAstrometry.c - -check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -CLEANFILES = $(TESTS) temp/* *~ +check_PROGRAMS = test: check Index: /trunk/psModules/test/concepts/Makefile.am =================================================================== --- /trunk/psModules/test/concepts/Makefile.am (revision 9721) +++ /trunk/psModules/test/concepts/Makefile.am (revision 9722) @@ -3,13 +3,5 @@ AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -TESTS = - -check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -CLEANFILES = $(TESTS) temp/* *~ +check_PROGRAMS = test: check Index: /trunk/psModules/test/config/Makefile.am =================================================================== --- /trunk/psModules/test/config/Makefile.am (revision 9721) +++ /trunk/psModules/test/config/Makefile.am (revision 9722) @@ -2,24 +2,15 @@ AM_CFLAGS = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC) -TESTS = \ - tst_pmConfig - -tst_pmConfig_SOURCES = tst_pmConfig.c - -check_PROGRAMS = $(TESTS) +check_PROGRAMS = check_DATA = \ SampleIPPConfig -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - SampleIPPConfig: data/SampleIPPConfig cp $? $@ -tests: $(TESTS) $(check_DATA) +EXTRA_DIST = data -EXTRA_DIST = verified data - -CLEANFILES = $(TESTS) temp/* $(check_DATA) *~ +CLEANFILES = $(check_DATA) *~ test: check Index: unk/psModules/test/config/verified/tst_pmConfig.stderr =================================================================== --- /trunk/psModules/test/config/verified/tst_pmConfig.stderr (revision 9721) +++ (revision ) @@ -1,11 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmConfig.c * -* TestPoint: Test Point Driver{pmConfig:} * -* TestType: Positive * -\**********************************************************************************/ - -|I|readConfig - Loading site configuration from file SampleIPPConfig - ----> TESTPOINT PASSED (Test Point Driver{pmConfig:} | tst_pmConfig.c) - Index: unk/psModules/test/config/verified/tst_pmConfig.stdout =================================================================== --- /trunk/psModules/test/config/verified/tst_pmConfig.stdout (revision 9721) +++ (revision ) @@ -1,2 +1,0 @@ ----------------------------------------------------------------- -Calling pmConfigRead() with acceptable arguments. Index: unk/psModules/test/detrend/verified/tst_pmFlatField.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmFlatField.stderr (revision 9721) +++ (revision ) @@ -1,69 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: Test Point Driver{pmFlatField} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Unallowable operation: flat is NULL. -|E|pmFlatField (FILE:LINENO) - Unallowable operation: in->image is NULL. -|E|pmFlatField (FILE:LINENO) - Unallowable operation: flat->image is NULL. -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Input image size exceeds that of flat image: (3, 3) vs (2, 2) -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Total offset >= flat image size: (50, 50) vs (3, 3) -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Complex types not allowed for input image. Type: 2064 -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Complex types not allowed for flat image. Type: 2064 -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Input and flat image types differ: (1032 vs 1028) -|W|pmFlatField - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmFlatField (FILE:LINENO) - Mask must be PS_TYPE_MASK type. Type: 1028 - ----> TESTPOINT PASSED (Test Point Driver{pmFlatField} | tst_pmFlatField.c) - Index: unk/psModules/test/detrend/verified/tst_pmFlatField.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmFlatField.stdout (revision 9721) +++ (revision ) @@ -1,241 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test A - Divide input image by flat image} * -* TestType: Positive * -\**********************************************************************************/ - -Input mask: -0 0 0 -0 0 0 -0 0 0 - -Input image: -6.000000 6.000000 6.000000 -6.000000 6.000000 6.000000 -6.000000 6.000000 6.000000 - -Flat image: -2.000000 2.000000 2.000000 -2.000000 2.000000 2.000000 -2.000000 2.000000 2.000000 - -Resulting image: -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 - - ----> TESTPOINT PASSED (pmFlatField{Test A - Divide input image by flat image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test B - Mask flat image data} * -* TestType: Positive * -\**********************************************************************************/ - -Input image: -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 - -Flat image: -0.000000 0.000000 0.000000 -0.000000 0.000000 0.000000 -0.000000 0.000000 0.000000 - -Resulting mask: -8 8 8 -8 8 8 -8 8 8 - -Resulting image: -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 - - ----> TESTPOINT PASSED (pmFlatField{Test B - Mask flat image data} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test C - Mask flat image data starting with non-null mask} * -* TestType: Positive * -\**********************************************************************************/ - -Input image: -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 - -Flat image: -0.000000 0.000000 0.000000 -0.000000 0.000000 0.000000 -3.000000 -3.000000 0.000000 - -Flat image out: -0.000000 0.000000 0.000000 -0.000000 0.000000 0.000000 -3.000000 0.000000 0.000000 - -Resulting mask: -8 8 8 -8 8 8 -0 8 8 - -Resulting image: -3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 -1.000000 3.000000 3.000000 - - ----> TESTPOINT PASSED (pmFlatField{Test C - Mask flat image data starting with non-null mask} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test D - Attempt to use null flat readout} * -* TestType: Negative * -* ExpectedErrorText: Null not allowed for flat readout * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test D - Attempt to use null flat readout} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test E - Attempt to use null input image} * -* TestType: Negative * -* ExpectedErrorText: Null not allowed for input image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test E - Attempt to use null input image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test F - Attempt tp use null flat image} * -* TestType: Negative * -* ExpectedErrorText: Null not allowed for flat image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test F - Attempt tp use null flat image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test G - Attempt to use input image bigger than flat image} * -* TestType: Negative * -* ExpectedErrorText: Input image size exceeds that of flat image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test G - Attempt to use input image bigger than flat image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test H - Attempt to use input image mask bigger than flat image} * -* TestType: Negative * -* ExpectedErrorText: Input image mask size exceeds that of flat image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test H - Attempt to use input image mask bigger than flat image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test I - Attempt to use offset greater than input image} * -* TestType: Negative * -* ExpectedErrorText: Total offset >= input image size * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test I - Attempt to use offset greater than input image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test J - Attempt to use complex input image} * -* TestType: Negative * -* ExpectedErrorText: Complex types not allowed for input image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test J - Attempt to use complex input image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test K - Attempt to use complex flat image} * -* TestType: Negative * -* ExpectedErrorText: Complex types not allowed for flat image * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test K - Attempt to use complex flat image} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test L - Attempt to use non-equal input and flat image types} * -* TestType: Negative * -* ExpectedErrorText: Input and flat image types differ * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test L - Attempt to use non-equal input and flat image types} | tst_pmFlatField.c) - - - - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmFlatField.c * -* TestPoint: pmFlatField{Test M - Attempt to use non-mask type mask image} * -* TestType: Negative * -* ExpectedErrorText: Mask must be PS_TYPE_MASK type * -* ExpectedStatusValue: 0 * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmFlatField{Test M - Attempt to use non-mask type mask image} | tst_pmFlatField.c) - - - - Index: unk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr (revision 9721) +++ (revision ) @@ -1,149 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Create mask based on maskVal argument} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on maskVal argument} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Create mask based on saturation argument} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on saturation argument} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Create mask based on growVal and grow argum * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on growVal and grow arguments} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Auto create mask based on maskVal argument} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Auto create mask based on maskVal argument} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use null mask} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|E|pmMaskBadPixels (FILE:LINENO) - Unallowable operation: mask is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use null mask} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt tp use null input image} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmMaskBadPixels (FILE:LINENO) - Unallowable operation: in->image is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt tp use null input image} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use input image bigger than mask * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmMaskBadPixels (FILE:LINENO) - Input image size exceeds that of mask image: (60, 60) vs (50, 50) - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use input image bigger than mask} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use input image mask bigger than * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use input image mask bigger than mask} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use offset greater than input im * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmMaskBadPixels (FILE:LINENO) - Total offset >= mask image: (150, 150) vs (50, 50) - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use offset greater than input image} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use complex input image} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmMaskBadPixels (FILE:LINENO) - Complex types not allowed for input image. Type: 2064 - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use complex input image} | tst_pmMaskBadPixels.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmMaskBadPixels.c * -* TestPoint: Test Point Driver{pmMaskBadPixels - Attempt to use non-mask type mask image} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmMaskBadPixels - WARNING: in->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|pmMaskBadPixels (FILE:LINENO) - Mask must be PS_TYPE_MASK type. Type: 1032 - ----> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use non-mask type mask image} | tst_pmMaskBadPixels.c) - Index: unk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout (revision 9721) +++ (revision ) @@ -1,416 +1,0 @@ -Data mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Resulting mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Data mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Resulting mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000011100000000000000000000000 -00000000000000000000000111110000000000000000000000 -00000000000000000000000011100000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Data mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Resulting mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000011111111100000000000000000000 -00000000000000000001111111111111000000000000000000 -00000000000000000011111111111111100000000000000000 -00000000000000000111111111111111110000000000000000 -00000000000000000111111111111111110000000000000000 -00000000000000001111111111111111111000000000000000 -00000000000000001111111111111111111000000000000000 -00000000000000001111111111111111111000000000000000 -00000000000000001111111111111111111000000000000000 -00000000000000011111111111111111111100000000000000 -00000000000000001111111111111111111000000000000000 -00000000000000001111111111111111111000000000000000 -00000000000010001111111111111111111000100000000000 -00000000111111111111111111111111111111111110000000 -00000011111111111111111111111111111111111111100000 -00000111111111111111111111111111111111111111110000 -00001111111111111111111111111111111111111111111000 -00001111111111111111111111111111111111111111111000 -00011111111111111111111111111111111111111111111100 -00011111111111111111110001000111111111111111111100 -00011111111111111111110000000111111111111111111100 -00011111111111111111110000000111111111111111111100 -00111111111111111111111000001111111111111111111110 -00011111111111111111110000000111111111111111111100 -00011111111111111111110000000111111111111111111100 -00011111111111111111110000000111111111111111111100 -00011111111111111111110000000111111111111111111100 -00001111111111111111100000000011111111111111111000 -00001111111111111111100000000011111111111111111000 -00000111111111111111000000000001111111111111110000 -00000011111111111110000000000000111111111111100000 -00000000111111111000000000000000001111111110000000 -00000000000010000000000000000000000000100000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Data mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - -Resulting mask: -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000001000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - Index: unk/psModules/test/detrend/verified/tst_pmNonLinear.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stderr (revision 9721) +++ (revision ) @@ -1,86 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: Test Point Driver{pmNonLinearityPolynomial} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmNonLinearityPolynomial - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityPolynomial - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityPolynomial - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityPolynomial - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmNonLinearityPolynomial} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: Test Point Driver{pmNonLinearityLookup} * -* TestType: Positive * -\**********************************************************************************/ - -|W|pmNonLinearityLookup - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityLookup - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityLookup - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|W|pmNonLinearityLookup - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). - ----> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: Test Point Driver{pmNonLinearityPolynomial(): error/warning conditions} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmNonLinearityPolynomial (FILE:LINENO) - Unallowable operation: inputReadout is NULL. -|E|pmNonLinearityPolynomial (FILE:LINENO) - Unallowable operation: inputReadout->image is NULL. -|E|pmNonLinearityPolynomial (FILE:LINENO) - Unallowable operation: input1DPoly is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmNonLinearityPolynomial(): error/warning conditions} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: Test Point Driver{pmNonLinearityLookup(): error/warning conditions} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmNonLinearityLookup (FILE:LINENO) - Unallowable operation: inputReadout is NULL. -|E|pmNonLinearityLookup (FILE:LINENO) - Unallowable operation: inputReadout->image is NULL. -|W|pmNonLinearityLookup - WARNING: inputReadout->parent is NULL. -|W|p_psDetermineTrimmedImage - WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). -|E|psVectorsReadFromFile (FILE:LINENO) - Failed to open file I_DONT_EXIST. -|W|pmNonLinearityLookup - WARNING: Lookup Table is too small. Returning original pmReadout. - ----> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup(): error/warning conditions} | tst_pmNonLinear.c) - Index: unk/psModules/test/detrend/verified/tst_pmNonLinear.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stdout (revision 9721) +++ (revision ) @@ -1,95 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityPolynomialTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityPolynomialTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityPolynomialTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityPolynomialTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityPolynomialTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityPolynomialTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityPolynomialTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityPolynomialTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityLookupTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityLookupTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityLookupTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityLookupTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityLookupTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityLookupTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{doNonLinearityLookupTest} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmNonLinear{doNonLinearityLookupTest} | tst_pmNonLinear.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmNonLinear.c * -* TestPoint: pmNonLinear{Testing bad input parameter conditions.} * -* TestType: Positive * -\**********************************************************************************/ - ------------------------------------------------------------- -Calling pmNonLinearityPolynomial() with NULL input readout. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityPolynomial() with NULL input readout->image. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityPolynomial() with NULL polynomial. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with NULL input pmReadout. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with NULL input pmReadout->image. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with non-existent lookup file. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with one pixels outside inFlux range. Should generate warnings. - ----> TESTPOINT PASSED (pmNonLinear{Testing bad input parameter conditions.} | tst_pmNonLinear.c) - Index: /trunk/psModules/test/imcombine/Makefile.am =================================================================== --- /trunk/psModules/test/imcombine/Makefile.am (revision 9721) +++ /trunk/psModules/test/imcombine/Makefile.am (revision 9722) @@ -2,18 +2,5 @@ AM_CFLAGS = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC) -TESTS = \ - tst_pmImageCombine \ - tst_pmReadoutCombine - -tst_pmImageCombine_SOURCES = tst_pmImageCombine.c -tst_pmReadoutCombine_SOURCES = tst_pmReadoutCombine.c - check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -EXTRA_DIST = verified CLEANFILES = $(TESTS) temp/* *~ Index: unk/psModules/test/imcombine/verified/tst_pmImageCombine.stderr =================================================================== --- /trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stderr (revision 9721) +++ (revision ) @@ -1,25 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmImageCombine.c * -* TestPoint: Test Point Driver{pmCombineImages()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmCombineImages (FILE:LINENO) - Unallowable operation: images is NULL. -|E|pmCombineImages (FILE:LINENO) - images and errors args must have same length (6 != 5) -|E|pmCombineImages (FILE:LINENO) - Unallowable operation: psImage tmpDataImg has incorrect type. -|E|pmCombineImages (FILE:LINENO) - images and errors args must have same length (5 != 6) -|E|pmCombineImages (FILE:LINENO) - Unallowable operation: psImage tmpErrorImg has incorrect type. -|E|pmCombineImages (FILE:LINENO) - images and masks args must have same length (5 != 6) -|E|pmCombineImages (FILE:LINENO) - Unallowable operation: psImage tmpMaskImg has incorrect type. -|E|pmCombineImages (FILE:LINENO) - Unallowable operation: stats is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmCombineImages()} | tst_pmImageCombine.c) - Index: unk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout =================================================================== --- /trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout (revision 9721) +++ (revision ) @@ -1,56 +1,0 @@ -Testing pmCombineImages(10, 10, 5) -Generating a bad pixel in image (1) at (0, 8) -Generating a bad pixel in image (3) at (7, 5) -Generating a bad pixel in image (1) at (1, 2) -Generating a bad pixel in image (2) at (9, 9) -Generating a bad pixel in image (1) at (3, 9) -Generating a bad pixel in image (2) at (0, 5) -Generating a bad pixel in image (1) at (4, 5) -Generating a bad pixel in image (1) at (3, 8) -Generating a bad pixel in image (2) at (6, 2) -Generating a bad pixel in image (2) at (3, 7) -Calling with a NULL images. Should generate error, return NULL. -Calling with a long images. Should generate error, return NULL. -Calling with a bad type images. Should generate error, return NULL. -Calling with a long errors. Should generate error, return NULL. -Calling with a bad type errors. Should generate error, return NULL. -Calling with a long masks. Should generate error, return NULL. -Calling with a bad type masks. Should generate error, return NULL. -Calling with a NULL stats. Should generate error, return NULL. -Calling with acceptable data. Should generate a psImage. -Image 0, questionable pixel 0 is (1.000000 2.000000) -Image 0, questionable pixel 1 is (4.000000 5.000000) -Image 1, questionable pixel 0 is (0.000000 8.000000) -Image 1, questionable pixel 1 is (1.000000 2.000000) -Image 1, questionable pixel 2 is (9.000000 9.000000) -Image 1, questionable pixel 3 is (3.000000 9.000000) -Image 1, questionable pixel 4 is (4.000000 5.000000) -Image 1, questionable pixel 5 is (3.000000 8.000000) -Image 2, questionable pixel 0 is (1.000000 2.000000) -Image 2, questionable pixel 1 is (9.000000 9.000000) -Image 2, questionable pixel 2 is (0.000000 5.000000) -Image 2, questionable pixel 3 is (6.000000 2.000000) -Image 2, questionable pixel 4 is (3.000000 7.000000) -Image 3, questionable pixel 0 is (7.000000 5.000000) -Image 4, questionable pixel 0 is (3.000000 8.000000) - - - -Calling pmRejectPixels() with acceptable data. Should generate a psArray. -tst_pmImageCombine.c: Image 0 had 2 rejects. -Image 0, rejected pixel 0 is (1.000000 2.000000) -Image 0, rejected pixel 1 is (4.000000 5.000000) -tst_pmImageCombine.c: Image 1 had 4 rejects. -Image 1, rejected pixel 0 is (0.000000 8.000000) -Image 1, rejected pixel 1 is (1.000000 2.000000) -Image 1, rejected pixel 2 is (4.000000 5.000000) -Image 1, rejected pixel 3 is (3.000000 8.000000) -tst_pmImageCombine.c: Image 2 had 4 rejects. -Image 2, rejected pixel 0 is (1.000000 2.000000) -Image 2, rejected pixel 1 is (0.000000 5.000000) -Image 2, rejected pixel 2 is (6.000000 2.000000) -Image 2, rejected pixel 3 is (3.000000 7.000000) -tst_pmImageCombine.c: Image 3 had 1 rejects. -Image 3, rejected pixel 0 is (7.000000 5.000000) -tst_pmImageCombine.c: Image 4 had 1 rejects. -Image 4, rejected pixel 0 is (3.000000 8.000000) Index: unk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stderr =================================================================== --- /trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stderr (revision 9721) +++ (revision ) @@ -1,42 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: Test Point Driver{pmSubtractBias(): Basic readout combines with no image overla * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (Test Point Driver{pmSubtractBias(): Basic readout combines with no image overlap} | tst_pmReadoutCombine.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: Test Point Driver{pmSubtractBias(): input parameter error conditions} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmReadoutCombine (FILE:LINENO) - zero vector has incorrect size (5). Returning NULL. -|E|pmReadoutCombine (FILE:LINENO) - Unallowable operation: psVector zero has incorrect type. -|W|pmReadoutCombine - WARNING: the zero vector too many elements (11) -|E|pmReadoutCombine (FILE:LINENO) - scale vector has incorrect size (5). Returning NULL. -|E|pmReadoutCombine (FILE:LINENO) - Unallowable operation: psVector scale has incorrect type. -|W|pmReadoutCombine - WARNING: the scale vector has too many elements (20) -|E|pmReadoutCombine (FILE:LINENO) - Output image (1, 1) is too small to hold combined images. Returning NULL. -|E|pmReadoutCombine (FILE:LINENO) - Output image offset is larger then input image offset. Returning NULL. -|E|pmReadoutCombine (FILE:LINENO) - Unallowable operation: inputs is NULL. -|E|pmReadoutCombine (FILE:LINENO) - Unallowable operation: params is NULL. -|E|pmReadoutCombine (FILE:LINENO) - Multiple statistical options have been requested. Returning NULL. -|E|pmReadoutCombine (FILE:LINENO) - Unallowable operation: params->stats is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmSubtractBias(): input parameter error conditions} | tst_pmReadoutCombine.c) - Index: unk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stdout =================================================================== --- /trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stdout (revision 9721) +++ (revision ) @@ -1,79 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: pmReadoutCombine{simpleCombineNoOverlap} * -* TestType: Positive * -\**********************************************************************************/ - -tst_pmReadoutCombine(): (minOutRow, minOutCol) to (maxOutRow, maxOutCol) is (0, 0) (1, 1) - ----> TESTPOINT PASSED (pmReadoutCombine{simpleCombineNoOverlap} | tst_pmReadoutCombine.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: pmReadoutCombine{simpleCombineNoOverlap} * -* TestType: Positive * -\**********************************************************************************/ - -tst_pmReadoutCombine(): (minOutRow, minOutCol) to (maxOutRow, maxOutCol) is (0, 0) (1, 20) - ----> TESTPOINT PASSED (pmReadoutCombine{simpleCombineNoOverlap} | tst_pmReadoutCombine.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: pmReadoutCombine{simpleCombineNoOverlap} * -* TestType: Positive * -\**********************************************************************************/ - -tst_pmReadoutCombine(): (minOutRow, minOutCol) to (maxOutRow, maxOutCol) is (0, 0) (20, 1) - ----> TESTPOINT PASSED (pmReadoutCombine{simpleCombineNoOverlap} | tst_pmReadoutCombine.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: pmReadoutCombine{simpleCombineNoOverlap} * -* TestType: Positive * -\**********************************************************************************/ - -tst_pmReadoutCombine(): (minOutRow, minOutCol) to (maxOutRow, maxOutCol) is (0, 0) (20, 20) - ----> TESTPOINT PASSED (pmReadoutCombine{simpleCombineNoOverlap} | tst_pmReadoutCombine.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmReadoutCombine.c * -* TestPoint: pmReadoutCombine{Testing bad input parameter conditions} * -* TestType: Positive * -\**********************************************************************************/ - ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with NULL zero vector. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect length zero vector (too small). Should generate error. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect type zero vector. Should generate error. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect length zero vector (too big). Should generate warning. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with NULL scale vector. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect length scale vector (too small). Should generate error. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect type scale vector. Should generate error. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with incorrect length scale vector (too big). Should generate warning. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() insufficient size output image. Should generate error, return NULL. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() row0/col0 too large. Should generate error, return NULL. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with NULL input list. Should generate error, return NULL. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with NULL params. Should generate error, return NULL. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with multiple stats->options. Should generate error, return NULL. ----------------------------------------------------------------------------- -Calling pmReadoutCombine() with NULL param->stats. Should generate error, return NULL. ----------------------------------------------------------------------------- -============================================================================ - ----> TESTPOINT PASSED (pmReadoutCombine{Testing bad input parameter conditions} | tst_pmReadoutCombine.c) - Index: /trunk/psModules/test/objects/Makefile.am =================================================================== --- /trunk/psModules/test/objects/Makefile.am (revision 9721) +++ /trunk/psModules/test/objects/Makefile.am (revision 9722) @@ -2,18 +2,5 @@ AM_CFLAGS = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC) -TESTS = \ - tst_pmObjects01 - -tst_pmObjects01_SOURCES = tst_pmObjects01.c - -check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -EXTRA_DIST = verified - -CLEANFILES = $(TESTS) temp/* *~ +check_PROGRAMS = test: check Index: unk/psModules/test/objects/verified/tst_pmObjects01.stderr =================================================================== --- /trunk/psModules/test/objects/verified/tst_pmObjects01.stderr (revision 9721) +++ (revision ) @@ -1,78 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: structure allocators and deallocators} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmModelParameterCount (FILE:LINENO) - Undefined pmModelType - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: structure allocators and deallocators} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: psFindVectorPeaks()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmFindVectorPeaks (FILE:LINENO) - Unallowable operation: psVector vector or its data is NULL. -|E|pmFindVectorPeaks (FILE:LINENO) - Unallowable operation: psVector vector has no elements. -|E|pmFindVectorPeaks (FILE:LINENO) - Unallowable operation: psVector vector has incorrect type. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: psFindVectorPeaks()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: psFindImagePeaks()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|psImageAlloc (FILE:LINENO) - Specified number of rows (0) or columns (0) is invalid. -|E|pmFindImagePeaks (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|pmFindImagePeaks (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|pmFindImagePeaks (FILE:LINENO) - Unallowable operation: psImage image has incorrect type. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: psFindImagePeaks()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmCullPeaks()} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmCullPeaks()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceLocalSky()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceLocalSky (FILE:LINENO) - Unallowable operation: source is NULL. -|E|pmSourceLocalSky (FILE:LINENO) - Error: Radius is 0 or less. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceLocalSky()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceMoments()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceMoments (FILE:LINENO) - Unallowable operation: source is NULL. -|E|pmSourceMoments (FILE:LINENO) - Error: !(radius > 0.0) (-10.000000 0.000000). - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceMoments()} | tst_pmObjects01.c) - Index: unk/psModules/test/objects/verified/tst_pmObjects01.stdout =================================================================== --- /trunk/psModules/test/objects/verified/tst_pmObjects01.stdout (revision 9721) +++ (revision ) @@ -1,83 +1,0 @@ -Testing pmPeakAlloc()... -Testing pmMomentsAlloc()... ----------------------------------------------------------------------------------- -Calling pmFindVectorPeaks with NULL psVector. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmFindVectorPeaks with empty psVector. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmFindVectorPeaks with PS_TYPE_F64 psVector. Should generate error and return NULL. --------------- Calling test_pmFindVectorPeaks on an 1 size vector. -------------- -Test pmFindVectorPeaks() with a first-element peak. -Test pmFindVectorPeaks() with a first-element peak, large threshold. --------------- Calling test_pmFindVectorPeaks on an 10 size vector. -------------- -Test pmFindVectorPeaks() with a first-element peak. -Test pmFindVectorPeaks() with a first-element peak, large threshold. -Test pmFindVectorPeaks() with a last-element peak. -Test pmFindVectorPeaks() with a last-element peak, large threshold. -Test pmFindVectorPeaks() with all even-numbered elements peak. -Test pmFindVectorPeaks() with all even-numbered elements peak, large threshold. ----------------------------------------------------------------------------------- -Calling pmFindImagePeaks with NULL psImage. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmFindImagePeaks with empty psImage. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmFindImagePeaks with PS_TYPE_F64 psImage. Should generate error and return NULL. ----------------------------------------------------------------------------------- --------------- Calling test_pmFindImagePeaks on an 5-by-5 image. -------------- -(50.0) (5.0) (4.0) (5.0) (50.0) -(5.0) (2.0) (1.0) (2.0) (5.0) -(4.0) (1.0) (50.0) (1.0) (4.0) -(5.0) (2.0) (1.0) (2.0) (5.0) -(50.0) (5.0) (4.0) (5.0) (50.0) --------------- Calling test_pmFindImagePeaks on an 10-by-5 image. -------------- -(125.0) (26.0) (25.0) (26.0) (125.0) -(20.0) (17.0) (16.0) (17.0) (20.0) -(13.0) (10.0) (9.0) (10.0) (13.0) -(8.0) (5.0) (4.0) (5.0) (8.0) -(5.0) (2.0) (1.0) (2.0) (5.0) -(4.0) (1.0) (125.0) (1.0) (4.0) -(5.0) (2.0) (1.0) (2.0) (5.0) -(8.0) (5.0) (4.0) (5.0) (8.0) -(13.0) (10.0) (9.0) (10.0) (13.0) -(125.0) (17.0) (16.0) (17.0) (125.0) --------------- Calling test_pmFindImagePeaks on an 5-by-10 image. -------------- -(125.0) (20.0) (13.0) (8.0) (5.0) (4.0) (5.0) (8.0) (13.0) (125.0) -(26.0) (17.0) (10.0) (5.0) (2.0) (1.0) (2.0) (5.0) (10.0) (17.0) -(25.0) (16.0) (9.0) (4.0) (1.0) (125.0) (1.0) (4.0) (9.0) (16.0) -(26.0) (17.0) (10.0) (5.0) (2.0) (1.0) (2.0) (5.0) (10.0) (17.0) -(125.0) (20.0) (13.0) (8.0) (5.0) (4.0) (5.0) (8.0) (13.0) (125.0) -(10.0) (0.0) (10.0) (0.0) (10.0) (0.0) (10.0) (0.0) (10.0) (0.0) -(0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) -(12.0) (0.0) (12.0) (0.0) (12.0) (0.0) (12.0) (0.0) (12.0) (0.0) -(0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) -(14.0) (0.0) (14.0) (0.0) (14.0) (0.0) (14.0) (0.0) (14.0) (0.0) -(0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) -(16.0) (0.0) (16.0) (0.0) (16.0) (0.0) (16.0) (0.0) (16.0) (0.0) -(0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) -(18.0) (0.0) (18.0) (0.0) (18.0) (0.0) (18.0) (0.0) (18.0) (0.0) -(0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) (0.0) -Set 25 peaks ----------------------------------------------------------------------------------- -Calling pmCullPeaks with large maxValue and NULL psRegion. ----------------------------------------------------------------------------------- -Calling pmCullPeaks with tiny maxValue and NULL psRegion. -pmFindImagePeaks found 25 peaks ----------------------------------------------------------------------------------- -Calling pmCullPeaks with large maxValue and disjoint psRegion. -pmFindImagePeaks found 25 peaks ----------------------------------------------------------------------------------- -Calling pmCullPeaks with large maxValue and non-disjoint psRegion. -pmFindImagePeaks found 25 peaks ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with NULL tmpSource. Should generate error and return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with Radius<0.0. Should generate error and return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- -Calling pmSourceMoments with NULL pmSource. Should generate error and return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceMoments with radius < 0.0. Should generate error and return FALSE. ----------------------------------------------------------------------------------- Index: unk/psModules/test/pslib/.cvsignore =================================================================== --- /trunk/psModules/test/pslib/.cvsignore (revision 9721) +++ (revision ) @@ -1,5 +1,0 @@ -.deps -.libs -Makefile -Makefile.in -temp Index: unk/psModules/test/pslib/Makefile.am =================================================================== --- /trunk/psModules/test/pslib/Makefile.am (revision 9721) +++ (revision ) @@ -1,14 +1,0 @@ -AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS) -AM_CFLAGS = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC) - -TESTS = - -check_PROGRAMS = $(TESTS) - -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified - -tests: $(TESTS) - -CLEANFILES = $(TESTS) temp/* *~ - -test: check Index: unk/psModules/test/runTest =================================================================== --- /trunk/psModules/test/runTest (revision 9721) +++ (revision ) @@ -1,400 +1,0 @@ -#!/usr/bin/perl -# -# This is a perl script to execute a single test driver program. The script -# will examine the return value of the test driver and capture STDOUT, STDERR -# to files. If the return value of the test driver is not zero, the test is -# deemed a failure. STDOUT and STDERR files will be place in a subdirectory -# named temp and the files will be compared with verified STDOUT, STDERR files -# in a subdirectory named verified. If there are no STDOUT, STDERR files in -# the verified directory, the captured STDOUT, STDERR files will be scanned -# for words which indicate a failure. -# -# Assumptions: A verified subdirectory with STDOUT, STDERR files exists for -# the test driver specified in the arguements if an exact -# match of the streams STDOUT, STDERR is necessary. -# -# Return values: -# Bit mapped values -# 0 Test run successfull and all tests passed -# 1 Verified directory did not exist -# 8 STDOUT files did not compare -# 16 STDERR files did not compare -# 32 Test driver doesn't exist or is not executable -# 64 Test driver did not return zero -# -# SYNOSIS: runTest testDriverName -# -# $Revison: $ $Name: not supported by cvs2svn $ -# $Date: 2005-09-13 20:26:33 $ -# -# Copyright 2004 Maui High Performance Computering Center, University of Hawaii -# -################################################################################ - -# Provides functions for handling psS64 command line options -use Getopt::Long; - -$verifiedDir = "verified"; - -# Assign variables based on the presence of command line options to the script -GetOptions( - "reset!" => \$reset, - "resetStderr!" => \$resetStderr, - "resetStdout!" => \$resetStdout, - "verified=s" => \$verifiedDir, - "help!" => \$help, - "quiet!" => \$quiet, - "printpassfail!" => \$verbose, - "printdiff!" => \$printdiff -); - -if ($help || $#ARGV < 0) { - print "\nUsage: runTest [--help] [--quiet] [--resetStderr] [--resetStdout] [--reset] \\\n", - " [--verified=DIR] [--printpassfail] [--printdiff] testfile(s)\n\n", - "Options include:\n", - " --help Prints this help message\n", - " --quiet Suppresses all messages\n", - " --resetStderr Resets the STDERR expected output file in the verified\n", - " directory\n", - " --resetStdout Resets the STDOUT expected output file in the verified\n", - " directory\n", - " --reset Equivalent to --resetStderr plus --resetStdout\n", - " --verified=DIR Specifies the location of the verified directory\n", - " --printpassfail Prints a PASS or FAIL message for each test in each file\n", - " --printdiff Prints any differences found in the test output and\n", - " verified expected output.\n\n"; - exit(0); -} - -if ($reset) { - $resetStderr = 1; - $resetStdout = 1; -} - -# Initialize exit value -$exitValue = 0; - -# Set up the PSLIB_ROOT environment variable if the user doesn't have it set -if ( $ENV{'PSLIB_ROOT'} ) { - - # Add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment vars - $ENV{'LD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'LD_LIBRARY_PATH'}"; - $ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}"; -} - -# Loop through the arguements passed to the script -foreach (@ARGV) { - chomp; - $testFile = $_; - - # 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`; - } - - # Check if a verified directory exists in the current work directory - if ( !( -e $verifiedDir ) ) { - - # Display message that verified subdirectory doesn't exist - print STDERR " Verified directory doesn't exist.\n"; - - # Exit script since the test cannot be run with verified files - $exitValue = 1; - } - - # Check if the test driver file exists and is executable - if ( ( -e $testFile ) && ( -x $testFile ) ) { - - # Invoke the test driver - system("./$testFile 1> temp/$testFile.stdout 2> temp/$testFile.stderr"); - - # Check the return value of the test driver. A value other than 0 - # indicates failure of the test driver unless the test driver is name - # with a leading 'a' which indicates the test driver is expecting an - # abort condition to terminate the driver. - if ( ( $? != 0 && ( $testFile !~ /^A/i ) ) - || ( $? == 0 && ( $testFile =~ /^A/i ) ) ) - { - - # Display failure message with return value to user - if ( $? != 0 && ( $testFile !~ /^A/i ) ) { - print STDERR "Failed - Test Driver returned $?, expected 0.\n"; - } - elsif ( $? == 0 && ( $testFile =~ /^A/i ) ) { - print STDERR "Failed - Test Driver returned $?, expected abort.\n"; - } - $exitValue |= 64; - } - - # Test driver succeeded. - - # Create filtered version of stdout and stderr - - # Open the STDOUT file for reading - open( OUTFILE, "< temp/$testFile.stdout" ); - - # Open mod file to place filtered STDOUT - open( MODFILE, "> temp/$testFile.stdout.mod" ); - open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout; - - # Replace the variable date, time and host information with constants - $hostname = `hostname`; - chop $hostname; - while () { - s/\s+\d+:\d+:\d+\w/