Index: trunk/psLib/test/types/tap_psMetadata_polynomials.c =================================================================== --- trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 19129) +++ trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 19133) @@ -19,5 +19,5 @@ psLogSetFormat("HLNM"); psLogSetLevel(PS_LOG_INFO); - plan_tests(92); + plan_tests(88); // psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests @@ -32,10 +32,10 @@ p1d->coeffErr[0] = 0.1; p1d->coeffErr[1] = 0.2; - + //psPolynomial1DtoMetadata //Return a valid metadata containing a polynomial-metadata structure { note ("example of 1DtoMD using the names not the sequence"); - + ok( psPolynomial1DtoMetadata(md, p1d, "polyMD"), "psPolynomial1DtoMetadata: return true for valid inputs."); @@ -43,5 +43,5 @@ skip_start( polyMDtemp == NULL , 1, "Skipping 1 tests because psPolynomial1DtoMetadata has errors"); - + bool status; int nX = psMetadataLookupS32(&status, polyMDtemp, "NORDER_X"); @@ -50,5 +50,5 @@ ok(nX == 1, "psPolynomial1DtoMetadata: NORDER_X is 1"); - + double val; val = psMetadataLookupF64(&status, polyMDtemp, "VAL_X00"); @@ -57,5 +57,5 @@ is_double(val, 1.1, "psPolynomial1DtoMetadata: VAL_X00 is %lf", val); - + val = psMetadataLookupF64(&status, polyMDtemp, "VAL_X01"); ok(status, @@ -65,5 +65,5 @@ skip_end(); } - + //Return false for no-name polynomial { @@ -72,8 +72,10 @@ } //Return false for NULL-name polynomial +#if 0 // Caught by compiler { ok( !psPolynomial1DtoMetadata(md, p1d, NULL), "psPolynomial1DtoMetadata: return false for NULL name input."); } +#endif //Return false for NULL metadata input { @@ -102,5 +104,5 @@ psFree(p1d1); } - + //psPolynomial1DfromMetadata Tests //Return NULL for NULL metadata input. @@ -161,5 +163,5 @@ "return NULL for metadata-polynomial with no NELEMENTS"); } - + //Return NULL for polynomial in metadata with no x-order psMetadataRemoveKey(polyMDtemp, "NORDER_X"); @@ -172,5 +174,5 @@ "return NULL for metadata-polynomial with no x-order"); } - + psFree(outPoly); psFree(p1d); @@ -193,5 +195,5 @@ p2d->coeffErr[1][0] = 0.3; p2d->coeffErr[1][1] = 0.4; - + //psPolynomial2DtoMetadata //Return a valid metadata containing a polynomial-metadata structure @@ -199,7 +201,7 @@ ok( psPolynomial2DtoMetadata(md, p2d, "polyMD"), "psPolynomial2DtoMetadata: return true for valid inputs."); - + // psMetadataConfigWrite (md, "test.md"); - + //XXX ok (0, "these tests are relying on the ORDER of the MD components not the NAMES"); //XXX ok (0, "these seem like irrelevant tests"); @@ -229,20 +231,20 @@ skip_end(); } - + //psPolynomial2DtoMetadata //Return a valid metadata containing a polynomial-metadata structure { note ("example of 2DtoMD using the names not the sequence"); - + ok( psPolynomial2DtoMetadata(md, p2d, "polyMD"), "psPolynomial2DtoMetadata: return true for valid inputs."); - + // psMetadataConfigWrite (md, "test.md"); - + // of the components. these seem like irrelevant tests. psMetadata *polyMDtemp = psMetadataLookupMetadata(NULL, md, "polyMD"); skip_start( polyMDtemp == NULL , 1, "Skipping 1 tests because psPolynomial2DtoMetadata has errors"); - + bool status; int nX = psMetadataLookupS32(&status, polyMDtemp, "NORDER_X"); @@ -251,5 +253,5 @@ ok(nX == 1, "psPolynomial2DtoMetadata: NORDER_X is 1"); - + int nY = psMetadataLookupS32(&status, polyMDtemp, "NORDER_Y"); ok(status, @@ -257,5 +259,5 @@ ok(nY == 1, "psPolynomial2DtoMetadata: NORDER_Y is 1"); - + double val; val = psMetadataLookupF64(&status, polyMDtemp, "VAL_X00_Y00"); @@ -264,5 +266,5 @@ is_double(val, 1.1, "psPolynomial2DtoMetadata: VAL_X00_Y00 is %lf", val); - + val = psMetadataLookupF64(&status, polyMDtemp, "VAL_X01_Y01"); ok(status, @@ -270,8 +272,8 @@ is_double(val, 4.4, "psPolynomial2DtoMetadata: VAL_X01_Y01 is %lf", val); - - skip_end(); - } - + + skip_end(); + } + //Return false for no-name polynomial { @@ -280,8 +282,10 @@ } //Return false for NULL-name polynomial +#if 0 // Caught by compiler { ok( !psPolynomial2DtoMetadata(md, p2d, NULL), "psPolynomial2DtoMetadata: return false for NULL name input."); } +#endif //Return false for NULL metadata input { @@ -310,5 +314,5 @@ psFree(p2d2); } - + //psPolynomial2DfromMetadata Tests //Return NULL for NULL metadata input. @@ -369,5 +373,5 @@ "return NULL for metadata-polynomial with no NELEMENTS"); } - + //Return NULL for polynomial in metadata with no y-order psMetadataRemoveKey(polyMDtemp, "NORDER_Y"); @@ -419,5 +423,5 @@ p3d->coeffErr[0][1][1] = 0.7; p3d->coeffErr[1][1][1] = 0.8; - + //psPolynomial3DtoMetadata //Return a valid metadata containing a polynomial-metadata structure @@ -459,8 +463,10 @@ } //Return false for NULL-name polynomial +#if 0 // Caught by compiler { ok( !psPolynomial3DtoMetadata(md, p3d, NULL), "psPolynomial3DtoMetadata: return false for NULL name input."); } +#endif //Return false for NULL metadata input { @@ -497,5 +503,5 @@ psFree(p3d2); } - + //psPolynomial3DfromMetadata Tests //Return NULL for NULL metadata input. @@ -519,5 +525,5 @@ skip_end(); } - + //Get a polynomial from Metadata with mask[0][0][0] == 1. psFree(outPoly); @@ -558,5 +564,5 @@ "return NULL for metadata-polynomial with no NELEMENTS"); } - + //Return NULL for polynomial in metadata with no z-order psMetadataRemoveKey(polyMDtemp, "NORDER_Z"); @@ -586,5 +592,5 @@ "psPolynomial3DfromMetadata: return NULL for metadata-polynomial with no x-order"); } - + psFree(outPoly); psFree(p3d); @@ -604,5 +610,5 @@ p4d->coeff[0][1][0][0] = 4.4; p4d->coeff[1][0][0][0] = 5.5; - + p4d->coeff[0][0][1][1] = 6.6; p4d->coeff[0][1][0][1] = 7.7; @@ -611,12 +617,12 @@ p4d->coeff[1][0][1][0] = 10.10; p4d->coeff[1][1][0][0] = 11.11; - + p4d->coeff[0][1][1][1] = 12.12; p4d->coeff[1][0][1][1] = 13.13; p4d->coeff[1][1][0][1] = 14.14; p4d->coeff[1][1][1][0] = 15.15; - + p4d->coeff[1][1][1][1] = 16.16; - + p4d->coeffErr[0][0][0][0] = 0.1; p4d->coeffErr[0][0][0][1] = 0.2; @@ -624,5 +630,5 @@ p4d->coeffErr[0][1][0][0] = 0.4; p4d->coeffErr[1][0][0][0] = 0.5; - + p4d->coeffErr[0][0][1][1] = 0.6; p4d->coeffErr[0][1][0][1] = 0.7; @@ -631,12 +637,12 @@ p4d->coeffErr[1][0][1][0] = 0.10; p4d->coeffErr[1][1][0][0] = 0.11; - + p4d->coeffErr[0][1][1][1] = 0.12; p4d->coeffErr[1][0][1][1] = 0.13; p4d->coeffErr[1][1][0][1] = 0.14; p4d->coeffErr[1][1][1][0] = 0.15; - + p4d->coeffErr[1][1][1][1] = 0.16; - + //psPolynomial4DtoMetadata //Return a valid metadata containing a polynomial-metadata structure @@ -681,8 +687,10 @@ } //Return false for NULL-name polynomial +#if 0 // Caught by compiler { ok( !psPolynomial4DtoMetadata(md, p4d, NULL), "psPolynomial4DtoMetadata: return false for NULL name input."); } +#endif //Return false for NULL metadata input { @@ -719,5 +727,5 @@ psFree(p4d2); } - + //psPolynomial4DfromMetadata Tests //Return NULL for NULL metadata input. @@ -779,5 +787,5 @@ "return NULL for metadata-polynomial with no NELEMENTS"); } - + //Return NULL for polynomial in metadata with no t-order psMetadataRemoveKey(polyMDtemp, "NORDER_T"); @@ -816,5 +824,5 @@ "psPolynomial4DfromMetadata: return NULL for metadata-polynomial with no x-order"); } - + psFree(outPoly); psFree(p4d); @@ -823,6 +831,6 @@ } } - - - - + + + +