Index: trunk/psModules/test/camera/tap_pmFPAView.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAView.c (revision 14882) +++ trunk/psModules/test/camera/tap_pmFPAView.c (revision 15987) @@ -5,7 +5,7 @@ #include "tap.h" #include "pstap.h" -// XXX: pmFPAviewThisHDU(): some problems with NULL pmHDUs -// XXX: must test: pmFPAviewThisHDU(), pmFPAviewThisPHU() -// XXX: must test: pmFPAviewThisPHU() +/* STATUS: + All functions are tested. +*/ #define ERR_TRACE_LEVEL 0 @@ -77,10 +77,14 @@ cell->hdu = pmHDUAlloc("cellExtName"); for (int i = 0 ; i < NUM_READOUTS ; i++) { - cell->readouts->data[i] = generateSimpleReadout(cell); - } - - bool rc = pmConfigFileRead(&cell->hdu->format, "data/camera0/format0.config", "Camera format 0"); + cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell)); + } + + // First try to read data from ../dataFiles, then try dataFiles. + bool rc = pmConfigFileRead(&cell->hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); if (!rc) { - diag("pmConfigFileRead() was unsuccessful (from generateSimpleCell())"); + rc = pmConfigFileRead(&cell->hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + diag("pmConfigFileRead() was unsuccessful (from generateSimpleCell())"); + } } @@ -96,7 +100,7 @@ psImageInit(cell->hdu->weights->data[k], (float) (BASE_WEIGHT+k)); } + cell->hdu->blankPHU = true; //XXX: Should the region be set some other way? Like through the various config files? -// psRegion *region = psRegionAlloc(0.0, TEST_NUM_COLS-1, 0.0, TEST_NUM_ROWS-1); psRegion *region = psRegionAlloc(0.0, 0.0, 0.0, 0.0); // You shouldn't have to remove the key from the metadata. Find out how to simply change the key value. @@ -119,19 +123,18 @@ psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); - if (1) { - chip->hdu = pmHDUAlloc("chipExtName"); -// bool rc = pmConfigFileRead(&chip->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleChip())"); -// } - } + chip->hdu = pmHDUAlloc("chipExtName"); + bool rc = pmConfigFileRead(&chip->hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + rc = pmConfigFileRead(&chip->hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + diag("pmConfigFileRead() was unsuccessful (from generateSimpleChip())"); + } + } + chip->hdu->blankPHU = true; psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); - } - - // XXX: Add code to initialize chip pmConcepts - + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); + } return(chip); @@ -151,53 +154,22 @@ psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); - - if (1) { - fpa->hdu = pmHDUAlloc("fpaExtName"); - bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); + fpa->hdu = pmHDUAlloc("fpaExtName"); + bool rc = pmConfigFileRead(&fpa->hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + rc = pmConfigFileRead(&fpa->hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); if (!rc) { diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); } } + fpa->hdu->blankPHU = true; psArrayRealloc(fpa->chips, NUM_CHIPS); for (int i = 0 ; i < NUM_CHIPS ; i++) { - fpa->chips->data[i] = generateSimpleChip(fpa); - } - - // XXX: Eventually, when you finish the pmConcepts tests, add full concept - // reading code from wherever. + fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa)); + } pmConceptsBlankFPA(fpa); -// bool mdok; -// psMetadata *fileData = psMetadataLookupMetadata(&mdok, fpa->hdu->format, "FILE"); -// char *fpaNameHdr = psMetadataLookupStr(&mdok, fileData, "FPA.NAME"); -// psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.NAME", PS_META_REPLACE, NULL, fpaNameHdr); - return(fpa); } -// XXX: This should only be necessary until the psFree() functions for -// FPA/chip/cell/readout correctly free all child chips/cells/readouts -void myFreeCell(pmCell *cell) -{ - for (int k = 0 ; k < cell->readouts->n ; k++) { - psFree(cell->readouts->data[k]); - } - psFree(cell); -} - -void myFreeChip(pmChip *chip) { - for (int j = 0 ; j < chip->cells->n ; j++) { - myFreeCell(chip->cells->data[j]); - } - psFree(chip); -} - -void myFreeFPA(pmFPA *fpa) -{ - for (int i = 0 ; i < fpa->chips->n ; i++) { - myFreeChip(fpa->chips->data[i]); - } - psFree(fpa); -} psS32 main(psS32 argc, char* argv[]) @@ -206,13 +178,13 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(137); + plan_tests(174); + // ---------------------------------------------------------------------- // pmFPAViewAlloc() tests - // XXX: Add memCheckPtr() tests - { - psMemId id = psMemGetId(); - pmFPAview *tmpView = pmFPAviewAlloc(32); - ok(tmpView != NULL, "pmFPAviewAlloc() returned non-NULL"); + { + psMemId id = psMemGetId(); + pmFPAview *tmpView = pmFPAviewAlloc(32); + ok(tmpView != NULL && psMemCheckFPAview(tmpView), "pmFPAviewAlloc() returned non-NULL"); ok(tmpView->nRows == 32, "pmFPAviewAlloc() set ->nRows properly"); psFree(tmpView); @@ -228,4 +200,5 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } + // pmFPAViewReset() tests: acceptable input @@ -340,5 +313,5 @@ ok(NULL == pmFPAviewThisChip(NULL, fpa), "pmFPAviewThisChip(NULL, fpa) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -366,5 +339,5 @@ ok(NULL == pmFPAviewThisChip(tmpView, fpa), "pmFPAviewThisChip(pmFPAView, fpa) returned NULL view input"); fpa->chips = chips; - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -403,5 +376,5 @@ } ok(!errorFlag, "pmFPAviewThisChip() returned the correct pmChip for all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -425,5 +398,5 @@ ok(NULL == pmFPAviewNextChip(NULL, fpa, 0), "pmFPAviewNextChip(NULL, fpa, 0) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -456,5 +429,5 @@ // XXX: Source code is wrong: must guard against input tmpView->chip = -1 tmpView->chip = -1; - ok(NULL == pmFPAviewNextChip(tmpView, fpa, 0), "pmFPAviewNextChip(pmFPAView, fpa, 0) returned NULL with pmFPAView->chip == -1"); + ok(fpa->chips->data[0] == pmFPAviewNextChip(tmpView, fpa, 1), "pmFPAviewNextChip(pmFPAView, fpa, 1) returned NULL with pmFPAView->chip == -1"); // Test with tmpView->chip too high @@ -486,5 +459,5 @@ ok(!errorFlag, "pmFPAviewNextChip() returned the correct pmChip for all tests (step = 1)"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -506,5 +479,5 @@ ok(NULL == pmFPAviewThisCell(NULL, fpa), "pmFPAviewThisCell(NULL, fpa) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -523,6 +496,5 @@ // pmFPAviewThisCell() tests: NULL fpa->chips input - // XXX: Skipping because the source code does not guard against this - if (0) { + { psMemId id = psMemGetId(); psMetadata *camera = psMetadataAlloc(); @@ -533,5 +505,5 @@ ok(NULL == pmFPAviewThisCell(tmpView, fpa), "pmFPAviewThisCell(pmFPAView, fpa) returned NULL view input"); fpa->chips = chips; - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -575,10 +547,9 @@ } ok(!errorFlag, "pmFPAviewThisCell() returned the correct pmCell for all tests"); - myFreeFPA(fpa); - psFree(camera); - psFree(tmpView); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - + psFree(fpa); + psFree(camera); + psFree(tmpView); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } @@ -597,5 +568,5 @@ ok(NULL == pmFPAviewNextCell(NULL, fpa, 0), "pmFPAviewNextCell(NULL, fpa, 0) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -667,5 +638,5 @@ ok(!errorFlag, "pmFPAviewNextCell() returned the correct pmCell for all tests (step = 1)"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -688,5 +659,5 @@ ok(NULL == pmFPAviewThisReadout(NULL, fpa), "pmFPAviewThisReadout(NULL, fpa) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -705,6 +676,5 @@ // pmFPAviewThisReadout() tests: NULL fpa->chips input - // XXX: Skipping because the source code does not guard against this - if (0) { + { psMemId id = psMemGetId(); psMetadata *camera = psMetadataAlloc(); @@ -715,5 +685,5 @@ ok(NULL == pmFPAviewThisReadout(tmpView, fpa), "pmFPAviewThisReadout(pmFPAView, fpa) returned NULL view input"); fpa->chips = chips; - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -761,5 +731,5 @@ ok(!errorFlag, "pmFPAviewThisReadout() returned the correct pmCell for all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -782,5 +752,5 @@ ok(NULL == pmFPAviewNextReadout(NULL, fpa, 0), "pmFPAviewNextReadout(NULL, fpa, 0) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -857,5 +827,5 @@ ok(!errorFlag, "pmFPAviewNextReadout() returned the correct pmCell for all tests (step = 1)"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(tmpView); @@ -877,5 +847,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(NULL == pmFPAviewThisHDU(NULL, fpa), "pmFPAviewThisHDU(NULL, fpa) returned NULL"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -893,59 +863,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // pmFPAviewThisHDU() tests: acceptable input - // pmHDU *pmFPAviewThisHDU(const pmFPAview *view, const pmFPA *fpa) { psMemId id = psMemGetId(); @@ -963,12 +879,11 @@ ok(hdu, "pmFPAviewThisHDU() returned non-NULL with tmpView->chip = -1"); ok(hdu == pmHDUFromFPA(fpa), "pmFPAviewThisHDU() returned the correct HDU"); - tmpView->chip = 16; - - // XXX: These tests fail because the pmHDU functions are returning NULL. Why? + tmpView->chip = NUM_CHIPS/2; + tmpView->cell = -1; hdu = pmFPAviewThisHDU(tmpView, fpa); ok(hdu, "pmFPAviewThisHDU() returned non-NULL with tmpView->cell = -1"); ok(hdu == pmHDUFromChip(pmFPAviewThisChip(tmpView, fpa)), "pmFPAviewThisHDU() returned the correct HDU"); - tmpView->cell = 16; + tmpView->cell = NUM_CELLS/2; tmpView->readout = -1; @@ -976,5 +891,5 @@ ok(hdu, "pmFPAviewThisHDU() returned non-NULL with tmpView->readout = -1"); ok(hdu == pmHDUFromCell(pmFPAviewThisCell(tmpView, fpa)), "pmFPAviewThisHDU() returned the correct HDU"); - tmpView->readout = 16; + tmpView->readout = NUM_READOUTS/2; hdu = pmFPAviewThisHDU(tmpView, fpa); @@ -982,8 +897,126 @@ ok(hdu == pmHDUFromReadout(pmFPAviewThisReadout(tmpView, fpa)), "pmFPAviewThisHDU() returned the correct HDU"); - myFreeFPA(fpa); - psFree(camera); - psFree(tmpView); + psFree(fpa); + psFree(camera); + psFree(tmpView); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmFPAviewThisPHU() tests: NULL view input + // pmHDU *pmFPAviewThisPHU(const pmFPAview *view, const pmFPA *fpa) + { + psMemId id = psMemGetId(); + psMetadata *camera = psMetadataAlloc(); + pmFPA* fpa = generateSimpleFPA(camera); + pmChip *chip = fpa->chips->data[0]; + pmCell *cell = chip->cells->data[0]; + ok(fpa != NULL, "Allocated a pmFPA successfully"); + ok(chip != NULL, "Allocated a pmChip successfully"); + ok(cell != NULL, "Allocated a pmCell successfully"); + ok(NULL == pmFPAviewThisPHU(NULL, fpa), "pmFPAviewThisPHU(NULL, fpa) returned NULL"); + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // pmFPAviewThisPHU() tests: NULL pmFPA input + // pmHDU *pmFPAviewThisPHU(const pmFPAview *view, const pmFPA *fpa) + { + psMemId id = psMemGetId(); + pmFPAview *tmpView = pmFPAviewAlloc(32); + ok(NULL == pmFPAviewThisPHU(tmpView, NULL), "pmFPAviewThisPHU(pmFPAView, NULL) returned NULL"); + psFree(tmpView); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmFPAviewThisPHU() tests: acceptable input + { + psMemId id = psMemGetId(); + psMetadata *camera = psMetadataAlloc(); + pmFPA* fpa = generateSimpleFPA(camera); + pmChip *chip = fpa->chips->data[0]; + pmCell *cell = chip->cells->data[0]; + ok(fpa != NULL, "Allocated a pmFPA successfully"); + ok(chip != NULL, "Allocated a pmChip successfully"); + ok(cell != NULL, "Allocated a pmCell successfully"); + pmFPAview *tmpView = pmFPAviewAlloc(32); + + tmpView->chip = -1; + pmHDU *hdu = pmFPAviewThisPHU(tmpView, fpa); + ok(hdu, "pmFPAviewThisPHU() returned non-NULL with tmpView->chip = -1"); + ok(hdu == pmHDUFromFPA(fpa), "pmFPAviewThisPHU() returned the correct HDU"); + tmpView->chip = NUM_CHIPS/2; + + tmpView->cell = -1; + hdu = pmFPAviewThisPHU(tmpView, fpa); + ok(hdu, "pmFPAviewThisPHU() returned non-NULL with tmpView->cell = -1"); + ok(hdu == pmHDUFromChip(pmFPAviewThisChip(tmpView, fpa)), "pmFPAviewThisPHU() returned the correct HDU"); + tmpView->cell = NUM_CELLS/2; + + tmpView->readout = -1; + hdu = pmFPAviewThisPHU(tmpView, fpa); + ok(hdu, "pmFPAviewThisPHU() returned non-NULL with tmpView->readout = -1"); + ok(hdu == pmHDUFromCell(pmFPAviewThisCell(tmpView, fpa)), "pmFPAviewThisPHU() returned the correct HDU"); + tmpView->readout = NUM_READOUTS/2; + + hdu = pmFPAviewThisPHU(tmpView, fpa); + ok(hdu == NULL, "pmFPAviewThisPHU() returned NULL"); + + psFree(fpa); + psFree(camera); + psFree(tmpView); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmFPAviewGenerate() tests: NULL pmFPA input + { + psMemId id = psMemGetId(); + int chipID = NUM_CHIPS/2; + int cellID = NUM_CELLS/2; + int readoutID = NUM_READOUTS/2; + pmFPA* fpa = generateSimpleFPA(NULL); + pmChip *chip = fpa->chips->data[chipID]; + pmCell *cell = chip->cells->data[cellID]; + pmReadout *readout = cell->readouts->data[readoutID]; + ok(fpa != NULL, "Allocated a pmFPA successfully"); + ok(chip != NULL, "Allocated a pmChip successfully"); + ok(cell != NULL, "Allocated a pmCell successfully"); + ok(readout != NULL, "Allocated a pmReadout successfully"); + pmFPAview *view = pmFPAviewGenerate(NULL, chip, cell, readout); + ok(view == NULL, "pmFPAviewGenerate(NULL, chip, cell, readout) returned NULL"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmFPAviewGenerate() tests: acceptable input parameters + // XX: Add more input combinations. + { + psMemId id = psMemGetId(); + int chipID = NUM_CHIPS/2; + int cellID = NUM_CELLS/2; + int readoutID = NUM_READOUTS/2; + pmFPA* fpa = generateSimpleFPA(NULL); + pmChip *chip = fpa->chips->data[chipID]; + pmCell *cell = chip->cells->data[cellID]; + pmReadout *readout = cell->readouts->data[readoutID]; + ok(fpa != NULL, "Allocated a pmFPA successfully"); + ok(chip != NULL, "Allocated a pmChip successfully"); + ok(cell != NULL, "Allocated a pmCell successfully"); + ok(readout != NULL, "Allocated a pmReadout successfully"); + pmFPAview *view = pmFPAviewGenerate(fpa, chip, cell, readout); + ok(view != NULL && psMemCheckFPAview(view), "pmFPAviewGenerate() returned an pmFPAviw with acceptable input parameters"); + ok(view->chip == chipID, "pmFPAviewGenerate() set pmFPAview->chip correctly"); + ok(view->cell == cellID, "pmFPAviewGenerate() set pmFPAview->cell correctly"); + ok(view->readout == readoutID, "pmFPAviewGenerate() set pmFPAview->readout correctly"); + psFree(view); + psFree(fpa); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } } +