Changeset 6190 for trunk/psLib/test/types

Timestamp:

Jan 25, 2006, 12:18:00 PM (20 years ago)

Author:

drobbin

Message:

fixed ConfigFormat, Write. Added extra error checks. Updated/expanded corresponding tests.

Location:

trunk/psLib/test/types

Files:

• mdcfgwrt.verified (added)
• tst_psMetadata_07.c (modified) (3 diffs)
• verified/tst_psMetadata_07.stderr (modified) (1 diff)
• verified/tst_psMetadata_07.stdout (modified) (1 diff)

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -16 +16 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-01-23 23:52:15 $
+*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-01-25 22:18:00 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
         vec->data.S32[i] = i+1;
     }
+    vec->n = 5;
     time->sec = 1000;
     time->nsec = 25;
@@ -137 +138 @@
 {
     psMetadata *newMD = NULL;
+    //Return false for NULL input metadata
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if (psMetadataConfigWrite(newMD, "mdcfgwrt.out")) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                "psMetadataConfigWrite failed to return false for NULL input metadata.\n");
+        return 1;
+    }
     newMD = setupMeta();
-    printPositiveTestHeader(stdout, "psMetadata", "Test E - psMetadataConfigWrite");
+    //Return false for NULL input filename
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if (psMetadataConfigWrite(newMD, NULL)) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                "psMetadataConfigWrite failed to return false for NULL input filename.\n");
+        return 2;
+    }
+    //Return false for bad input filename
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if (psMetadataConfigWrite(newMD, "temp")) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                "psMetadataConfigWrite failed to return false for bad input filename.\n");
+        return 3;
+    }
+    //Return true for valid inputs
     if ( !psMetadataConfigWrite(newMD, "mdcfgwrt.out") ) {
         fprintf(stderr, "Failed test point E - Failed to write metadata to file. \n");
-    }
-
-    printFooter(stdout, "psMetadata", "Test E - psMetadataConfigWrite", true);
+        return 4;
+    }
+
+    //Make sure the output file matches the verified file output.
+    FILE *verified;
+    FILE *output;
+    verified = fopen("mdcfgwrt.verified", "r");
+    output = fopen("mdcfgwrt.out", "r");
+    char buffer1[100];
+    char buffer2[100];
+    while ( fscanf(verified, "%s", buffer1) != EOF ) {
+        if (fscanf(output, "%s", buffer2) == EOF) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, false,
+                    "Output file is smaller than the expected output file.\n");
+            return 5;
+        }
+        if (strncmp(buffer1, buffer2, 100) ) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "Output file contents do not match the expected output.\n");
+            return 6;
+        }
+    }
+    if (fscanf(output, "%s", buffer2) != EOF) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, false,
+                "Output file is larger than the expected output file.\n");
+        return 7;
+    }
+    fclose(verified);
+    fclose(output);
+
     psFree(newMD);
     return 0;

trunk/psLib/test/types/verified/tst_psMetadata_07.stderr

@@ -14 +14 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|testMetaWrite
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataConfigWrite (FILE:LINENO)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|I|testMetaWrite
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataConfigWrite (FILE:LINENO)
+    Unallowable operation: filename is NULL.
+<DATE><TIME>|<HOST>|I|testMetaWrite
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataConfigWrite (FILE:LINENO)
+    Failed to open specified file, temp
 
 ---> TESTPOINT PASSED (psMetadata_07{Test psMetadataConfigWrite} | tst_psMetadata_07.c)

trunk/psLib/test/types/verified/tst_psMetadata_07.stdout

@@ -35 +35 @@
 ---> TESTPOINT PASSED (psMetadata{Test D - Get and Decrement Iterator} | tst_psMetadata_07.c)
 
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_07.c                                        *
-*            TestPoint: psMetadata{Test E - psMetadataConfigWrite}                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test E - psMetadataConfigWrite} | tst_psMetadata_07.c)
-