Changeset 3952 for trunk/psLib/test/collections/tst_psMetadataIO.c

Timestamp:

May 16, 2005, 12:19:49 PM (21 years ago)

Author:

evanalst

Message:

Update for additional test cases in SDR appendix A.

File:

• trunk/psLib/test/collections/tst_psMetadataIO.c (modified) (7 diffs)

trunk/psLib/test/collections/tst_psMetadataIO.c

@@ -13 +13 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-05-16 19:41:40 $
+ *  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-05-16 22:19:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 static psS32 testMetadataParseConfig1(void);
 static psS32 testMetadataParseConfig2(void);
+static psS32 testMetadataParseConfig3(void);
+static psS32 testMetadataParseConfig4(void);
 
 testDescription tests[] = {
@@ -32 +34 @@
                               {testMetadataParseConfig1,000,"psMetadataParseConfig",0,false},
                               {testMetadataParseConfig2,000,"psMetadataParseConfig",0,false},
+                              {testMetadataParseConfig3,000,"psMetadataParseConfig",0,false},
+                              {testMetadataParseConfig4,000,"psMetadataParseConfig",0,false},
                               {NULL}
                           };
@@ -46 +50 @@
 
 #define ERROR_TOL  0.0001
+
+const char testConfig5[] = "test5.config";
+const psS32 testConfig5Fails = 7;
+
+const char testConfig4[] = "test4.config";
+const psS32 testConfig4Fails = 0;
 
 const char testConfig3[] = "test3.config";
@@ -378 +388 @@
     case PS_META_META:
         printf("%s%-25s METADATA\n",indentStr,metadataItem->name);
-        writeMetadata((psMetadata*)metadataItem->data.md,"    ");
+        char nestedStr[256] = "    ";
+        strcat(nestedStr,indentStr);
+        writeMetadata((psMetadata*)metadataItem->data.md,nestedStr);
+        printf("%sEND",indentStr);
         break;
     default:
@@ -955 +968 @@
     psS32             failedLines    = 0;
 
-    // Read config file test1.config with overwrite set false
+    // Read config file test3.config with overwrite set false
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error of duplicate key names");
     metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig3,false);
@@ -971 +984 @@
 }
 
+psS32 testMetadataParseConfig3(void)
+{
+    psMetadata*       metadata1      = NULL;
+    psS32             failedLines    = 0;
+
+    // Read config file test4.config with overwrite set false
+    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig4,false);
+    // Verify the expected number of failed lines
+    if(!checkFailedLines(failedLines,testConfig4Fails,(char*)testConfig4)) {
+        return 1;
+    }
+    // Print out metadata items for comparison against STDERR verified file
+    writeMetadata(metadata1,"");
+
+    psFree(metadata1);
+
+    return 0;
+}
+
+psS32 testMetadataParseConfig4(void)
+{
+    psMetadata*       metadata1      = NULL;
+    psS32             failedLines    = 0;
+
+    // Read config file test4.config with overwrite set false
+    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig5,true);
+    // Verify the expected number of failed lines
+    if(!checkFailedLines(failedLines,testConfig5Fails,(char*)testConfig5)) {
+        return 1;
+    }
+    psFree(metadata1);
+
+    return 0;
+}
+