Changeset 15985 for trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.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_PS1_DEV_1.c (modified) (11 diffs)

trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c

@@ -5 +5 @@
 #include "tap.h"
 #include "pstap.h"
+/* STATUS:
+    No test for pmSourcesWrite_PS1_DEV_1_XSRC() since there is no associated
+        read function.
+    All other functions are tested.
+    XX: These tests read/write a file.  Must choose a more unique name.
+*/
 
 #define MISC_NUM                32
@@ -12 +18 @@
 #define TEST_NUM_COLS           (16)
 #define VERBOSE                 0
-#define ERR_TRACE_LEVEL         10
+#define ERR_TRACE_LEVEL         0
 #define TEST_FLOATS_EQUAL(X, Y) (abs(X - Y) < 0.0001)
 #define NUM_SOURCES             5
@@ -23 +29 @@
     psLogSetLevel(PS_LOG_INFO);
     psTraceSetLevel("err", ERR_TRACE_LEVEL);
-    plan_tests(80);
+    plan_tests(79);
 
 
     // ----------------------------------------------------------------------
     // pmSourcesWrite_PS1_DEV_1() tests
-    // bool pmSourcesWrite_PS1_DEV_1 (psFits *fits, psArray *sources, 
-    //      psMetadata *imageHeader, psMetadata *tableHeader, char *extname char *xsrcname)
     // Call pmSourcesWrite_PS1_DEV_1() with NULL psFits input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "w");
@@ -56 +60 @@
 
     // Call pmSourcesWrite_PS1_DEV_1() with NULL pmSource input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "w");
@@ -80 +84 @@
 
     // Call pmSourcesWrite_PS1_DEV_1() with NULL extname input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "w");
@@ -105 +109 @@
     // ----------------------------------------------------------------------
     // pmSourcesRead_PS1_DEV_1() tests
-    // psArray *pmSourcesRead_PS1_DEV_1 (psFits *fits, psMetadata *header)
-    // 
     // Call pmSourcesRead_PS1_DEV_1() with NULL psFits input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "r");
@@ -121 +123 @@
 
     // Call pmSourcesRead_PS1_DEV_1() with NULL header input parameter
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "r");
@@ -150 +152 @@
     #define TEST_BASE_MODE              1
 
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(TABLE_FILENAME, "w");
@@ -203 +205 @@
             src->sky = TEST_BASE_SKY + (float) i;
             src->skyErr = TEST_BASE_SKY_ERR + (float) i;
-            src->psfProb = TEST_BASE_PSF_PROB + (float) i;
+//            src->psfProb = TEST_BASE_PSF_PROB + (float) i;
             src->crNsigma = TEST_BASE_CR_N_SIGMA + (float) i;
             src->extNsigma = TEST_BASE_EXT_N_SIGMA + (float) i;
@@ -226 +228 @@
 
     // Call pmSourcesRead_PS1_DEV_1() with acceptable input parameters
-    if (1) {
+    {
         psMemId id = psMemGetId();
         psFits* fitsFile = psFitsOpen(tableFilename, "rw");
@@ -304 +306 @@
         pmModelClassCleanup();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 }