Index: trunk/psModules/test/camera/tap_pmFPA.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPA.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPA.c (revision 15987) @@ -1,25 +1,2 @@ -/** @file tst_pmAstrometry.c - * - * XXX: Untested: pmFPACheckParents() - * - void pmCellFreeReadouts(pmCell *cell) - void pmCellFreeData(pmCell *cell) - void pmChipFreeCells(pmChip *chip) - void pmChipFreeData(pmChip *chip) - void pmFPAFreeData(pmFPA *fpa) - void pmReadoutFreeData(pmReadout *readout) - -* pmReadout *pmReadoutAlloc(pmCell *cell) -* pmCell *pmCellAlloc(pmChip *chip, const char *name) -* pmChip *pmChipAlloc(pmFPA *fpa, const char *name) -* pmFPA *pmFPAAlloc(const psMetadata *camera) - - bool pmFPACheckParents(pmFPA *fpa) - * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-09-18 18:57:18 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - */ #include #include @@ -28,4 +5,7 @@ #include "tap.h" #include "pstap.h" +/* STATUS: + All functions are tested. +*/ #define CHIP_ALLOC_NAME "ChipName" @@ -89,5 +69,5 @@ psArrayRealloc(cell->readouts, NUM_READOUTS); for (int i = 0 ; i < NUM_READOUTS ; i++) { - cell->readouts->data[i] = generateSimpleReadout(cell); + cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell)); } return(cell); @@ -108,5 +88,5 @@ psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); } return(chip); @@ -129,5 +109,5 @@ psArrayRealloc(fpa->chips, NUM_CHIPS); for (int i = 0 ; i < NUM_CHIPS ; i++) { - fpa->chips->data[i] = generateSimpleChip(fpa); + fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa)); } @@ -135,28 +115,4 @@ } -// 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[]) @@ -164,9 +120,18 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(56); + plan_tests(92); // ------------------------------------------------------------------------ // pmFPAAlloc() tests - // XXX: Add tests for NULL inputs. + // Call pmFPAAlloc() with NULL pmCamera input. + { + psMemId id = psMemGetId(); + pmFPA* fpa = pmFPAAlloc(NULL); + ok(fpa != NULL && psMemCheckFPA(fpa), "pmFPAAlloc() returned a non-NULL pmFPA with a NULL pmCamera input"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // Call pmFPAAlloc() with acceptable input parameters. { psMemId id = psMemGetId(); @@ -186,5 +151,4 @@ psMemCheckArray(fpa->chips), "pmFPAAlloc() set ->chips correctly"); ok(fpa->hdu == NULL, "pmFPAAlloc() set ->hdu to NULL"); -// ok(fpa->wrote_phu == false, "pmFPAAlloc() set ->wrote_phu to FALSE"); psFree(fpa); psFree(camera); @@ -192,76 +156,62 @@ } + // Populate the pmFPA struct with real data to ensure they were psFree()'ed correctly. { psMemId id = psMemGetId(); pmFPA* fpa = generateSimpleFPA(NULL); - - myFreeFPA(fpa); -/* - if (1) { - for (int i = 0 ; i < fpa->chips->n ; i++) { - pmChip *chip = fpa->chips->data[i]; - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - for (int k = 0 ; k < cell->readouts->n ; k++) { - pmReadout *readout = cell->readouts->data[k]; - psFree(readout); - } - psFree(cell); - } - psFree(chip); - } - psFree(fpa); - } else { - for (int i = 0 ; i < fpa->chips->n ; i++) { - pmChip *chip = fpa->chips->data[i]; - pmChipFreeCells(chip); - pmChipFreeData(chip); - psFree(chip); - } - psFree(fpa); - } -*/ - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Populate the pmFPA struct with real data)"); + } + // ------------------------------------------------------------------------ // pmFPAFreeData() tests - // XXX: pmFPAAlloc(), pmChipAlloc(), etc, allocate much of the members of - // those data structures. We don't really check that those members were - // actually psFree()'ed; we merely ensure that they were set to NULL. - { - psMemId id = psMemGetId(); - psMetadata *camera = psMetadataAlloc(); - pmFPA* fpa = generateSimpleFPA(camera); -// pmChip *chip = pmChipAlloc(fpa, CHIP_ALLOC_NAME); -// pmCell *cell = pmCellAlloc(chip, CELL_ALLOC_NAME); -// pmReadout *readout = pmReadoutAlloc(cell); + // Call pmFPAFreeData() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + pmFPAFreeData(NULL); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Call pmFPAFreeData() with NULL pmFPA input parameter)"); + } + + + // Call pmFPAFreeData() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmFPA* fpa = generateSimpleFPA(NULL); + fpa->hdu->images = psArrayAlloc(10); + fpa->hdu->weights = psArrayAlloc(10); + fpa->hdu->masks = psArrayAlloc(10); pmFPAFreeData(fpa); ok(fpa->hdu->images == NULL, "pmFPAFreeData() correctly set fpa->hdu->images to NULL"); ok(fpa->hdu->weights == NULL, "pmFPAFreeData() correctly set fpa->hdu->weights to NULL"); ok(fpa->hdu->masks == NULL, "pmFPAFreeData() correctly set fpa->hdu->masks to NULL"); - -// ok(chip->hdu->images == NULL, "pmFPAFreeData() correctly set chip->hdu->images to NULL"); -// ok(chip->hdu->weights == NULL, "pmFPAFreeData() correctly set chip->hdu->weights to NULL"); -// ok(chip->hdu->masks == NULL, "pmFPAFreeData() correctly set chip->hdu->masks to NULL"); -// ok(cell->hdu->images == NULL, "pmFPAFreeData() correctly set cell->hdu->images to NULL"); -// ok(cell->hdu->weights == NULL, "pmFPAFreeData() correctly set cell->hdu->weights to NULL"); -// ok(cell->hdu->masks == NULL, "pmFPAFreeData() correctly set cell->hdu->masks to NULL"); - psFree(camera); - psFree(fpa); -// psFree(chip); -// psFree(cell); -// psFree(readout); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - // ------------------------------------------------------------------------ + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ------------------------------------------------------------------------ + // pmChipAlloc() tests + // Call pmChipAlloc() with NULL input parameters + { + psMemId id = psMemGetId(); + pmChip *chip = pmChipAlloc(NULL, CHIP_ALLOC_NAME); + ok(chip != NULL, "pmChipAlloc() returned non-NULL with NULL pmFPA input parameter"); + psFree(chip); + pmFPA* fpa = generateSimpleFPA(NULL); + chip = pmChipAlloc(fpa, NULL); + ok(chip != NULL, "pmChipAlloc() returned non-NULL with NULL chip name input parameter"); + psFree(fpa); + psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // pmChipAlloc() tests // XXX: Add tests for NULL inputs. { psMemId id = psMemGetId(); - psMetadata *camera = psMetadataAlloc(); - pmFPA* fpa = generateSimpleFPA(camera); + pmFPA* fpa = generateSimpleFPA(NULL); pmChip *chip = pmChipAlloc(fpa, CHIP_ALLOC_NAME); ok(chip != NULL, "pmChipAlloc() returned non-NULL"); @@ -280,10 +230,9 @@ ok(chip->data_exists == false, "pmChipAlloc() set ->data_exists correctly"); ok(chip->hdu == NULL, "pmChipAlloc() set ->hdu to NULL"); -// ok(chip->wrote_phu == false, "pmChipAlloc() set ->wrote_phu correctly"); - psFree(camera); - psFree(fpa); - psFree(chip); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } + psFree(fpa); + psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + // Populate the pmChip struct with real data to ensure they were free'ed correctly. @@ -292,4 +241,51 @@ pmChip *chip = generateSimpleChip(NULL); psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Populate the pmChip struct with real data)"); + } + + + // ------------------------------------------------------------------------ + // pmChipFreeData() tests + // Call pmChipFreeData() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + pmChipFreeData(NULL); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Call pmChipFreeData() with NULL pmFPA input parameter)"); + } + + + // Call pmChipFreeData() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmChip* chip = generateSimpleChip(NULL); + chip->hdu->images = psArrayAlloc(10); + chip->hdu->weights = psArrayAlloc(10); + chip->hdu->masks = psArrayAlloc(10); + pmChipFreeData(chip); + ok(chip->hdu->images == NULL, "pmChipFreeData() correctly set chip->hdu->images to NULL"); + ok(chip->hdu->weights == NULL, "pmChipFreeData() correctly set chip->hdu->weights to NULL"); + ok(chip->hdu->masks == NULL, "pmChipFreeData() correctly set chip->hdu->masks to NULL"); + psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ------------------------------------------------------------------------ + // pmChipFreeCells() tests + // Call pmChipFreeCells() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + pmChipFreeCells(NULL); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Call pmChipFreeCells() with NULL pmFPA input parameter)"); + } + + + // Call pmChipFreeCells() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmChip* chip = generateSimpleChip(NULL); + pmChipFreeCells(chip); + ok(chip->cells->n == 0, "pmChipFreeCells() free'ed chip->cells correctly"); + psFree(chip); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -298,5 +294,22 @@ // ------------------------------------------------------------------------ // pmCellAlloc() tests - // XXX: Add tests for NULL inputs. + // Call pmCellAlloc() with NULL input parameters + { + psMemId id = psMemGetId(); + pmCell *cell = pmCellAlloc(NULL, CELL_ALLOC_NAME); + ok(cell != NULL, "pmCellAlloc returned non-NULL with NULL pmChip input parameter"); + psFree(cell); + + pmChip *chip = pmChipAlloc(NULL, NULL); + cell = pmCellAlloc(chip, NULL); + ok(cell != NULL, "pmCellAlloc returned non-NULL with NULL cell name input parameter"); + psFree(chip); + psFree(cell); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmCellAlloc() tests + // Call pmCellAlloc() with acceptable input parameters { psMemId id = psMemGetId(); @@ -319,5 +332,4 @@ ok(cell->data_exists == false, "pmCellAlloc() set ->data_exists correctly"); ok(cell->hdu == NULL, "pmCellAlloc() set ->hdu to NULL"); -// ok(cell->wrote_phu == false, "pmCellAlloc() set ->wrote_phu correctly"); psFree(camera); psFree(fpa); @@ -326,4 +338,5 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } + // Populate the pmCell struct with real data to ensure they were @@ -333,8 +346,35 @@ pmCell *cell = generateSimpleCell(NULL); psFree(cell); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Populate the pmCell struct with real data)"); + } + + + // ------------------------------------------------------------------------ + // pmCellFreeData() tests + // Call pmCellFreeData() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + pmCellFreeData(NULL); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Call pmCellFreeData() with NULL pmFPA input parameter)"); + } + + + // Call pmCellFreeData() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmCell *cell = generateSimpleCell(NULL); + cell->hdu->images = psArrayAlloc(10); + cell->hdu->weights = psArrayAlloc(10); + cell->hdu->masks = psArrayAlloc(10); + pmCellFreeData(cell); + ok(cell->hdu->images == NULL, "pmCellFreeData() correctly set cell->hdu->images to NULL"); + ok(cell->hdu->weights == NULL, "pmCellFreeData() correctly set cell->hdu->weights to NULL"); + ok(cell->hdu->masks == NULL, "pmCellFreeData() correctly set cell->hdu->masks to NULL"); + psFree(cell); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ------------------------------------------------------------------------ // test pmCellFreeReadouts() { @@ -350,5 +390,15 @@ // ------------------------------------------------------------------------ // pmReadoutAlloc() tests - // XXX: Add tests for NULL inputs. + // Call pmReadoutAlloc() with NULL input parameters + { + psMemId id = psMemGetId(); + pmReadout *readout = pmReadoutAlloc(NULL); + ok(readout != NULL, "pmReadoutAlloc() returned non-NULL with NULL pmCell input parameter"); + psFree(readout); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmReadoutAlloc() with acceptable parameters { psMemId id = psMemGetId(); @@ -380,4 +430,5 @@ } + // Populate the pmReadout struct with real data to ensure they were // psFree()'ed correctly. @@ -390,20 +441,50 @@ } -/* - { - psMemId id = psMemGetId(); - pmReadout *readout = pmReadoutAlloc(NULL); - readout->image = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - readout->mask = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_U8); - readout->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - for (psS32 i = 0 ; i < NUM_BIAS_DATA ; i++) { - psImage *tmpImage = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - psListAdd(readout->bias, PS_LIST_HEAD, tmpImage); - } - psMetadataAddS32(readout->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); - return(readout); - } -*/ - - -} + + // ------------------------------------------------------------------------ + // pmReadoutFreeData() tests + // Call pmReadoutFreeData() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + pmReadoutFreeData(NULL); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks (Call pmReadoutFreeData() with NULL pmFPA input parameter)"); + } + + + // Call pmReadoutFreeData() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + pmReadoutFreeData(readout); + ok(readout->image == NULL, "pmReadoutFreeData() correctly set readout->image to NULL"); + ok(readout->weight == NULL, "pmReadoutFreeData() correctly set readout->weight to NULL"); + ok(readout->mask == NULL, "pmReadoutFreeData() correctly set readout->mask to NULL"); + psFree(readout); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ------------------------------------------------------------------------ + // pmFPACheckParents() tests + // psBool pmFPACheckParents(pmFPA *fpa) + // Call pmFPACheckParents() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + bool rc = pmFPACheckParents(NULL); + ok(rc == false, "pmFPACheckParents() returned FALSE with NULL pmFPA input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmFPACheckParents() tests + // Call pmFPACheckParents() with acceptable input parameters + { + psMemId id = psMemGetId(); + pmFPA* fpa = generateSimpleFPA(NULL); + bool rc = pmFPACheckParents(fpa); + ok(rc == true, "pmFPACheckParents() returned FALSE with acceptable input parameters"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + +} Index: trunk/psModules/test/camera/tap_pmFPACellSquish.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPACellSquish.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPACellSquish.c (revision 15987) @@ -82,10 +82,14 @@ cell->hdu = pmHDUAlloc("cellExtName"); for (int i = 0 ; i < NUM_READOUTS ; i++) { - cell->readouts->data[i] = generateSimpleReadout(cell); + cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell)); } - bool rc = pmConfigFileRead(&cell->hdu->format, "data/camera0/format0.config", "Camera format 0"); + // 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())"); + } } @@ -123,19 +127,9 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// + psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); } - - // XXX: Add code to initialize chip pmConcepts - - return(chip); } @@ -154,50 +148,11 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } - psArrayRealloc(fpa->chips, NUM_CHIPS); for (int i = 0 ; i < NUM_CHIPS ; i++) { - fpa->chips->data[i] = generateSimpleChip(fpa); + fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa)); } - // XXX: Eventually, when you finish the pmConcepts tests, add full concept - // reading code from wherever. 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); } @@ -208,5 +163,5 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(25); + plan_tests(4); @@ -230,7 +185,6 @@ pmCell *cell = chip->cells->data[0]; ok(pmCellSquish(cell, 0, false), "pmCellSquish(NULL) returned NULL"); - myFreeFPA(fpa); psFree(camera); - if (0) psFree(cell); + psFree(fpa); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } Index: trunk/psModules/test/camera/tap_pmFPAConstruct.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAConstruct.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAConstruct.c (revision 15987) @@ -14,5 +14,5 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(72); + plan_tests(9); // ---------------------------------------------------------------------- @@ -34,5 +34,9 @@ { psMetadata *camera = psMetadataAlloc(); - bool rc = pmConfigFileRead(&camera, "data/camera0/camera.config", "CAMERA 0 config file"); + bool rc = pmConfigFileRead(&camera, "dataFiles/camera0/camera.config", "CAMERA 0 config file"); + if (!rc) { + rc = pmConfigFileRead(&camera, "../dataFiles/camera0/camera.config", "CAMERA 0 config file"); + } + // Generate the pmFPA heirarchy psMemId id = psMemGetId(); @@ -44,5 +48,5 @@ } bool errorFlag = false; - ok(fpa->chips->n == 4, "pmFPAConstruct() set fpa->chips->n (%d)", fpa->chips->n); + ok(fpa->chips->n == 2, "pmFPAConstruct() set fpa->chips->n (%d)", fpa->chips->n); for (int chipID = 0 ; chipID < fpa->chips->n ; chipID++) { pmChip *chip = fpa->chips->data[chipID]; Index: trunk/psModules/test/camera/tap_pmFPAExtent.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAExtent.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAExtent.c (revision 15987) @@ -5,9 +5,8 @@ #include "tap.h" #include "pstap.h" -// XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members +/* STATUS: + All functions are tested. +*/ + // XXX: For the genSimpleFPA() code, add IDs to each function so that // the values set in each chip-?cell-?hdu-?image are unique @@ -81,10 +80,13 @@ 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)); + } + + 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, "../camera0/format0.config", "Camera format 0"); + if (!rc) { + diag("pmConfigFileRead() was unsuccessful (from generateSimpleCell())"); + } } @@ -102,5 +104,4 @@ //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. @@ -122,14 +123,7 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); } @@ -153,51 +147,14 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } 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); -} @@ -250,5 +207,5 @@ ok(!errorFlag, "pmReadoutExtent() passed all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -258,5 +215,4 @@ // ---------------------------------------------------------------------- // pmCellExtent() tests: NULL input - // psRegion *pmCellExtent(const pmCell *cell) { psMemId id = psMemGetId(); @@ -312,5 +268,5 @@ ok(!errorFlag, "pmCellExtent() passed all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -321,5 +277,4 @@ // ---------------------------------------------------------------------- // pmChipExtent() tests: NULL input - // psRegion *pmChipExtent(const pmChip *chip) { psMemId id = psMemGetId(); @@ -361,5 +316,5 @@ ok(!errorFlag, "pmChipExtent() passed all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -369,5 +324,4 @@ // ---------------------------------------------------------------------- // pmChipPixels() tests: NULL input - // psRegion *pmChipPixels(const pmChip *chip) { psMemId id = psMemGetId(); @@ -416,5 +370,5 @@ ok(!errorFlag, "pmChipPixels() passed all tests"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -424,5 +378,4 @@ // ---------------------------------------------------------------------- // pmFPAPixels() tests: NULL input - // psRegion *pmFPAPixels(const pmFPA *fpa) { psMemId id = psMemGetId(); @@ -464,11 +417,7 @@ psFree(tstExtent); psFree(actualExtent); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - - - -} +} Index: trunk/psModules/test/camera/tap_pmFPAFlags.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAFlags.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAFlags.c (revision 15987) @@ -5,9 +5,30 @@ #include "tap.h" #include "pstap.h" -// XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members +/* STATUS + TESTED: + pmFPASetFileStatus() + pmChipSetFileStatus() + pmCellSetFileStatus() + + pmFPACheckFileStatus() + pmChipCheckFileStatus() + pmCellCheckFileStatus() + + pmFPASetDataStatus() + pmChipSetDataStatus() + pmCellSetDataStatus() + + pmFPACheckDataStatus() + pmChipCheckDataStatus() + pmCellCheckDataStatus() + pmReadoutCheckDataStatus() + MUST TEST: + pmFPAviewCheckDataStatus() + pmFPASelectChip() + pmChipSelectCell() + pmFPAExcludeChip() + pmChipExcludeCell() +*/ + // XXX: For the genSimpleFPA() code, add IDs to each function so that // the values set in each chip-?cell-?hdu-?image are unique @@ -82,10 +103,13 @@ 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)); + } + + 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())"); + } } @@ -103,5 +127,4 @@ //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. @@ -123,14 +146,7 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); } @@ -154,14 +170,7 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } - psArrayRealloc(fpa->chips, NUM_CHIPS); for (int i = 0 ; i < NUM_CHIPS ; i++) { - fpa->chips->data[i] = generateSimpleChip(fpa); + fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa)); } @@ -169,35 +178,59 @@ // reading code from wherever. 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) -{ +void SetCellFileExists(pmCell *cell) { + cell->file_exists = true; + for (int i = 0 ; i < cell->readouts->n ; i++) { + pmReadout *readout = cell->readouts->data[i]; + readout->file_exists = true; + } +} + +void SetChipFileExists(pmChip *chip) { + chip->file_exists = true; + for (int i = 0 ; i < chip->cells->n ; i++) { + pmCell *cell = chip->cells->data[i]; + cell->file_exists = true; + SetCellFileExists(cell); + } +} + +void SetFPAFileExists(pmFPA *fpa) { for (int i = 0 ; i < fpa->chips->n ; i++) { - myFreeChip(fpa->chips->data[i]); - } - psFree(fpa); + pmChip *chip = fpa->chips->data[i]; + chip->file_exists = true; + SetChipFileExists(chip); + } +} + +void SetReadoutDataExists(pmReadout *readout) { + readout->data_exists = true; +} + +void SetCellDataExists(pmCell *cell) { + cell->data_exists = true; + for (int i = 0 ; i < cell->readouts->n ; i++) { + pmReadout *readout = cell->readouts->data[i]; + readout->data_exists = true; + } +} + +void SetChipDataExists(pmChip *chip) { + chip->data_exists = true; + for (int i = 0 ; i < chip->cells->n ; i++) { + pmCell *cell = chip->cells->data[i]; + cell->data_exists = true; + SetCellDataExists(cell); + } +} + +void SetFPADataExists(pmFPA *fpa) { + for (int i = 0 ; i < fpa->chips->n ; i++) { + pmChip *chip = fpa->chips->data[i]; + chip->data_exists = true; + SetChipDataExists(chip); + } } @@ -208,202 +241,7 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(72); - - // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- - // pmCellSetFileStatus() tests: verify with NULL pmCell param - // bool pmCellSetFileStatus(pmCell *cell, bool status) - { - psMemId id = psMemGetId(); - bool rc = pmCellSetFileStatus(NULL, false); - ok(!rc, "pmCellSetFileStatus() returned FALSE with NULL pmCell param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // pmCellSetFileStatus() tests: verify with acceptable data - // bool pmCellSetFileStatus(pmCell *cell, bool status) - { - psMemId id = psMemGetId(); - // Generate the pmFPA heirarchy - 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"); - - // First, set all flags to FALSE - bool correctStatus = false; - bool rc = pmCellSetFileStatus(cell, correctStatus); - ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); - bool errorFlag = false; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to FALSE"); - - // Second, set all flags to TRUE - correctStatus = true; - rc = pmCellSetFileStatus(cell, correctStatus); - ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to TRUE"); - - // Third, set all flags to FALSE - correctStatus = false; - rc = pmCellSetFileStatus(cell, correctStatus); - ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for readout %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to FALSE"); - - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- - // pmChipSetFileStatus() tests: verify with NULL pmChip param - // bool pmChipSetFileStatus(pmChip *chip, bool status) - { - psMemId id = psMemGetId(); - bool rc = pmChipSetFileStatus(NULL, false); - ok(!rc, "pmChipSetFileStatus() returned FALSE with NULL pmChip param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // pmChipSetFileStatus() tests: verify with acceptable data - // bool pmChipSetFileStatus(pmChip *chip, bool status) - { - psMemId id = psMemGetId(); - // Generate the pmFPA heirarchy - 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"); - - // First, set all flags to FALSE - bool correctStatus = false; - bool rc = pmChipSetFileStatus(chip, correctStatus); - ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); - bool errorFlag = false; - if (chip->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to FALSE"); - - // Second, set all flags to TRUE - correctStatus = true; - rc = pmChipSetFileStatus(chip, correctStatus); - ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (chip->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to TRUE"); - - // Third, set all flags to FALSE - correctStatus = false; - rc = pmChipSetFileStatus(chip, correctStatus); - ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (chip->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->file_exists != correctStatus) { - diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to FALSE"); - - - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - // ---------------------------------------------------------------------- + plan_tests(107); + + // ---------------------------------------------------------------------- // pmFPASetFileStatus() tests: verify with NULL pmFPA param @@ -505,23 +343,23 @@ ok(!errorFlag, "pmFPASetFileStatus() set file status in all cells to FALSE"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- - // pmCellSetDataStatus() tests: verify with NULL pmCell param - // bool pmCellSetDataStatus(pmCell *cell, bool status) - { - psMemId id = psMemGetId(); - bool rc = pmCellSetDataStatus(NULL, false); - ok(!rc, "pmCellSetDataStatus() returned FALSE with NULL pmCell param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // pmCellSetDataStatus() tests: verify with acceptable data - // bool pmCellSetDataStatus(pmCell *cell, bool status) + + // ---------------------------------------------------------------------- + // pmChipSetFileStatus() tests: verify with NULL pmChip param + // bool pmChipSetFileStatus(pmChip *chip, bool status) + { + psMemId id = psMemGetId(); + bool rc = pmChipSetFileStatus(NULL, false); + ok(!rc, "pmChipSetFileStatus() returned FALSE with NULL pmChip param"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmChipSetFileStatus() tests: verify with acceptable data + // bool pmChipSetFileStatus(pmChip *chip, bool status) { psMemId id = psMemGetId(); @@ -537,57 +375,82 @@ // First, set all flags to FALSE bool correctStatus = false; - bool rc = pmCellSetDataStatus(cell, correctStatus); - ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); + bool rc = pmChipSetFileStatus(chip, correctStatus); + ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); bool errorFlag = false; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to FALSE"); + if (chip->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to FALSE"); // Second, set all flags to TRUE correctStatus = true; - rc = pmCellSetDataStatus(cell, correctStatus); - ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to TRUE"); + rc = pmChipSetFileStatus(chip, correctStatus); + ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (chip->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to TRUE"); // Third, set all flags to FALSE correctStatus = false; - rc = pmCellSetDataStatus(cell, correctStatus); - ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); - errorFlag = true; - } - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for readout %d\n", i); - errorFlag = true; - } - } - ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to FALSE"); - - myFreeFPA(fpa); + rc = pmChipSetFileStatus(chip, correctStatus); + ok(rc, "pmChipSetFileStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (chip->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for chip param"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmChipSetFileStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetFileStatus() set file status in all cells to FALSE"); + + + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -596,17 +459,15 @@ // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- - // pmChipSetDataStatus() tests: verify with NULL pmChip param - // bool pmChipSetDataStatus(pmChip *chip, bool status) - { - psMemId id = psMemGetId(); - bool rc = pmChipSetDataStatus(NULL, false); - ok(!rc, "pmChipSetDataStatus() returned FALSE with NULL pmChip param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // pmChipSetDataStatus() tests: verify with acceptable data - // bool pmChipSetDataStatus(pmChip *chip, bool status) + // pmCellSetFileStatus() tests: verify with NULL pmCell param + { + psMemId id = psMemGetId(); + bool rc = pmCellSetFileStatus(NULL, false); + ok(!rc, "pmCellSetFileStatus() returned FALSE with NULL pmCell param"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmCellSetFileStatus() tests: verify with acceptable data + // bool pmCellSetFileStatus(pmCell *cell, bool status) { psMemId id = psMemGetId(); @@ -622,98 +483,148 @@ // First, set all flags to FALSE bool correctStatus = false; - bool rc = pmChipSetDataStatus(chip, correctStatus); - ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); + bool rc = pmCellSetFileStatus(cell, correctStatus); + ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); bool errorFlag = false; - if (chip->data_exists != correctStatus) { - diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to FALSE"); + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to FALSE"); // Second, set all flags to TRUE correctStatus = true; - rc = pmChipSetDataStatus(chip, correctStatus); - ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (chip->data_exists != correctStatus) { - diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to TRUE"); - - // ThirdSecond, set all flags to FALSE + rc = pmCellSetFileStatus(cell, correctStatus); + ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to TRUE"); + + // Third, set all flags to FALSE correctStatus = false; - rc = pmChipSetDataStatus(chip, correctStatus); - ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); - errorFlag = false; - if (chip->data_exists != correctStatus) { - diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); - errorFlag = true; - } - for (int j = 0 ; j < chip->cells->n ; j++) { - pmCell *cell = chip->cells->data[j]; - if (cell->data_exists != correctStatus) { - diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); - errorFlag = true; - } - - for (int i = 0; i < cell->readouts->n; i++) { - pmReadout *readout = cell->readouts->data[i]; - if (readout->data_exists != correctStatus) { - diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); - errorFlag = true; - } - } - } - ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to FALSE"); - - - myFreeFPA(fpa); + rc = pmCellSetFileStatus(cell, correctStatus); + ok(rc, "pmCellSetFileStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (cell->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->file_exists != correctStatus) { + diag("TEST ERROR: pmCellSetFileStatus() failed to set file status for readout %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetFileStatus() set file status in all cells to FALSE"); + + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- - // pmFPASetFileStatus() tests: verify with NULL pmFPA param - // bool pmFPASetFileStatus(pmFPA *fpa, bool status) - { - psMemId id = psMemGetId(); - bool rc = pmFPASetFileStatus(NULL, false); - ok(!rc, "pmFPASetFileStatus() returned FALSE with NULL pmFPA param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - + + // ---------------------------------------------------------------------- + // pmFPACheckFileStatus() tests + // bool pmFPACheckFileStatus(const pmFPA *fpa) + // Call with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + bool rc = pmFPACheckFileStatus(NULL); + ok(rc == false, "pmFPACheckFileStatus() returned FALSE with NULL pmFPA input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameters + { + psMemId id = psMemGetId(); + pmFPA *fpa = generateSimpleFPA(NULL); + bool rc = pmFPACheckFileStatus(fpa); + ok(rc == false, "pmFPACheckFileStatus() returned FALSE with NULL pmFPA input parameter"); + SetFPAFileExists(fpa); + rc = pmFPACheckFileStatus(fpa); + ok(rc == true, "pmFPACheckFileStatus() returned TRUE with NULL pmFPA input parameter"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmChipCheckFileStatus() tests + // Call with NULL pmChip input parameter + { + psMemId id = psMemGetId(); + bool rc = pmChipCheckFileStatus(NULL); + ok(rc == false, "pmChipCheckFileStatus() returned FALSE with NULL pmChip input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameter + { + psMemId id = psMemGetId(); + pmChip *chip = generateSimpleChip(NULL); + bool rc = pmChipCheckFileStatus(chip); + ok(rc == false, "pmChipCheckFileStatus() returned FALSE with NULL pmChip input parameter"); + SetChipFileExists(chip); + rc = pmChipCheckFileStatus(chip); + ok(rc == true, "pmChipCheckFileStatus() returned TRUE with NULL pmChip input parameter"); + psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmCellCheckFileStatus() tests + // bool pmCellCheckFileStatus(const pmCell *cell) + // Call with NULL pmCell input parameter + { + psMemId id = psMemGetId(); + bool rc = pmCellCheckFileStatus(NULL); + ok(rc == false, "pmCellCheckFileStatus() returned FALSE with NULL pmCell input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameters + { + psMemId id = psMemGetId(); + pmCell *cell = generateSimpleCell(NULL); + bool rc = pmCellCheckFileStatus(cell); + ok(rc == false, "pmCellCheckFileStatus() returned FALSE with acceptable input parameters"); + SetCellFileExists(cell); + rc = pmCellCheckFileStatus(cell); + ok(rc == true, "pmCellCheckFileStatus() returned TRUE with acceptable input parameters"); + psFree(cell); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmFPASetDataStatus() tests: verify with NULL pmFPA param + { + psMemId id = psMemGetId(); + bool rc = pmFPASetDataStatus(NULL, false); + ok(!rc, "pmFPASetDataStatus() returned FALSE with NULL pmFPA param"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } @@ -806,8 +717,303 @@ ok(!errorFlag, "pmFPASetDataStatus() set file status in all cells to FALSE"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } -} + + // ---------------------------------------------------------------------- + // pmChipSetDataStatus() tests: verify with NULL pmChip param + // bool pmChipSetDataStatus(pmChip *chip, bool status) + { + psMemId id = psMemGetId(); + bool rc = pmChipSetDataStatus(NULL, false); + ok(!rc, "pmChipSetDataStatus() returned FALSE with NULL pmChip param"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmChipSetDataStatus() tests: verify with acceptable data + // bool pmChipSetDataStatus(pmChip *chip, bool status) + { + psMemId id = psMemGetId(); + // Generate the pmFPA heirarchy + 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"); + + // First, set all flags to FALSE + bool correctStatus = false; + bool rc = pmChipSetDataStatus(chip, correctStatus); + ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); + bool errorFlag = false; + if (chip->data_exists != correctStatus) { + diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to FALSE"); + + // Second, set all flags to TRUE + correctStatus = true; + rc = pmChipSetDataStatus(chip, correctStatus); + ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (chip->data_exists != correctStatus) { + diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to TRUE"); + + // ThirdSecond, set all flags to FALSE + correctStatus = false; + rc = pmChipSetDataStatus(chip, correctStatus); + ok(rc, "pmChipSetDataStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (chip->data_exists != correctStatus) { + diag("TEST ERROR (a): pmChipSetDataStatus() failed to set file status for chip param\n"); + errorFlag = true; + } + for (int j = 0 ; j < chip->cells->n ; j++) { + pmCell *cell = chip->cells->data[j]; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR (b): pmChipSetDataStatus() failed to set file status for cell %d\n", j); + errorFlag = true; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR (c): pmChipSetDataStatus() failed to set file status for cell %d readout %d\n", j, i); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmChipSetDataStatus() set data status in all cells to FALSE"); + + + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmCellSetDataStatus() tests: verify with NULL pmCell param + // bool pmCellSetDataStatus(pmCell *cell, bool status) + { + psMemId id = psMemGetId(); + bool rc = pmCellSetDataStatus(NULL, false); + ok(!rc, "pmCellSetDataStatus() returned FALSE with NULL pmCell param"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // pmCellSetDataStatus() tests: verify with acceptable data + // bool pmCellSetDataStatus(pmCell *cell, bool status) + { + psMemId id = psMemGetId(); + // Generate the pmFPA heirarchy + 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"); + + // First, set all flags to FALSE + bool correctStatus = false; + bool rc = pmCellSetDataStatus(cell, correctStatus); + ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); + bool errorFlag = false; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to FALSE"); + + // Second, set all flags to TRUE + correctStatus = true; + rc = pmCellSetDataStatus(cell, correctStatus); + ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to TRUE"); + + // Third, set all flags to FALSE + correctStatus = false; + rc = pmCellSetDataStatus(cell, correctStatus); + ok(rc, "pmCellSetDataStatus() returned successfully with acceptable input params"); + errorFlag = false; + if (cell->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for cell param\n"); + errorFlag = true; + } + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (readout->data_exists != correctStatus) { + diag("TEST ERROR: pmCellSetDataStatus() failed to set file status for readout %d\n", i); + errorFlag = true; + } + } + ok(!errorFlag, "pmCellSetDataStatus() set data status in all cells to FALSE"); + + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmFPACheckDataStatus() tests + // bool pmFPACheckDataStatus(const pmFPA *fpa) + // Call with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + bool rc = pmFPACheckDataStatus(NULL); + ok(rc == false, "pmFPACheckDataStatus() returned FALSE with NULL pmFPA input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameters + { + psMemId id = psMemGetId(); + pmFPA *fpa = generateSimpleFPA(NULL); + bool rc = pmFPACheckDataStatus(fpa); + ok(rc == false, "pmFPACheckDataStatus() returned FALSE with NULL pmFPA input parameter"); + SetFPADataExists(fpa); + rc = pmFPACheckDataStatus(fpa); + ok(rc == true, "pmFPACheckDataStatus() returned TRUE with NULL pmFPA input parameter"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmChipCheckDataStatus() tests + // Call with NULL pmChip input parameter + { + psMemId id = psMemGetId(); + bool rc = pmChipCheckDataStatus(NULL); + ok(rc == false, "pmChipCheckDataStatus() returned FALSE with NULL pmChip input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameter + { + psMemId id = psMemGetId(); + pmChip *chip = generateSimpleChip(NULL); + bool rc = pmChipCheckDataStatus(chip); + ok(rc == false, "pmChipCheckDataStatus() returned FALSE with NULL pmChip input parameter"); + SetChipDataExists(chip); + rc = pmChipCheckDataStatus(chip); + ok(rc == true, "pmChipCheckDataStatus() returned TRUE with NULL pmChip input parameter"); + psFree(chip); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmCellCheckDataStatus() tests + // bool pmCellCheckDataStatus(const pmCell *cell) + // Call with NULL pmCell input parameter + { + psMemId id = psMemGetId(); + bool rc = pmCellCheckDataStatus(NULL); + ok(rc == false, "pmCellCheckDataStatus() returned FALSE with NULL pmCell input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameters + { + psMemId id = psMemGetId(); + pmCell *cell = generateSimpleCell(NULL); + bool rc = pmCellCheckDataStatus(cell); + ok(rc == false, "pmCellCheckDataStatus() returned FALSE with acceptable input parameters"); + SetCellDataExists(cell); + rc = pmCellCheckDataStatus(cell); + ok(rc == true, "pmCellCheckDataStatus() returned TRUE with acceptable input parameters"); + psFree(cell); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmReadoutCheckDataStatus() tests + // bool pmReadoutCheckDataStatus(const pmReadout *readout) + // Call with NULL pmReadout input parameter + { + psMemId id = psMemGetId(); + bool rc = pmReadoutCheckDataStatus(NULL); + ok(rc == false, "pmReadoutCheckDataStatus() returned FALSE with NULL pmReadout input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call with acceptable input parameters + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + bool rc = pmReadoutCheckDataStatus(readout); + ok(rc == false, "pmReadoutCheckDataStatus() returned FALSE with acceptable input parameters"); + SetReadoutDataExists(readout); + rc = pmReadoutCheckDataStatus(readout); + ok(rc == true, "pmReadoutCheckDataStatus() returned TRUE with acceptable input parameters"); + psFree(readout); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } +} Index: trunk/psModules/test/camera/tap_pmFPAHeader.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAHeader.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAHeader.c (revision 15987) @@ -5,12 +5,7 @@ #include "tap.h" #include "pstap.h" -// XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members -// XXX: For the genSimpleFPA() code, add IDs to each function so that -// the values set in each chip-?cell-?hdu-?image are unique -// XXX: For the genSimpleFPA() code, write masks and weights as well +/* STATUS: + All functions are tested. +*/ #define CHIP_ALLOC_NAME "ChipName" @@ -84,10 +79,14 @@ cell->hdu = pmHDUAlloc(extname); 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())"); + } } @@ -104,8 +103,6 @@ } - //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. + // You shouldn't have to remove the key from the metadata. psMetadataRemoveKey(cell->concepts, "CELL.TRIMSEC"); psMetadataAddPtr(cell->concepts, PS_LIST_TAIL|PS_META_REPLACE, "CELL.TRIMSEC", PS_DATA_REGION, "I am a region", region); @@ -134,10 +131,6 @@ psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip, i); - } - - // XXX: Add code to initialize chip pmConcepts - - + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip, i)); + } return(chip); } @@ -156,51 +149,13 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } psArrayRealloc(fpa->chips, NUM_CHIPS); for (int i = 0 ; i < NUM_CHIPS ; i++) { - fpa->chips->data[i] = generateSimpleChip(fpa, i); - } - - // XXX: Eventually, when you finish the pmConcepts tests, add full concept - // reading code from wherever. + fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa, i)); + } 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); -} @@ -210,5 +165,5 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(25); + plan_tests(75); @@ -225,5 +180,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmCellReadHeader(cell, NULL), "pmCellReadHeader(cell, NULL) returned FALSE"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -245,5 +200,4 @@ { psMemId id = psMemGetId(); - // Create a FITS file for this test psFits* fitsFileW = psFitsOpen(fitsFilename, "w"); @@ -264,5 +218,8 @@ psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYSTR", PS_DATA_STRING, "String Item", extname); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWrite(hdu, fitsFileW); @@ -289,5 +246,5 @@ // elsewhere. However, if we should test it, test it here. - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(fitsFileR); @@ -308,5 +265,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmChipReadHeader(chip, NULL), "pmChipReadHeader(chip, NULL) returned FALSE"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -347,5 +304,8 @@ psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYSTR", PS_DATA_STRING, "String Item", extname); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWrite(hdu, fitsFileW); @@ -382,5 +342,5 @@ // elsewhere. However, if we should test it, test it here. - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(fitsFileR); @@ -401,5 +361,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmFPAReadHeader(fpa, NULL), "pmFPAReadHeader(fpa, NULL) returned FALSE"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -440,5 +400,8 @@ psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYSTR", PS_DATA_STRING, "String Item", extname); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWrite(hdu, fitsFileW); @@ -476,13 +439,9 @@ // elsewhere. However, if we should test it, test it here. - myFreeFPA(fpa); + psFree(fpa); psFree(camera); psFree(fitsFileR); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - - - -} - +} + Index: trunk/psModules/test/camera/tap_pmFPALevel.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPALevel.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPALevel.c (revision 15987) @@ -5,4 +5,8 @@ #include "tap.h" #include "pstap.h" +/* STATUS: + All functions are tested. + XXX: Add tests for bad input parameters. +*/ #define ERR_TRACE_LEVEL 0 @@ -13,7 +17,6 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(15); + plan_tests(14); - // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // pmFPALevelToName(): tests @@ -43,12 +46,9 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- // pmFPALevelFromName(): tests - // pmFPALevel pmFPALevelFromName(const char *name) { psMemId id = psMemGetId(); Index: trunk/psModules/test/camera/tap_pmFPAMaskW.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAMaskW.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAMaskW.c (revision 15987) @@ -6,8 +6,4 @@ #include "pstap.h" // XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members // XXX: For the genSimpleFPA() code, add IDs to each function so that // the values set in each chip-?cell-?hdu-?image are unique @@ -98,10 +94,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())"); + } } @@ -119,7 +119,6 @@ //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. + // You shouldn't have to remove the key from the metadata. psMetadataRemoveKey(cell->concepts, "CELL.TRIMSEC"); psMetadataAddPtr(cell->concepts, PS_LIST_TAIL|PS_META_REPLACE, "CELL.TRIMSEC", PS_DATA_REGION, "I am a region", region); @@ -139,19 +138,9 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// + 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); } @@ -170,50 +159,11 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } 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); } @@ -309,5 +259,5 @@ } ok(!errorFlag, "pmReadoutSetMask() set the mask values correctly"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -395,5 +345,5 @@ ok(!errorFlag, "pmReadoutGenerateMask() set the mask values correctly"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -467,11 +417,8 @@ ok(!errorFlag, "pmReadoutSetWeight() set the weight values correctly (Poisson)"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - - -} - +} + Index: trunk/psModules/test/camera/tap_pmFPAReadWrite.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAReadWrite.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAReadWrite.c (revision 15987) @@ -29,5 +29,5 @@ #define BASE_WEIGHT 70 #define VERBOSE 0 -#define ERR_TRACE_LEVEL 0 +#define ERR_TRACE_LEVEL 10 psPlaneTransform *PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM() @@ -80,10 +80,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())"); + } } @@ -101,5 +105,4 @@ //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. @@ -121,14 +124,8 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// + psArrayRealloc(chip->cells, NUM_CELLS); for (int i = 0 ; i < NUM_CELLS ; i++) { - chip->cells->data[i] = generateSimpleCell(chip); + chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip)); } @@ -152,50 +149,11 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } 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); } @@ -206,5 +164,5 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(405); + plan_tests(22); // ---------------------------------------------------------------------- @@ -212,5 +170,5 @@ // pmCellWrite(): tests // Verify pmCellWrite() with NULL pmCell arg - { + if (0) { psMemId id = psMemGetId(); psFits* fitsFileW = psFitsOpen(".tmp00", "w"); @@ -220,7 +178,8 @@ } + // Verify pmCellWrite() with NULL pmCell arg // XXXX: Big problem: Without the next code, everything else fails. Why? - if (1) { + if (0) { psMemId id = psMemGetId(); psFits* fitsFileW = psFitsOpen(".tmp00", "w"); @@ -232,5 +191,5 @@ // Verify pmCellWrite() with NULL pmFits arg - { + if (0) { psMemId id = psMemGetId(); psMetadata *camera = psMetadataAlloc(); @@ -240,5 +199,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmCellWrite(cell, NULL, NULL, false), "pmCellWrite() returned FALSE with NULL psFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -265,9 +224,8 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } // ---------------------------------------------------------------------- @@ -291,5 +249,5 @@ pmCell *cell = chip->cells->data[0]; ok(!pmCellRead(cell, NULL, NULL), "pmCellRead() returned FALSE with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -313,4 +271,5 @@ rc = pmCellRead(cell, fitsFileR, NULL); ok(rc, "pmCellRead() returned TRUE"); + skip_start(!rc, 1, "Skipping tests because pmCellRead returned NULL"); for (int k = 0 ; k < cell->hdu->images->n ; k++) { bool errorFlag = false; @@ -327,6 +286,7 @@ ok(!errorFlag, "pmCellWrite()/pmCellRead() properly set the image data (image %d)", k); } - psFitsClose(fitsFileR); - myFreeFPA(fpa); + skip_end(); + psFitsClose(fitsFileR); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -356,5 +316,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmCellWriteWeight(cell, NULL, NULL, false), "pmCellWriteWeight() returned FALSE with NULL psFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -381,5 +341,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -407,5 +367,5 @@ pmCell *cell = chip->cells->data[0]; ok(!pmCellReadWeight(cell, NULL, NULL), "pmCellReadWeight() returned FALSE with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -444,5 +404,5 @@ } psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -473,5 +433,5 @@ ok(cell != NULL, "Allocated a pmCell successfully"); ok(!pmCellWriteMask(cell, NULL, NULL, false), "pmCellWriteMask() returned FALSE with NULL psFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -498,5 +458,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -524,5 +484,5 @@ pmCell *cell = chip->cells->data[0]; ok(!pmCellReadMask(cell, NULL, NULL), "pmCellReadMask() returned FALSE with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -570,5 +530,5 @@ } psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -599,5 +559,5 @@ ok(chip != NULL, "Allocated a pmChip successfully"); ok(!pmChipWrite(chip, NULL, NULL, false, true), "pmChipWrite() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -621,5 +581,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -646,5 +606,5 @@ pmChip *chip = fpa->chips->data[0]; ok(!pmChipRead(chip, NULL, NULL), "pmChipRead() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -663,5 +623,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -676,5 +636,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->images->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *img = cell->hdu->images->data[k]; for (int i = 0 ; i < img->numRows ; i++) { @@ -692,5 +652,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -719,5 +679,5 @@ ok(chip != NULL, "Allocated a pmChip successfully"); ok(!pmChipWriteWeight(chip, NULL, NULL, false, true), "pmChipWriteWeight() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -741,5 +701,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -766,5 +726,5 @@ pmChip *chip = fpa->chips->data[0]; ok(!pmChipReadMask(chip, NULL, NULL), "pmChipReadMask() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -783,5 +743,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -796,5 +756,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->weights->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *wgt = cell->hdu->weights->data[k]; for (int i = 0 ; i < wgt->numRows ; i++) { @@ -812,5 +772,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -837,5 +797,5 @@ pmChip *chip = fpa->chips->data[0]; ok(!pmChipReadMask(chip, NULL, NULL), "pmChipReadMask() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -854,5 +814,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -867,5 +827,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->masks->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *msk = cell->hdu->masks->data[k]; for (int i = 0 ; i < msk->numRows ; i++) { @@ -883,5 +843,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -911,5 +871,5 @@ ok(fpa != NULL, "Allocated a pmFPA successfully"); ok(!pmFPAWrite(fpa, NULL, NULL, false, true), "pmFPAWrite() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -929,5 +889,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -953,5 +913,5 @@ pmFPA* fpa = generateSimpleFPA(camera); ok(!pmFPARead(fpa, NULL, NULL), "pmFPARead() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -971,5 +931,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -988,5 +948,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->images->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *img = cell->hdu->images->data[k]; for (int i = 0 ; i < img->numRows ; i++) { @@ -1005,5 +965,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1033,5 +993,5 @@ ok(fpa != NULL, "Allocated a pmFPA successfully"); ok(!pmFPAWriteWeight(fpa, NULL, NULL, false, true), "pmFPAWriteWeight() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1051,5 +1011,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1075,5 +1035,5 @@ pmFPA* fpa = generateSimpleFPA(camera); ok(!pmFPARead(fpa, NULL, NULL), "pmFPAReadWeight() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1093,5 +1053,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -1110,5 +1070,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->weights->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *wgt = cell->hdu->weights->data[k]; for (int i = 0 ; i < wgt->numRows ; i++) { @@ -1127,5 +1087,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1155,5 +1115,5 @@ ok(fpa != NULL, "Allocated a pmFPA successfully"); ok(!pmFPAWriteMask(fpa, NULL, NULL, false, true), "pmFPAWriteMask() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1173,5 +1133,5 @@ // Close the FITS file, free memory psFitsClose(fitsFileW); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1197,5 +1157,5 @@ pmFPA* fpa = generateSimpleFPA(camera); ok(!pmFPARead(fpa, NULL, NULL), "pmFPAReadMask() returned NULL with NULL pmFits param"); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -1215,5 +1175,5 @@ for (int chipID = 0 ; chipID < chip->cells->n ; chipID++) { pmCell *cell = (pmCell *) chip->cells->data[chipID]; - myFreeCell(cell); + psFree(cell); cell = NULL; } @@ -1232,5 +1192,5 @@ pmCell *cell = (pmCell *) chip->cells->data[chipID]; for (int k = 0 ; k < cell->hdu->masks->n ; k++) { - if (VERBOSE) diag("Cool: image %d\n", k); + if (VERBOSE) diag("NOTE: image %d\n", k); psImage *msk = cell->hdu->masks->data[k]; for (int i = 0 ; i < msk->numRows ; i++) { @@ -1249,5 +1209,5 @@ psFitsClose(fitsFileR); - myFreeFPA(fpa); + psFree(fpa); psFree(camera); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); Index: trunk/psModules/test/camera/tap_pmFPAUtils.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAUtils.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmFPAUtils.c (revision 15987) @@ -5,12 +5,7 @@ #include "tap.h" #include "pstap.h" -// XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members -// XXX: For the genSimpleFPA() code, add IDs to each function so that -// the values set in each chip-?cell-?hdu-?image are unique -// XXX: For the genSimpleFPA() code, write masks and weights as well +/* STATUS: + All functions are tested. +*/ #define CHIP_ALLOC_NAME "ChipName" @@ -81,10 +76,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())"); + } } @@ -102,7 +101,6 @@ //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. + // You shouldn't have to remove the key from the metadata. psMetadataRemoveKey(cell->concepts, "CELL.TRIMSEC"); psMetadataAddPtr(cell->concepts, PS_LIST_TAIL|PS_META_REPLACE, "CELL.TRIMSEC", PS_DATA_REGION, "I am a region", region); @@ -122,19 +120,9 @@ psMetadataAddS32(chip->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); psMetadataAddS32(chip->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); -// 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())"); -// } -// + 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); } @@ -153,50 +141,11 @@ 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); -// fpa->hdu = pmHDUAlloc("fpaExtName"); -// -// bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); -// if (!rc) { -// diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); -// } 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); } @@ -207,48 +156,48 @@ psLogSetLevel(PS_LOG_INFO); psTraceSetLevel("err", ERR_TRACE_LEVEL); - plan_tests(72); + plan_tests(40); + // ---------------------------------------------------------------------- - // int pmFPAFindChip(const pmFPA *fpa, const char *name) - { - psMemId id = psMemGetId(); - int rc = pmFPAFindChip(NULL, "bogus"); - ok(-1 == rc, "pmFPAFindChip() returns -1 with NULL pmFPA input param"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // int pmFPAFindChip(const pmFPA *fpa, const char *name) + // pmFPAFindChip() tests + // Call pmFPAFindChip() with NULL pmFPA input parameter + { + psMemId id = psMemGetId(); + int rc = pmFPAFindChip(NULL, "chip-0"); + ok(-1 == rc, "pmFPAFindChip() returns -1 with NULL pmFPA input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmFPAFindChip() with bogus chip name + { + psMemId id = psMemGetId(); + pmFPA* fpa = generateSimpleFPA(NULL); + int rc = pmFPAFindChip(fpa, "bogus"); + ok(-1 == rc, "pmFPAFindChip() returns -1 with bogus chip name"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmFPAFindChip() with NULL chip name { psMemId id = psMemGetId(); // Generate the pmFPA heirarchy - 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"); + pmFPA* fpa = generateSimpleFPA(NULL); + ok(fpa != NULL, "Allocated a pmFPA successfully"); int rc = pmFPAFindChip(fpa, NULL); ok(-1 == rc, "pmFPAFindChip() returns -1 with NULL name input param"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // int pmFPAFindChip(const pmFPA *fpa, const char *name) + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmFPAFindChip() with acceptable input parameters { psMemId id = psMemGetId(); // Generate the pmFPA heirarchy - 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"); + pmFPA* fpa = generateSimpleFPA(NULL); + ok(fpa != NULL, "Allocated a pmFPA successfully"); // Set unique chip names for (int chipID = 0 ; chipID < fpa->chips->n ; chipID++) { @@ -267,6 +216,5 @@ } - myFreeFPA(fpa); - psFree(camera); + psFree(fpa); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -275,20 +223,30 @@ // ---------------------------------------------------------------------- - // int pmChipFindCell(const pmChip *chip, const char *name) - { - psMemId id = psMemGetId(); - int rc = pmChipFindCell(NULL, "bogus"); + // pmChipFindCell() tests + // Call pmChipFindCell() with bogus cell name + { + psMemId id = psMemGetId(); + int rc = pmChipFindCell(NULL, "cell-0"); ok(-1 == rc, "pmChipFindCell() returns -1 with NULL pmChip input param"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - // ---------------------------------------------------------------------- - // int pmChipFindCell(const pmChip *chip, const char *name) + // Call pmChipFindCell() with bogus cell name + { + psMemId id = psMemGetId(); + pmFPA* fpa = generateSimpleFPA(NULL); + pmChip *chip = fpa->chips->data[0]; + int rc = pmChipFindCell(chip, "bogus"); + ok(-1 == rc, "pmChipFindCell() returns -1 with bogus cell name"); + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmChipFindCell() with NULL cell name { psMemId id = psMemGetId(); // Generate the pmChip heirarchy - psMetadata *camera = psMetadataAlloc(); - pmFPA* fpa = generateSimpleFPA(camera); + pmFPA* fpa = generateSimpleFPA(NULL); pmChip *chip = fpa->chips->data[0]; pmCell *cell = chip->cells->data[0]; @@ -298,17 +256,14 @@ int rc = pmChipFindCell(chip, NULL); ok(-1 == rc, "pmChipFindCell() returns -1 with NULL name input param"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // int pmChipFindCell(const pmChip *chip, const char *name) + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmChipFindCell() with acceptable input parameters { psMemId id = psMemGetId(); // Generate the pmChip heirarchy - psMetadata *camera = psMetadataAlloc(); - pmFPA* fpa = generateSimpleFPA(camera); + pmFPA* fpa = generateSimpleFPA(NULL); pmChip *chip = fpa->chips->data[0]; pmCell *cell = chip->cells->data[0]; @@ -332,8 +287,7 @@ } - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - -} + psFree(fpa); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + +} Index: trunk/psModules/test/camera/tap_pmFPAView.c =================================================================== --- trunk/psModules/test/camera/tap_pmFPAView.c (revision 15986) +++ 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"); } } + Index: trunk/psModules/test/camera/tap_pmHDU.c =================================================================== --- trunk/psModules/test/camera/tap_pmHDU.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmHDU.c (revision 15987) @@ -5,14 +5,6 @@ #include "tap.h" #include "pstap.h" -/* - The following psModule functions are tested: - pmHDUAlloc() - pmHDUReadHeader() - pmHDURead() - pmHDUReadMask() - pmHDUReadWeight() - pmHDUWrite() - pmHDUWriteMask() - pmHDUWriteWeight() +/* STATUS: + All functions are tested. */ @@ -26,4 +18,5 @@ psTraceSetLevel("err", 0); plan_tests(159); + // ---------------------------------------------------------------------- @@ -93,5 +86,8 @@ hdu->header = psMetadataAlloc(); psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWrite(hdu, NULL); @@ -105,5 +101,8 @@ { psMemId id = psMemGetId(); - psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r"); + psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r"); + if (!fitsFile) { + fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r"); + } ok(fitsFile != NULL, "psFitsOpen() was successful"); bool rc = pmHDURead(NULL, fitsFile); @@ -147,5 +146,8 @@ // Set hdu->images pmHDU *hdu = pmHDUAlloc("extname"); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); + } ok(rc, "pmConfigFileRead() was successful"); hdu->images = psArrayAlloc(NUM_HDUS); @@ -219,5 +221,8 @@ hdu->header = psMetadataAlloc(); psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWriteWeight(hdu, NULL); @@ -231,5 +236,8 @@ { psMemId id = psMemGetId(); - psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r"); + psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r"); + if (!fitsFile) { + fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r"); + } ok(fitsFile != NULL, "psFitsOpen() was successful"); bool rc = pmHDUReadWeight(NULL, fitsFile); @@ -273,5 +281,8 @@ // Set hdu->images pmHDU *hdu = pmHDUAlloc("extname"); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); + } ok(rc, "pmConfigFileRead() was successful"); hdu->weights = psArrayAlloc(NUM_HDUS); @@ -345,5 +356,8 @@ hdu->header = psMetadataAlloc(); psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYINT", PS_DATA_S32, "psS32 Item", 0); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWriteMask(hdu, NULL); @@ -357,5 +371,8 @@ { psMemId id = psMemGetId(); - psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r"); + psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r"); + if (!fitsFile) { + fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r"); + } ok(fitsFile != NULL, "psFitsOpen() was successful"); bool rc = pmHDUReadMask(NULL, fitsFile); @@ -399,5 +416,8 @@ // Set hdu->images pmHDU *hdu = pmHDUAlloc("extname"); - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera format 0"); + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); + } ok(rc, "pmConfigFileRead() was successful"); hdu->masks = psArrayAlloc(NUM_HDUS); @@ -450,5 +470,8 @@ { psMemId id = psMemGetId(); - psFits* fitsFile = psFitsOpen("data/sampleFitsFile.fits", "r"); + psFits* fitsFile = psFitsOpen("../dataFiles/sampleFitsFile.fits", "r"); + if (!fitsFile) { + fitsFile = psFitsOpen("dataFiles/sampleFitsFile.fits", "r"); + } ok(fitsFile != NULL, "psFitsOpen() was successful"); bool rc = pmHDUReadHeader(NULL, fitsFile); @@ -490,6 +513,10 @@ "psBool Item", (lcv%2 == 0)); psMetadataAdd(hdu->header, PS_LIST_TAIL, "MYSTR", PS_DATA_STRING, - - bool rc = pmConfigFileRead(&hdu->format, "data/camera0/format0.config", "Camera 0 Config Format"); + "psStr Item", extname); + + bool rc = pmConfigFileRead(&hdu->format, "../dataFiles/camera0/format0.config", "Camera 0 Config Format"); + if (!rc) { + rc = pmConfigFileRead(&hdu->format, "dataFiles/camera0/format0.config", "Camera 0 Config Format"); + } ok(rc == true, "pmConfigFileRead() was successful"); rc = pmHDUWrite(hdu, fitsFileW); Index: trunk/psModules/test/camera/tap_pmHDUUtils.c =================================================================== --- trunk/psModules/test/camera/tap_pmHDUUtils.c (revision 15986) +++ trunk/psModules/test/camera/tap_pmHDUUtils.c (revision 15987) @@ -5,11 +5,7 @@ #include "tap.h" #include "pstap.h" -// XXX: Use better name for the temporary FITS file -// XXX: The code to generate and free the FPA hierarchy was copied from -// tap-pmFPA.c. EIther include it directly, or library, or something. -// Also, get rid of the manual free functions and use psFree() once -// it correctly frees child members -// XXX: This simpleFPA() requires that the HDUs be allocated. - +/* STATUS: + All functions are tested. +*/ #define CHIP_ALLOC_NAME "ChipName" @@ -80,10 +76,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())"); + } } @@ -101,5 +101,4 @@ //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. @@ -123,17 +122,16 @@ chip->hdu = pmHDUAlloc("chipExtName"); - bool rc = pmConfigFileRead(&chip->hdu->format, "data/camera0/format0.config", "Camera format 0"); + bool rc = pmConfigFileRead(&chip->hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); if (!rc) { - diag("pmConfigFileRead() was unsuccessful (from generateSimpleChip())"); + rc = pmConfigFileRead(&chip->hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + diag("pmConfigFileRead() was unsuccessful (from generateSimpleChip())"); + } } 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); } @@ -153,49 +151,18 @@ psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); fpa->hdu = pmHDUAlloc("fpaExtName"); - - bool rc = pmConfigFileRead(&fpa->hdu->format, "data/camera0/format0.config", "Camera format 0"); + bool rc = pmConfigFileRead(&fpa->hdu->format, "dataFiles/camera0/format0.config", "Camera format 0"); if (!rc) { - diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); + rc = pmConfigFileRead(&fpa->hdu->format, "../dataFiles/camera0/format0.config", "Camera format 0"); + if (!rc) { + diag("pmConfigFileRead() was unsuccessful (from generateSimpleFPA())"); + } } 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); } @@ -208,8 +175,8 @@ plan_tests(73); - // ---------------------------------------------------------------------- - // pmHDU *pmHDUFromFPA(const pmFPA *fpa) + + // ---------------------------------------------------------------------- // pmHDUFromFPA() tests - // pmHDUFromFPA() verify with NULL input params + // Call pmHDUFromFPA() with NULL input params { psMemId id = psMemGetId(); @@ -219,5 +186,6 @@ } - //pmHDUFromFPA() verify with acceptable input params + + // Call pmHDUFromFPA() with acceptable input params { psMemId id = psMemGetId(); @@ -232,14 +200,13 @@ pmHDU *hdu = pmHDUFromFPA(fpa); ok(hdu == fpa->hdu, "pmHDUFromFPA(NULL) returned the correct pmHDU of an pmFPA struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // pmHDU *pmHDUFromChip(const pmChip *chip) + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- // pmHDUFromChip() tests - // pmHDUFromChip() verify with NULL input params + // Call pmHDUFromChip() with NULL input params { psMemId id = psMemGetId(); @@ -249,5 +216,6 @@ } - //pmHDUFromChip() verify with acceptable input params + + // Call pmHDUFromChip() with acceptable input params { psMemId id = psMemGetId(); @@ -262,10 +230,11 @@ pmHDU *hdu = pmHDUFromChip(chip); ok(hdu == chip->hdu, "pmHDUFromChip() returned the correct pmHDU of an pmChip struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - //pmHDUFromChip() verify with acceptable input params + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUFromChip() with acceptable input params // Set chip->hdu to NULL, verify chip->parent->hdu is returned { @@ -283,14 +252,13 @@ pmHDU *hdu = pmHDUFromChip(chip); ok(hdu == chip->parent->hdu, "pmHDUFromChip() returned the correct pmHDU of an pmChip struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // pmHDU *pmHDUFromCell(const pmCell *cell) + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- // pmHDUFromCell() tests - // pmHDUFromCell() verify with NULL input params + // Call pmHDUFromCell() with NULL input params { psMemId id = psMemGetId(); @@ -300,5 +268,6 @@ } - //pmHDUFromCell() verify with acceptable input params + + // Call pmHDUFromCell() with acceptable input params { psMemId id = psMemGetId(); @@ -313,10 +282,11 @@ pmHDU *hdu = pmHDUFromCell(cell); ok(hdu == cell->hdu, "pmHDUFromCell() returned the correct pmHDU of an pmCell struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - //pmHDUFromCell() verify with acceptable input params + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUFromCell() with acceptable input params // Set cell->hdu to NULL, verify cell->parent->hdu is returned { @@ -334,14 +304,13 @@ pmHDU *hdu = pmHDUFromCell(cell); ok(hdu == cell->parent->hdu, "pmHDUFromCell() returned the correct pmHDU of an pmCell struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - // pmHDU *pmHDUFromReadout(const pmCell *cell) + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- // pmHDUFromReadout() tests - // pmHDUFromReadout() verify with NULL input params + // Call pmHDUFromReadout() with NULL input params { psMemId id = psMemGetId(); @@ -351,5 +320,6 @@ } - //pmHDUFromReadout() verify with acceptable input params + + // Call pmHDUFromReadout() with acceptable input params { psMemId id = psMemGetId(); @@ -366,14 +336,13 @@ pmHDU *hdu = pmHDUFromReadout(readout); ok(hdu == readout->parent->hdu, "pmHDUFromReadout() returned the correct pmHDU of an pmReadout struct"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // ---------------------------------------------------------------------- - //pmHDUGetLowest() tests - //pmHDU *pmHDUGetLowest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetLowest(): verify with all NULL inputs + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmHDUGetLowest() tests + // Call pmHDUGetLowest() with all NULL inputs { psMemId id = psMemGetId(); @@ -384,7 +353,5 @@ - //pmHDUGetLowest() tests - //pmHDU *pmHDUGetLowest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetLowest(): verify with all acceptable inputs + // Call pmHDUGetLowest() with all acceptable inputs { psMemId id = psMemGetId(); @@ -399,13 +366,11 @@ pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); ok(hdu == cell->hdu, "pmHDUGetLowest(fpa, chip, cell)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - //pmHDUGetLowest() tests - //pmHDU *pmHDUGetLowest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetLowest(): verify with all (fpa, chip, NULL) inputs + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUGetLowest() with all (fpa, chip, NULL) inputs { psMemId id = psMemGetId(); @@ -420,13 +385,11 @@ pmHDU *hdu = pmHDUGetLowest(fpa, chip, NULL); ok(hdu == chip->hdu, "pmHDUGetLowest(fpa, chip, NULL)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - //pmHDUGetLowest() tests - //pmHDU *pmHDUGetLowest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetLowest(): verify with all (fpa, NULL, NULL) inputs + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUGetLowest() with all (fpa, NULL, NULL) inputs { psMemId id = psMemGetId(); @@ -441,15 +404,13 @@ pmHDU *hdu = pmHDUGetLowest(fpa, NULL, NULL); ok(hdu == fpa->hdu, "pmHDUGetLowest(fpa, NULL, NULL)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } // ---------------------------------------------------------------------- //pmHDUGetHighest() tests - //pmHDU *pmHDUGetHighest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetHighest(): verify with all NULL inputs + // Call pmHDUGetHighest() with all NULL inputs { psMemId id = psMemGetId(); @@ -460,7 +421,5 @@ - //pmHDUGetHighest() tests - //pmHDU *pmHDUGetHighest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetHighest(): verify with all acceptable inputs + // Call pmHDUGetHighest() with all acceptable inputs { psMemId id = psMemGetId(); @@ -475,13 +434,11 @@ pmHDU *hdu = pmHDUGetHighest(fpa, chip, cell); ok(hdu == fpa->hdu, "pmHDUGetHighest(fpa, chip, cell)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - //pmHDUGetHighest() tests - //pmHDU *pmHDUGetHighest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetHighest(): verify with (NULL, chip, cell) inputs + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUGetHighest() with (NULL, chip, cell) inputs { psMemId id = psMemGetId(); @@ -496,13 +453,11 @@ pmHDU *hdu = pmHDUGetHighest(NULL, chip, cell); ok(hdu == chip->hdu, "pmHDUGetHighest(NULL, chip, cell)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - //pmHDUGetHighest() tests - //pmHDU *pmHDUGetHighest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) - //pmHDUGetHighest(): verify with (NULL, NULL, cell) inputs + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmHDUGetHighest() with (NULL, NULL, cell) inputs { psMemId id = psMemGetId(); @@ -517,9 +472,7 @@ pmHDU *hdu = pmHDUGetHighest(NULL, NULL, cell); ok(hdu == cell->hdu, "pmHDUGetHighest(NULL, NULL, cell)"); - myFreeFPA(fpa); - psFree(camera); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - -} + psFree(fpa); + psFree(camera); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } +} Index: trunk/psModules/test/camera/tap_pmReadoutFake.c =================================================================== --- trunk/psModules/test/camera/tap_pmReadoutFake.c (revision 15987) +++ trunk/psModules/test/camera/tap_pmReadoutFake.c (revision 15987) @@ -0,0 +1,170 @@ +#include +#include +#include +#include +#include "tap.h" +#include "pstap.h" + +#define MISC_NUM 32 +#define MISC_NAME "META00" +#define NUM_BIAS_DATA 10 +#define TEST_NUM_ROWS 5 +#define TEST_NUM_COLS 8 +#define VERBOSE 0 +#define ERR_TRACE_LEVEL 0 +#define NUM_SOURCES 5 + +/****************************************************************************** +generateSimpleReadout(): This function generates a pmReadout data structure and then +populates its members with real data. + *****************************************************************************/ +pmReadout *generateSimpleReadout(pmCell *cell) +{ + pmReadout *readout = pmReadoutAlloc(cell); + readout->image = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + readout->mask = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_U8); + readout->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + psImageInit(readout->image, 1.0); + psImageInit(readout->mask, 2); + psImageInit(readout->weight, 3.0); + for (psS32 i = 0 ; i < NUM_BIAS_DATA ; i++) { + psImage *tmpImage = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + psImageInit(tmpImage, (double) i); + psListAdd(readout->bias, PS_LIST_HEAD, tmpImage); + psFree(tmpImage); + } + psMetadataAddS32(readout->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); + return(readout); +} + +psS32 main(psS32 argc, char* argv[]) +{ + psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); + psTraceSetLevel("err", ERR_TRACE_LEVEL); + plan_tests(11); + + // ------------------------------------------------------------------------ + // pmReadoutUpdateSize() tests + // bool pmReadoutFakeFromSources(pmReadout *readout, int numCols, int numRows, const psArray *sources, + // const psVector *xOffset, const psVector *yOffset, const pmPSF *psf, + // float minFlux, int radius, bool circularise) + // + // Call pmReadoutUpdateSize() with bad input parameters. + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + psVector *xOffset = psVectorAlloc(NUM_SOURCES, PS_TYPE_S32); + psVector *yOffset = psVectorAlloc(NUM_SOURCES, PS_TYPE_S32); + psVector *xOffsetBig = psVectorAlloc(NUM_SOURCES*2, PS_TYPE_S32); + psVector *xOffsetF32 = psVectorAlloc(NUM_SOURCES, PS_TYPE_F32); + psVector *yOffsetF32 = psVectorAlloc(NUM_SOURCES, PS_TYPE_F32); + psArray *sources = psArrayAlloc(NUM_SOURCES); + for (int i = 0; i < sources->n ; i++) { + sources->data[i] = pmSourceAlloc(); + } + pmPSFOptions *psfOptions = pmPSFOptionsAlloc(); + psfOptions->psfTrendNx = 1; + psfOptions->psfTrendNy = 2; + psfOptions->psfFieldNx = 3; + psfOptions->psfFieldNy = 4; + psfOptions->psfFieldXo = 5; + psfOptions->psfFieldYo = 6; + pmModelClassInit(); + psfOptions->type = pmModelClassGetType("PS_MODEL_GAUSS"); + pmPSF *psf = pmPSFAlloc(psfOptions); + + // NULL pmReadout input parameter + bool rc = pmReadoutFakeFromSources(NULL, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffset, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with pmReadout input parameter"); + + // Non-positive numCols input parameter + rc = pmReadoutFakeFromSources(readout, 0, TEST_NUM_ROWS, sources, + xOffset, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with Non-positive numCols input parameter"); + + // Non-positive numRows input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, 0, sources, + xOffset, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with Non-positive numRow input parameter"); + + // NULL pmSource input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, NULL, + xOffset, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with pmSource input parameter"); + + // NULL pmPSF input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffset, yOffset, NULL, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with input parameter"); + + // NULL incorrect type xOffset input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffsetF32, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with incorrect type xOffset input parameter"); + + // NULL incorrect type yOffset input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffset, yOffsetF32, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with incorrect type yOffset input parameter"); + + // NULL incorrect size xOffset input parameter + rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffsetBig, yOffset, psf, 0.0, 1.0, false); + ok(rc == false, "pmReadoutFakeFromSources() returned FALSE with incorrect size xOffset input parameter"); + + psFree(readout); + psFree(xOffset); + psFree(yOffset); + psFree(xOffsetBig); + psFree(xOffsetF32); + psFree(yOffsetF32); + psFree(sources); + psFree(psfOptions); + psFree(psf); + pmModelClassCleanup(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmReadoutUpdateSize() with acceptable input parameters. + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + psVector *xOffset = psVectorAlloc(NUM_SOURCES, PS_TYPE_S32); + psVector *yOffset = psVectorAlloc(NUM_SOURCES, PS_TYPE_S32); + psVector *xOffsetF32 = psVectorAlloc(NUM_SOURCES, PS_TYPE_F32); + psVector *yOffsetF32 = psVectorAlloc(NUM_SOURCES, PS_TYPE_F32); + psArray *sources = psArrayAlloc(NUM_SOURCES); + for (int i = 0; i < sources->n ; i++) { + sources->data[i] = pmSourceAlloc(); + } + pmPSFOptions *psfOptions = pmPSFOptionsAlloc(); + psfOptions->psfTrendNx = 1; + psfOptions->psfTrendNy = 2; + psfOptions->psfFieldNx = 3; + psfOptions->psfFieldNy = 4; + psfOptions->psfFieldXo = 5; + psfOptions->psfFieldYo = 6; + pmModelClassInit(); + psfOptions->type = pmModelClassGetType("PS_MODEL_GAUSS"); + pmPSF *psf = pmPSFAlloc(psfOptions); + + bool rc = pmReadoutFakeFromSources(readout, TEST_NUM_COLS, TEST_NUM_ROWS, sources, + xOffset, yOffset, psf, 0.0, 1.0, false); + ok(rc == true, "pmReadoutFakeFromSources() returned TRUE with acceptable input parameters"); + + psFree(readout); + psFree(xOffset); + psFree(yOffset); + psFree(xOffsetF32); + psFree(yOffsetF32); + psFree(sources); + psFree(psfOptions); + psFree(psf); + pmModelClassCleanup(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } +} + Index: trunk/psModules/test/camera/tap_pmReadoutStack.c =================================================================== --- trunk/psModules/test/camera/tap_pmReadoutStack.c (revision 15987) +++ trunk/psModules/test/camera/tap_pmReadoutStack.c (revision 15987) @@ -0,0 +1,250 @@ +#include +#include +#include +#include +#include "tap.h" +#include "pstap.h" +/* STATUS: + All functions are tested. +*/ + +#define CELL_ALLOC_NAME "CellName" +#define MISC_NUM 32 +#define MISC_NAME "META00" +#define NUM_BIAS_DATA 10 +#define TEST_NUM_ROWS 5 +#define TEST_NUM_COLS 8 +#define NUM_INPUTS 10 +#define NUM_READOUTS 4 +#define VERBOSE 0 +#define ERR_TRACE_LEVEL 10 + +/****************************************************************************** +generateSimpleReadout(): This function generates a pmReadout data structure and then +populates its members with real data. + *****************************************************************************/ +pmReadout *generateSimpleReadout(pmCell *cell) +{ + pmReadout *readout = pmReadoutAlloc(cell); + readout->image = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + readout->mask = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_U8); + readout->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + psImageInit(readout->image, 1.0); + psImageInit(readout->mask, 2); + psImageInit(readout->weight, 3.0); + for (psS32 i = 0 ; i < NUM_BIAS_DATA ; i++) { + psImage *tmpImage = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + psImageInit(tmpImage, (double) i); + psListAdd(readout->bias, PS_LIST_HEAD, tmpImage); + psFree(tmpImage); + } + psMetadataAddS32(readout->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); + return(readout); +} + +/****************************************************************************** +generateSimpleCell(): This function generates a pmCell data structure and then +populates its members with real data. + *****************************************************************************/ +pmCell *generateSimpleCell(int ID) +{ + pmCell *cell = pmCellAlloc(NULL, CELL_ALLOC_NAME); + psMetadataAddS32(cell->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); + cell->hdu = pmHDUAlloc(NULL); + psMetadataAddS32(cell->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM); + psRegion *region = psRegionAlloc(0.0, (float) (10 + ID), 0.0, (float) (20 + ID)); + psMetadataRemoveKey(cell->concepts, "CELL.TRIMSEC"); + psMetadataAddPtr(cell->concepts, PS_LIST_TAIL|PS_META_REPLACE, "CELL.TRIMSEC", PS_DATA_REGION, "I am a region", region); + psFree(region); + psArrayRealloc(cell->readouts, NUM_READOUTS); + for (int i = 0 ; i < NUM_READOUTS ; i++) { + cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell)); + } + + return(cell); +} + + + +psS32 main(psS32 argc, char* argv[]) +{ + psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); + psTraceSetLevel("err", ERR_TRACE_LEVEL); + plan_tests(29); + + // ------------------------------------------------------------------------ + // pmReadoutUpdateSize() tests + // Call pmReadoutUpdateSize() with NULL pmReadout input parameter. + { + psMemId id = psMemGetId(); + bool rc = pmReadoutUpdateSize(NULL, 0, 0, TEST_NUM_COLS, TEST_NUM_ROWS, false); + ok(rc == false, "pmReadoutUpdateSize() returned FALSE with NULL pmReadout input parameter"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmReadoutUpdateSize() with acceptable input parameters (mask == false). + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + bool rc = pmReadoutUpdateSize(readout, 0, 0, 2*TEST_NUM_COLS, 2*TEST_NUM_ROWS, false); + ok(rc == true, "pmReadoutUpdateSize() returned TRUE with acceptable input parameters"); + ok(readout->image->numCols == (2*TEST_NUM_COLS) && + readout->image->numRows == (2*TEST_NUM_ROWS), "pmReadoutUpdateSize() generated the correct size pmReadout->image"); + bool errorFlag = false; + for (int i = 0 ; i < readout->image->numRows ; i++) { + for (int j = 0 ; j < readout->image->numCols ; j++) { + psF32 correctF32; + if (i < TEST_NUM_ROWS && j < TEST_NUM_COLS) { + correctF32 = 1.0; + } else { + correctF32 = 0.0; + } + if (readout->image->data.F32[i][j] != correctF32) { + diag("ERROR: readout->image[%d][%d] is %.2f, should be %.2f", i, j, readout->image->data.F32[i][j], correctF32); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmReadoutUpdateSize() initialized pmReadout->image to zero"); + ok(readout->mask->numCols == (TEST_NUM_COLS) && + readout->mask->numRows == (TEST_NUM_ROWS), "pmReadoutUpdateSize() generated the correct size pmReadout->mask"); + + psFree(readout); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmReadoutUpdateSize() with acceptable input parameters (mask == true). + { + psMemId id = psMemGetId(); + pmReadout *readout = generateSimpleReadout(NULL); + bool rc = pmReadoutUpdateSize(readout, 0, 0, 2*TEST_NUM_COLS, 2*TEST_NUM_ROWS, true); + ok(rc == true, "pmReadoutUpdateSize() returned TRUE with acceptable input parameters"); + ok(readout->image->numCols == (2*TEST_NUM_COLS) && + readout->image->numRows == (2*TEST_NUM_ROWS), "pmReadoutUpdateSize() generated the correct size pmReadout->image"); + bool errorFlag = false; + for (int i = 0 ; i < readout->image->numRows ; i++) { + for (int j = 0 ; j < readout->image->numCols ; j++) { + psF32 correctF32; + if (i < TEST_NUM_ROWS && j < TEST_NUM_COLS) { + correctF32 = 1.0; + } else { + correctF32 = 0.0; + } + if (readout->image->data.F32[i][j] != correctF32) { + diag("ERROR: readout->image[%d][%d] is %.2f, should be %.2f", i, j, readout->image->data.F32[i][j], correctF32); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmReadoutUpdateSize() initialized pmReadout->image to zero"); + ok(readout->mask->numCols == (2*TEST_NUM_COLS) && + readout->mask->numRows == (2*TEST_NUM_ROWS), "pmReadoutUpdateSize() generated the correct size pmReadout->mask"); + errorFlag = false; + for (int i = 0 ; i < readout->mask->numRows ; i++) { + for (int j = 0 ; j < readout->mask->numCols ; j++) { + psF32 correctU8; + if (i < TEST_NUM_ROWS && j < TEST_NUM_COLS) { + correctU8 = 2; + } else { + correctU8 = 0; + } + if (readout->mask->data.U8[i][j] != correctU8) { + diag("ERROR: readout->mask[%d][%d] is %d, should be %d", i, j, readout->mask->data.U8[i][j], correctU8); + errorFlag = true; + } + } + } + ok(!errorFlag, "pmReadoutUpdateSize() initialized pmReadout->mask to zero"); + + psFree(readout); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + + // ------------------------------------------------------------------------ + // pmReadoutStackValidate() tests + // Call pmReadoutStackValidate() with bad input parameters. + { + psMemId id = psMemGetId(); + int minInputCols, maxInputCols, minInputRows, maxInputRows, numCols, numRows; + minInputCols = maxInputCols = minInputRows = maxInputRows = numCols = numRows = 0; + bool rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, + &numCols, &numRows, NULL); + psArray *inputs = psArrayAlloc(NUM_INPUTS); + for (int i = 0 ; i < NUM_INPUTS ; i++) { + inputs->data[i] = (psPtr *) generateSimpleReadout(NULL); + } + + // NULL psArray input parameter + rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, + &numCols, &numRows, NULL); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL pmArray input parameter"); + + // NULL minInputColsPtr + rc = pmReadoutStackValidate(NULL, &maxInputCols, &minInputRows, &maxInputRows, + &numCols, &numRows, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL minInputColsPtr input parameter"); + + // NULL maxInputColsPtr + rc = pmReadoutStackValidate(&minInputCols, NULL, &minInputRows, &maxInputRows, + &numCols, &numRows, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL maxInputColsPtr input parameter"); + + // NULL minInputRowsPtr + rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, NULL, &maxInputRows, + &numCols, &numRows, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL minInputRowsPtr input parameter"); + + // NULL maxInputRowsPtr + rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, NULL, + &numCols, &numRows, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL maxInputRowsPtr input parameter"); + + // NULL numColsPtr + rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, + NULL, &numRows, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL numColsPtr input parameter"); + + // NULL numRowsPtr + rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, + &numCols, NULL, inputs); + ok(rc == false, "pmReadoutStackValidate() returned FALSE with NULL numRowsPtr input parameter"); + + psFree(inputs); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmReadoutStackValidate() with acceptable input parameters. + { + psMemId id = psMemGetId(); + int minInputCols, maxInputCols, minInputRows, maxInputRows, numCols, numRows; + minInputCols = maxInputCols = minInputRows = maxInputRows = numCols = numRows = 0; + pmCell *cells[NUM_INPUTS]; + psArray *inputs = psArrayAlloc(NUM_INPUTS); + for (int i = 0 ; i < NUM_INPUTS ; i++) { + cells[i] = generateSimpleCell(i); + inputs->data[i] = (psPtr *) generateSimpleReadout(cells[i]); + } + bool rc = pmReadoutStackValidate(&minInputCols, &maxInputCols, &minInputRows, &maxInputRows, + &numCols, &numRows, inputs); + ok(rc == true, "pmReadoutStackValidate() returned TRUE with acceptable input parameters"); + ok(minInputCols == 0, "pmReadoutStackValidate() set minInputCols correctly"); + ok(maxInputCols == TEST_NUM_COLS, "pmReadoutStackValidate() set maxInputCols correctly"); + ok(minInputRows == 0, "pmReadoutStackValidate() set minInputRows correctly"); + ok(maxInputRows == TEST_NUM_ROWS, "pmReadoutStackValidate() set maxInputRows correctly"); + ok(numCols == (10 + NUM_INPUTS - 1), "pmReadoutStackValidate() set numCols correctly"); + ok(numRows == (20 + NUM_INPUTS - 1), "pmReadoutStackValidate() set numRows correctly"); + + for (int i = 0 ; i < NUM_INPUTS ; i++) { + psFree(cells[i]); + } + psFree(inputs); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + +}