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