Index: trunk/psModules/test/tst_pmMaskBadPixels.c
===================================================================
--- trunk/psModules/test/tst_pmMaskBadPixels.c	(revision 1888)
+++ trunk/psModules/test/tst_pmMaskBadPixels.c	(revision 2138)
@@ -17,6 +17,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-24 23:42:28 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-14 23:52:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -56,9 +56,29 @@
 
 
-static int testMaskBadPixels(void);
+static int testMaskBadPixels1(void);
+static int testMaskBadPixels2(void);
+static int testMaskBadPixels3(void);
+static int testMaskBadPixels4(void);
+static int testMaskBadPixels5(void);
+static int testMaskBadPixels6(void);
+static int testMaskBadPixels7(void);
+static int testMaskBadPixels8(void);
+static int testMaskBadPixels9(void);
+static int testMaskBadPixels10(void);
+static int testMaskBadPixels11(void);
 
 
 testDescription tests[] = {
-                              {testMaskBadPixels, 885, "pmMaskBadPixels", 0, false},
+                              {testMaskBadPixels1, 885, "pmMaskBadPixels - Create mask based on maskVal argument", 0, false},
+                              {testMaskBadPixels2, 885, "pmMaskBadPixels - Create mask based on saturation argument", 0, false},
+                              {testMaskBadPixels3, 885, "pmMaskBadPixels - Create mask based on growVal and grow arguments", 0, false},
+                              {testMaskBadPixels4, 885, "pmMaskBadPixels - Auto create mask based on maskVal argument", 0, false},
+                              {testMaskBadPixels5, 885, "pmMaskBadPixels - Attempt to use null mask", 0, false},
+                              {testMaskBadPixels6, 885, "pmMaskBadPixels - Attempt tp use null input image", 0, false},
+                              {testMaskBadPixels7, 885, "pmMaskBadPixels - Attempt to use input image bigger than mask", 0, false},
+                              {testMaskBadPixels8, 885, "pmMaskBadPixels - Attempt to use input image mask bigger than mask", 0, false},
+                              {testMaskBadPixels9, 885, "pmMaskBadPixels - Attempt to use offset greater than input image", 0, false},
+                              {testMaskBadPixels10, 885, "pmMaskBadPixels - Attempt to use complex input image", 0, false},
+                              {testMaskBadPixels11, 885, "pmMaskBadPixels - Attempt to use non-mask type mask image", 0, false},
                               {NULL}
                           };
