Changeset 6195 for trunk/psLib/test/types

Timestamp:

Jan 25, 2006, 2:46:54 PM (20 years ago)

Author:

drobbin

Message:

Fixed/updated MetadataCopy (bug579) (& tests). Now makes deeper copies of items.

File:

• trunk/psLib/test/types/tst_psMetadata_07.c (modified) (3 diffs)

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -16 +16 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-01-25 22:18:00 $
+*  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-01-26 00:46:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -291 +291 @@
     psMetadata *md = setupMeta();
 
-
     //Return NULL for NULL input Metadata
     test = psMetadataCopy(test, empty);
+    if (test != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psMetadataCopy failed to return NULL for NULL input metadata.\n");
+        psFree(md);
+        return 1;
+    }
 
     //Return a copy in of md in test
-    test = psMetadataCopy(test, md);
+    test = psMetadataCopy(NULL, md);
     //Check if contents are the same
     psMetadataItem *testItem = NULL;
@@ -307 +312 @@
     mdItem = psMetadataGetAndIncrement(mdIterator);
     while (testItem != NULL || mdItem != NULL ) {
-        if (testItem != mdItem) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                    "Copied psMetadataItem does not match Original.\n");
-        }
         testItem = psMetadataGetAndIncrement(testIterator);
         mdItem = psMetadataGetAndIncrement(mdIterator);
     }
+
+    if (!psMetadataConfigWrite(md, "MDCopy.in") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psMetadataConfigWrite failed to output original metadata contents.\n");
+        return 3;
+    }
+    if (!psMetadataConfigWrite(test, "MDCopy.out") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psMetadataConfigWrite failed to output copied metadata contents.\n");
+        return 4;
+    }
+    FILE *verified;
+    FILE *output;
+    verified = fopen("MDCopy.in", "r");
+    output = fopen("MDCopy.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,
+                    "Copied metadata is smaller than the original.\n");
+            return 5;
+        }
+        if (strncmp(buffer1, buffer2, 100) ) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "Copied metadata contents do not match original metadata contents.\n");
+            return 6;
+        }
+    }
+    if (fscanf(output, "%s", buffer2) != EOF) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, false,
+                "Copied metadata is larger than the original.\n");
+        return 7;
+    }
+    fclose(verified);
+    fclose(output);
+
 
     psFree(testItem);