Changeset 15985 for trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c

Timestamp:

Jan 2, 2008, 10:45:23 AM (18 years ago)

Author:

gusciora

Message:

Significant changes and additions.

File:

• trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c (modified) (9 diffs)

trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c

@@ -5 +5 @@
 #include "tap.h"
 #include "pstap.h"
+/* STATUS:
+    All functions are tested.
+*/
 
 #define VERBOSE                 0
@@ -20 +23 @@
     // ----------------------------------------------------------------------
     // pmSourcesWrite_SMPDATA() tests
-    // bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, 
-    //      psMetadata *imageHeader, psMetadata *tableHeader, char *extname)
     // Call pmSourcesWrite_SMPDATA() with NULL psFits input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "w");
@@ -48 +49 @@
 
     // Call pmSourcesWrite_SMPDATA() with NULL pmSource input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "w");
@@ -72 +73 @@
 
     // Call pmSourcesWrite_SMPDATA() with NULL extname input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "w");
@@ -97 +98 @@
     // ----------------------------------------------------------------------
     // pmSourcesRead_SMPDATA() tests
-    // psArray *pmSourcesRead_SMPDATA (psFits *fits, psMetadata *header)
-    // 
     // Call pmSourcesRead_SMPDATA() with NULL psFits input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "r");
@@ -113 +112 @@
 
     // Call pmSourcesRead_SMPDATA() with NULL header input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "r");
@@ -140 +139 @@
     #define TEST_BASE_AP_MAG            160.0
     // XXX: The following metadata items are not tested: FWHM_X, FWHM_Y, THETA
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "w");
@@ -191 +190 @@
 
     // Call pmSourcesRead_SMPDATA() with acceptable input parameters
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(".tmp00", "r");
@@ -241 +240 @@
                     src->type, PM_SOURCE_TYPE_EXTENDED);
              }
-             tmpF = PS_MIN(255, PS_MAX(0, (255*(TEST_BASE_PIX_WEIGHT + (float) i)))) / 255.0;
+             psU8 tmpU8 = (psU8) PS_MIN(255, PS_MAX(0, (255*(TEST_BASE_PIX_WEIGHT + (float) i))));
+             tmpF = (psF32) (tmpU8 / 255.0);
              ok(src->pixWeight == tmpF, "pmSourcesRead_SMPDATA() set src->pixWeight correctly (is %.2f, should be %.2f)",
                 src->pixWeight, tmpF);