@@ -71,10 +91,7 @@
 
 
-int testMaskBadPixels( void )
-{
-
-
+int testMaskBadPixels1( void )
+{
     // Test A - Create mask based on maskVal argument
-    printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument");
     CREATE_AND_SET_IMAGE(inImage1,F64,0,50,50);
     CREATE_AND_SET_IMAGE(mask1,U8,0,50,50)
@@ -87,10 +104,11 @@
     psFree(inReadout);
     psFree(inImage1);
-    printFooter(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels2( void )
+{
     // Test B - Create mask based on saturation argument
-    printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument");
     CREATE_AND_SET_IMAGE(inImage2,F64,150.0,50,50);
     CREATE_AND_SET_IMAGE(mask2,U8,0,50,50)
@@ -102,10 +120,11 @@
     psFree(inReadout2);
     psFree(inImage2);
-    printFooter(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels3( void )
+{
     // Test C - Create mask based on growVal and grow arguments
-    printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments");
     CREATE_AND_SET_IMAGE(inImage3,F64,50.0,50,50);
     CREATE_AND_SET_IMAGE(mask3,U8,0,50,50)
@@ -120,10 +139,11 @@
     psFree(inReadout3);
     psFree(inImage3);
-    printFooter(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels4( void )
+{
     // Test D - Auto Create mask based on maskVal argument
-    printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument");
     CREATE_AND_SET_IMAGE(inImage4,F64,50.0,50,50);
     CREATE_AND_SET_IMAGE(mask4,U8,0,50,50)
@@ -138,24 +158,23 @@
     psFree(inReadout4);
     psFree(inImage4);
-    printFooter(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels5( void )
+{
     // Test E - Attempt to use null mask
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test E - Attempt to use null mask",
-                            "Null not allowed for mask image", 0);
     CREATE_AND_SET_IMAGE(inImage5,F64,50.0,50,50);
     psReadout *inReadout5 = psReadoutAlloc(0, 0, inImage5);
-    pmMaskBadPixels(inReadout4, NULL, 0, 100.0, 1, 10);
+    pmMaskBadPixels(inReadout5, NULL, 0, 100.0, 1, 10);
     psFree(inReadout5);
     psFree(inImage5);
-    printFooter(stdout, "pmMaskBadPixels", "Test E - Attempt to use null mask", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels6( void )
+{
     // Test F - Attempt tp use null input image
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test F - Attempt tp use null input image",
-                            "Null not allowed for input image", 0);
-
     CREATE_AND_SET_IMAGE(mask6,U8,0,50,50)
     psReadout *inReadout6 = psReadoutAlloc(0, 0, NULL);
@@ -163,27 +182,27 @@
     pmMaskBadPixels(inReadout6, mask6, 0, 100.0, 1, 10);
     psFree(inReadout6);
-    printFooter(stdout, "pmMaskBadPixels", "Test F - Attempt tp use null input image", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels7( void )
+{
     // Test G - Attempt to use input image bigger than mask
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask",
-                            "Input image size exceeds that of mask image", 0);
     CREATE_AND_SET_IMAGE(inImage7,F64,0.0,60,60);
     CREATE_AND_SET_IMAGE(mask7,U8,0,50,50)
     CREATE_AND_SET_IMAGE(mask7i,U8,0,50,50)
     psReadout *inReadout7 = psReadoutAlloc(0, 0, inImage7);
-    inReadout4->mask = mask7i;
-    pmMaskBadPixels(inReadout4, mask7, 0, 100.0, 1, 10);
+    inReadout7->mask = mask7i;
+    pmMaskBadPixels(inReadout7, mask7, 0, 100.0, 1, 10);
     psFree(mask7);
     psFree(inReadout7);
     psFree(inImage7);
-    printFooter(stdout, "pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels8( void )
+{
     // Test H - Attempt to use input image mask bigger than mask
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask",
-                            "Input image mask size exceeds that of mask image", 0);
     CREATE_AND_SET_IMAGE(inImage8,F64,0.0,50,50);
     CREATE_AND_SET_IMAGE(mask8,U8,0,50,50)
@@ -195,11 +214,11 @@
     psFree(inReadout8);
     psFree(inImage8);
-    printFooter(stdout, "pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels9( void )
+{
     // Test I - Attempt to use offset greater than input image
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test I - Attempt to use offset greater than input image",
-                            "Total offset >= input image size", 0);
     CREATE_AND_SET_IMAGE(inImage9,F64,0.0,50,50);
     CREATE_AND_SET_IMAGE(mask9,U8,0,50,50)
@@ -207,17 +226,17 @@
     psReadout *inReadout9 = psReadoutAlloc(0, 0, inImage9);
     inReadout9->mask = mask9i;
-    *(int*)&inReadout->col0 = 150;
-    *(int*)&inReadout->row0 = 150;
+    *(int*)&inReadout9->col0 = 150;
+    *(int*)&inReadout9->row0 = 150;
     pmMaskBadPixels(inReadout9, mask9, 0, 100.0, 1, 10);
     psFree(mask9);
     psFree(inReadout9);
     psFree(inImage9);
-    printFooter(stdout, "pmMaskBadPixels", "Test I - Attempt to use offset greater than input image", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels10( void )
+{
     // Test J - Attempt to use complex input image
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test J - Attempt to use complex input image",
-                            "Complex types not allowed for input image", 0);
     CREATE_AND_SET_IMAGE(inImage10,C64,50.0,50,50);
     CREATE_AND_SET_IMAGE(mask10,U8,0,50,50)
@@ -229,15 +248,15 @@
     psFree(inReadout10);
     psFree(inImage10);
-    printFooter(stdout, "pmMaskBadPixels", "Test J - Attempt to use complex input image", true);
-    printf("\n\n\n");
-
-
+
+    return 0;
+}
+
+int testMaskBadPixels11( void )
+{
     // Test K - Attempt to use non-mask type mask image
-    printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image",
-                            "Mask must be PS_TYPE_MASK type", 0);
     CREATE_AND_SET_IMAGE(inImage11,F64,50.0,50,50);
     CREATE_AND_SET_IMAGE(mask11,F64,0,50,50)
     CREATE_AND_SET_IMAGE(mask11i,U8,0,50,50)
-    psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage10);
+    psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage11);
     inReadout11->mask = mask11i;
     pmMaskBadPixels(inReadout11, mask11, 0, 100.0, 1, 10);
@@ -245,7 +264,6 @@
     psFree(inReadout11);
     psFree(inImage11);
-    printFooter(stdout, "pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image", true);
-    printf("\n\n\n");
-
-    return 0;
-}
+
+    return 0;
+}
+