Changeset 6325 for trunk/psModules/test

Timestamp:

Feb 6, 2006, 11:03:25 AM (20 years ago)

Author:

gusciora

Message:

These changes mostly reflect the new psStats SDRS changes.

However, pmObject.c will fail any real test because the call
to psMinimizeLMM() was commented out due to SDRS changes there.

Location:

trunk/psModules/test

Files:

• config/tst_pmConfig.c (modified) (2 diffs)
• config/verified/tst_pmConfig.stderr (modified) (1 diff)
• config/verified/tst_pmConfig.stdout (modified) (1 diff)
• imcombine/verified/tst_pmImageCombine.stdout (modified) (2 diffs)

trunk/psModules/test/config/tst_pmConfig.c

@@ -13 +13 @@
  * pmConfigDB()
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
     str[0] = "ARGS:";
     str[1] = "-site";
-    str[2] = "SampleIPPConfig";
+    str[2] = "data/SampleIPPConfig";
 
     psMetadata *site = psMetadataAlloc();

trunk/psModules/test/config/verified/tst_pmConfig.stderr

@@ -22 +22 @@
     Error: *argc is 0 or less.
 <HOST>|I|readConfig
-    Loading site configuration from file SampleIPPConfig
+    Loading site configuration from file data/SampleIPPConfig
 
 ---> TESTPOINT PASSED (Test Point Driver{pmConfig:} | tst_pmConfig.c)

trunk/psModules/test/config/verified/tst_pmConfig.stdout

@@ -16 +16 @@
 Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.
 ----------------------------------------------------------------
+Calling pmConfigRead() with acceptable arguments.

trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout

@@ -19 +19 @@
 Calling with a NULL stats.  Should generate error, return NULL.
 Calling with acceptable data.  Should generate a psImage.
+Image 0, questionable pixel 0 is (1.000000 2.000000)
+Image 0, questionable pixel 1 is (4.000000 5.000000)
 Image 1, questionable pixel 0 is (0.000000 8.000000)
 Image 1, questionable pixel 1 is (1.000000 2.000000)
-Image 1, questionable pixel 2 is (3.000000 9.000000)
-Image 1, questionable pixel 3 is (4.000000 5.000000)
-Image 1, questionable pixel 4 is (3.000000 8.000000)
-Image 2, questionable pixel 0 is (9.000000 9.000000)
-Image 2, questionable pixel 1 is (0.000000 5.000000)
-Image 2, questionable pixel 2 is (6.000000 2.000000)
-Image 2, questionable pixel 3 is (3.000000 7.000000)
+Image 1, questionable pixel 2 is (9.000000 9.000000)
+Image 1, questionable pixel 3 is (3.000000 9.000000)
+Image 1, questionable pixel 4 is (4.000000 5.000000)
+Image 1, questionable pixel 5 is (3.000000 8.000000)
+Image 2, questionable pixel 0 is (1.000000 2.000000)
+Image 2, questionable pixel 1 is (9.000000 9.000000)
+Image 2, questionable pixel 2 is (0.000000 5.000000)
+Image 2, questionable pixel 3 is (6.000000 2.000000)
+Image 2, questionable pixel 4 is (3.000000 7.000000)
 Image 3, questionable pixel 0 is (7.000000 5.000000)
+Image 4, questionable pixel 0 is (3.000000 8.000000)
 
 
 
 Calling pmRejectPixels() with acceptable data.  Should generate a psArray.
-tst_pmImageCombine.c: Image 0 had 0 rejects.
+tst_pmImageCombine.c: Image 0 had 2 rejects.
+Image 0, rejected pixel 0 is (1.000000 2.000000)
+Image 0, rejected pixel 1 is (4.000000 5.000000)
 tst_pmImageCombine.c: Image 1 had 4 rejects.
 Image 1, rejected pixel 0 is (0.000000 8.000000)
@@ -39 +46 @@
 Image 1, rejected pixel 2 is (4.000000 5.000000)
 Image 1, rejected pixel 3 is (3.000000 8.000000)
-tst_pmImageCombine.c: Image 2 had 3 rejects.
-Image 2, rejected pixel 0 is (0.000000 5.000000)
-Image 2, rejected pixel 1 is (6.000000 2.000000)
-Image 2, rejected pixel 2 is (3.000000 7.000000)
+tst_pmImageCombine.c: Image 2 had 4 rejects.
+Image 2, rejected pixel 0 is (1.000000 2.000000)
+Image 2, rejected pixel 1 is (0.000000 5.000000)
+Image 2, rejected pixel 2 is (6.000000 2.000000)
+Image 2, rejected pixel 3 is (3.000000 7.000000)
 tst_pmImageCombine.c: Image 3 had 1 rejects.
 Image 3, rejected pixel 0 is (7.000000 5.000000)
-tst_pmImageCombine.c: Image 4 had 0 rejects.
+tst_pmImageCombine.c: Image 4 had 1 rejects.
+Image 4, rejected pixel 0 is (3.000000 8.000000)