Index: trunk/psModules/test/imcombine/Makefile.am =================================================================== --- trunk/psModules/test/imcombine/Makefile.am (revision 8569) +++ 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: trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stderr =================================================================== --- trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stderr (revision 8569) +++ (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: trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout =================================================================== --- trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout (revision 8569) +++ (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: trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stderr =================================================================== --- trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stderr (revision 8569) +++ (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: trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stdout =================================================================== --- trunk/psModules/test/imcombine/verified/tst_pmReadoutCombine.stdout (revision 8569) +++ (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) -