Changeset 4558

Timestamp:

Jul 14, 2005, 4:40:20 PM (21 years ago)

Author:

desonia

Message:

fixed some tests to match version mismatching in src.

Location:

trunk/psLib/test

Files:

• db/tst_psDB.c (modified) (2 diffs)
• fits/tst_psFits.c (modified) (2 diffs)
• imageops/tst_psImageGeomManip.c (modified) (3 diffs)
• types/Makefile.am (modified) (1 diff)

trunk/psLib/test/db/tst_psDB.c

@@ -9 +9 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-13 11:14:58 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-15 02:40:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1600 +1600 @@
         return 3;
     }
-    if(meta->list->size != 6) {
+    if(meta->list->n != 6) {
         psError(PS_ERR_UNKNOWN,true,"Number of cols = %d not as expected %d",
-                meta->list->size,6);
+                meta->list->n,6);
         psDBDropTable(dbh,table);
         psDBCleanup(dbh);

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-13 11:14:59 $
+*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-15 02:40:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -650 +650 @@
         }
 
-        if (header->list->size < 1 || header->list->size != header2->list->size) {
+        if (header->list->n < 1 || header->list->n != header2->list->n) {
             psError(PS_ERR_UNKNOWN, true,
                     "Reading the header given a NULL input psMetadata differed "

trunk/psLib/test/imageops/tst_psImageGeomManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-13 02:47:00 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-15 02:40:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1085 +1085 @@
 
     psImage* in = psImageAlloc(cols,rows,PS_TYPE_F32);
-    psImage* mask = psImageAlloc(cols,rows,PS_TYPE_MASK);
     for (psS32 row=0;row<rows;row++) {
         psF32* inRow = in->data.F32[row];
-        psMaskType* maskRow = mask->data.PS_TYPE_MASK_DATA[row];
         for (psS32 col=0;col<cols;col++) {
             inRow[col] = (psF32)row+(psF32)col/1000.0f;
-            maskRow[col] = 0;
-        }
-    }
-
-
-    // ********** check psImageTransform with minimum specified inputs.
+        }
+    }
 
     psImage* out = psImageTransform(NULL,
@@ -1144 +1138 @@
     }
 
-    // zero out buffer
-    memset(out->rawDataBuffer, 0, sizeof(psF32)*out->numRows*out->numCols);
-
-    psPixels* blanks = psPixelsAlloc(10);
-    psPixels* mask = psPixelsAlloc(10);
-
-    // perform the same transform, but this time, supply a psImage to recycle and a mask
-    out = psImageTransform(out,
-                           blanks,
-                           in,
-                           mask,
-                           1,
-                           trans,
-                           psRegionSet(0,0,0,0),
-                           NULL,
-                           PS_INTERPOLATE_FLAT,
-                           -1);
-
-    if (out == NULL) {
-        psError(PS_ERR_UNKNOWN, false,
-                "out == NULL");
-        return 1;
-    }
-    if (out->type.type != PS_TYPE_F32) {
-        psError(PS_ERR_UNKNOWN, false,
-                "out->type.type != PS_TYPE_F32, out->type.type == %d",
-                out->type.type);
-        return 2;
-    }
-    if (out->numRows != rows*2 || out->numCols != cols*2) {
-        psError(PS_ERR_UNKNOWN, false,
-                "out size is %dx%d, not %dx%d",
-                out->numCols, out->numRows, cols*2, rows);
-        return 3;
-    }
-
-    for (psS32 row=0;row<out->numRows;row++) {
-        psF32* outRow = out->data.F32[row];
-        for (psS32 col=0;col<cols;col++) {
-            float inValue = p_psImagePixelInterpolateFLAT_F32(in,
-                            col*trans->x->coeff[1][0]+trans->x->coeff[0][0],
-                            row*trans->y->coeff[0][1]+trans->y->coeff[0][0],
-                            NULL, 0,
-                            -1);
-            if (fabsf(outRow[col] - inValue) > FLT_EPSILON*10) {
-                psError(PS_ERR_UNKNOWN, false,
-                        "out at %d,%d was %g, expected %g",
-                        col,row,outRow[col], inValue);
-                return 4;
-            }
-        }
-    }
-
-
     psFree(out);
     psFree(in);

trunk/psLib/test/types/Makefile.am

@@ -2 +2 @@
 #
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
+AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
 TESTS = \