Changeset 4899

Timestamp:

Aug 29, 2005, 3:51:59 PM (21 years ago)

Author:

drobbin

Message:

Updated tests for psMemCheckType functions.

Location:

trunk/psLib/test/sys

Files:

• table.fits (added)
• tableF32.dat (added)
• tst_psMemory.c (modified) (8 diffs)
• verified/tst_psMemory.stderr (modified) (1 diff)

trunk/psLib/test/sys/tst_psMemory.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-30 01:14:13 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-30 01:51:59 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -539 +539 @@
 static psS32 memCheckTypes( void )
 {
-    //    psArray *negative;
-    //    negative = psArrayAlloc(2);
-    //    psMetadata *neg;
-    //    neg = psMetadataAlloc();
+    psArray *negative;
+    negative = psArrayAlloc(2);
+    psMetadata *neg;
+    neg = psMetadataAlloc();
 
     psArray *array;
@@ -551 +551 @@
         return 1;
     }
-    //    if ( psMemCheckType(PS_DATA_ARRAY, neg) )
-    //    {
-    //        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckArray failed in memCheckType. \n");
-    //        return 1;
-    //    }
+    psLogMsg( __func__, PS_LOG_INFO, "Next should error from invalid datatype." );
+    if ( !psMemCheckType(PS_DATA_ARRAY, neg) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckArray failed in memCheckType. \n");
+    }
     psFree(array);
 
@@ -565 +564 @@
         return 1;
     }
-    //    if ( psMemCheckType(PS_DATA_BITSET, negative) )
-    //    {
-    //        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckBitSet failed in memCheckType. \n");
-    //        return 1;
-    //    }
+    psLogMsg( __func__, PS_LOG_INFO, "Next should error from invalid datatype." );
+    if ( !psMemCheckType(PS_DATA_BITSET, negative) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckBitSet failed in memCheckType. \n");
+    }
     psFree(bits);
 
@@ -581 +579 @@
     psFree(cube);
 
-    /*
-        psFits *fits;
-        char *filename = "";
-        fits = psFitsAlloc(filename);
-        if ( !psMemCheckType(PS_DATA_FITS, fits) )
-        {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckFits failed in memCheckType. \n");
-            psFree(fits);
-            return 1;
-        }
+    psFits *fits;
+    char *filename = "table.fits";
+    fits = psFitsAlloc(filename);
+    if ( !psMemCheckType(PS_DATA_FITS, fits) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckFits failed in memCheckType. \n");
         psFree(fits);
-    */
+        return 1;
+    }
+    psFree(fits);
+
     psHash *hash;
     hash = psHashAlloc(100);
@@ -638 +634 @@
     psFree(list);
 
-    /*
-        psLookupTable *lookup;
-        char *filename = "";
-        char *format = "%d";
-        lookup = psLookupTableAlloc(filename, format, 0);
-        if ( !psMemCheckType(PS_DATA_LOOKUPTABLE, lookup) )
-        {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckLookupTable failed in memCheckType. \n");
-            psFree(lookup);
-            return 1;
-        }
+    psLookupTable *lookup;
+    char *file = "tableF32.dat";
+    char *format = "\%f \%lf \%d \%ld";
+    lookup = psLookupTableAlloc(file, format, 10);
+    if ( !psMemCheckType(PS_DATA_LOOKUPTABLE, lookup) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckLookupTable failed in memCheckType. \n");
         psFree(lookup);
-    */
+        return 1;
+    }
+    psFree(lookup);
+
     psMetadata *metadata;
     metadata = psMetadataAlloc();
@@ -805 +799 @@
     psFree(stats);
 
-    /*    psTime *time;
-        time = psTimeAlloc(PS_TIME_UT1);
-        if ( !psMemCheckType(PS_DATA_TIME, time) )
-        {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckTime failed in memCheckType. \n");
-            psFree(time);
-            return 1;
-        }
+    psTime *time;
+    time = psTimeAlloc(PS_TIME_UT1);
+    if ( !psMemCheckType(PS_DATA_TIME, time) )  {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckTime failed in memCheckType. \n");
         psFree(time);
-    */
+        return 1;
+    }
+    psFree(time);
+
     psVector *vector;
     vector = psVectorAlloc(100, PS_TYPE_F32);
@@ -825 +818 @@
 
 
-    //    psFree(negative);
-    //    psFree(neg);
+    psFree(negative);
+    psFree(neg);
 
     return 0;

trunk/psLib/test/sys/verified/tst_psMemory.stderr

@@ -157 +157 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|memCheckTypes
+    Next should error from invalid datatype.
+<DATE><TIME>|<HOST>|E|psMemCheckType (FILE:LINENO)
+    Incorrect pointer.  Datatypes do not match.
+<DATE><TIME>|<HOST>|E|memCheckTypes (FILE:LINENO)
+    psMemCheckArray failed in memCheckType. 
+<DATE><TIME>|<HOST>|I|memCheckTypes
+    Next should error from invalid datatype.
+<DATE><TIME>|<HOST>|E|psMemCheckType (FILE:LINENO)
+    Incorrect pointer.  Datatypes do not match.
+<DATE><TIME>|<HOST>|E|memCheckTypes (FILE:LINENO)
+    psMemCheckBitSet failed in memCheckType. 
 
 ---> TESTPOINT PASSED (psMemory{psMemCheckType} | tst_psMemory.c)