Index: trunk/psLib/test/math/tst_psStats07.c
===================================================================
--- trunk/psLib/test/math/tst_psStats07.c	(revision 4861)
+++ trunk/psLib/test/math/tst_psStats07.c	(revision 5113)
@@ -34,12 +34,10 @@
     float realMeanNoMask = MEAN;
     float realMedianNoMask = MEAN;
-    float realModeNoMask = MEAN;
-    float realStdevNoMask = STDEV * 0.20;
+    //    float realModeNoMask = MEAN;
+    float realStdevNoMask = STDEV;
     float realLQNoMask = MEAN - ( 0.6 * STDEV );
     float realUQNoMask = MEAN + ( 0.6 * STDEV );
     psS32 realN50NoMask = N / 4;
     psS32 realNfitNoMask = N / 4;
-
-    psTraceSetLevel(".psLib.dataManip", 0);
 
     /*************************************************************************/
@@ -55,4 +53,7 @@
     maskVector->n = N;
     myVector = p_psGaussianDev( MEAN, STDEV, N );
+    // Create a full outliers:
+    myVector->data.F32[N/4] = -1000.0 * MEAN;
+    myVector->data.F32[N/2] = 1000.0 * MEAN;
     // Set the mask vector and calculate the expected maximum.
     for ( i = 0;i < N;i++ ) {
@@ -72,4 +73,8 @@
 
     myStats = psVectorStats( myStats, myVector, NULL, NULL, 0 );
+    if (myStats == NULL) {
+        printf("TEST ERROR: psVectorStats() returned NULL.\n");
+        return(false);
+    }
 
     printf( "The expected Mean was %.2f; the calculated Mean was %.2f\n",
@@ -105,23 +110,23 @@
                  testStatus );
 
-    printPositiveTestHeader( stdout,
-                             "psStats functions",
-                             "PS_STAT_ROBUST_STATS: robust Mode: no vector mask" );
-
-
-    printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n",
-            realModeNoMask, myStats->robustMode );
-    if ( fabs( myStats->robustMode - realModeNoMask ) < ( ERROR_TOLERANCE * realModeNoMask ) ) {
-        testStatus = true;
-    } else {
-        testStatus = false;
-        globalTestStatus = false;
-    }
-    printFooter( stdout,
-                 "psVector functions",
-                 "PS_STAT_ROBUST_STATS: robust Mode: no vector mask",
-                 testStatus );
-
-
+    /* XXX: Should we test mode?
+        printPositiveTestHeader( stdout,
+                                 "psStats functions",
+                                 "PS_STAT_ROBUST_STATS: robust Mode: no vector mask" );
+     
+     
+        printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n",
+                realModeNoMask, myStats->robustMode );
+        if ( fabs( myStats->robustMode - realModeNoMask ) < ( ERROR_TOLERANCE * realModeNoMask ) ) {
+            testStatus = true;
+        } else {
+            testStatus = false;
+            globalTestStatus = false;
+        }
+        printFooter( stdout,
+                     "psVector functions",
+                     "PS_STAT_ROBUST_STATS: robust Mode: no vector mask",
+                     testStatus );
+    */
 
     printPositiveTestHeader( stdout,
@@ -143,5 +148,4 @@
 
 
-
     printPositiveTestHeader( stdout,
                              "psStats functions",
@@ -161,6 +165,4 @@
                  "PS_STAT_ROBUST_STATS: lower quartile: no vector mask",
                  testStatus );
-
-
 
     printPositiveTestHeader( stdout,
@@ -180,6 +182,4 @@
                  "PS_STAT_ROBUST_STATS: lower quartile: no vector mask",
                  testStatus );
-
-
 
     printPositiveTestHeader( stdout,
@@ -205,6 +205,4 @@
                  testStatus );
 
-
-
     printPositiveTestHeader( stdout,
                              "psStats functions",
@@ -228,5 +226,4 @@
                  "PS_STAT_ROBUST_STATS: robust Nfit: no vector mask",
                  testStatus );
-    return(testStatus);
 
     /*************************************************************************/
@@ -252,9 +249,5 @@
                  testStatus );
 
-    if (globalTestStatus == false)
-        printf("Returning FALSE\n");
-    else
-        printf("Returning TRUE\n");
-    return ( !globalTestStatus );
+    return ( globalTestStatus );
 }
 
@@ -276,13 +269,10 @@
     float realMeanWithMask = MEAN;
     float realMedianWithMask = MEAN;
-    float realModeWithMask = MEAN;
-    float realStdevWithMask = STDEV * 0.20;
+    //    float realModeWithMask = MEAN;
+    float realStdevWithMask = STDEV;
     float realLQWithMask = MEAN;
     float realUQWithMask = MEAN;
     psS32 realN50WithMask = N / 4;
     psS32 realNfitWithMask = N / 4;
-
-    psTraceSetLevel(".psLib.dataManip.psStats", 0);
-
     /*************************************************************************/
     /*  Allocate and initialize data structures                              */
@@ -316,4 +306,8 @@
     printf( "Calling psVectorStats() on a vector with elements masked.\n" );
     myStats = psVectorStats( myStats, myVector, NULL, maskVector, 1 );
+    if (myStats == NULL) {
+        printf("TEST ERROR: psVectorStats() returned NULL.\n");
+        return(false);
+    }
     printf( "Called psVectorStats() on a vector with elements masked.\n" );
     printf( "The expected Mean was %.2f; the calculated Mean was %.2f\n",
@@ -348,22 +342,22 @@
 
 
-
-    printPositiveTestHeader( stdout,
-                             "psStats functions",
-                             "PS_STAT_ROBUST_STATS: robust Mode: with vector mask" );
-
-    printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n",
-            realModeWithMask, myStats->robustMode );
-    if ( fabs( myStats->robustMode - realModeWithMask ) < ( ERROR_TOLERANCE * realModeWithMask ) ) {
-        testStatus = true;
-    } else {
-        testStatus = false;
-        globalTestStatus = false;
-    }
-    printFooter( stdout,
-                 "psVector functions",
-                 "PS_STAT_ROBUST_STATS: robust Mode: with vector mask",
-                 testStatus );
-
+    /* XXX: mode is not set?
+        printPositiveTestHeader( stdout,
+                                 "psStats functions",
+                                 "PS_STAT_ROBUST_STATS: robust Mode: with vector mask" );
+     
+        printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n",
+                realModeWithMask, myStats->robustMode );
+        if ( fabs( myStats->robustMode - realModeWithMask ) < ( ERROR_TOLERANCE * realModeWithMask ) ) {
+            testStatus = true;
+        } else {
+            testStatus = false;
+            globalTestStatus = false;
+        }
+        printFooter( stdout,
+                     "psVector functions",
+                     "PS_STAT_ROBUST_STATS: robust Mode: with vector mask",
+                     testStatus );
+    */
 
 
@@ -489,10 +483,5 @@
                  testStatus );
 
-    if (globalTestStatus == false)
-        printf("Returning FALSE\n");
-    else
-        printf("Returning TRUE\n");
-
-    return ( !globalTestStatus );
+    return ( globalTestStatus );
 }
 
@@ -500,7 +489,9 @@
 {
     psLogSetFormat("HLNM");
-    psBool rc = t00();
-    rc |= t01();
-
-    return(rc);
+    psTraceSetLevel(".", 0);
+    psTraceSetLevel("psGaussian", 0);
+    psBool rc0 = t00();
+    psBool rc1 = t01();
+
+    return(rc0 & rc1);
 }