Changeset 9868 for trunk/psLib

Timestamp:

Nov 6, 2006, 12:31:31 PM (20 years ago)

Author:

drobbin

Message:

Added comment parsing for metadata in parseLine in psMetadataConfig.c. Added ok_strn to pstap.h. Updated # of planned tests in psArguments. Updated testing for psMetadataConfig.

Location:

trunk/psLib

Files:

• src/types/psMetadataConfig.c (modified) (3 diffs)
• test/pstap/src/pstap.h (modified) (2 diffs)
• test/types/metaconf.in (modified) (1 diff)
• test/types/tap_psArguments_all.c (modified) (1 diff)
• test/types/tap_psMetadataConfig_input.c (modified) (1 diff)
• test/types/tap_psMetadataConfig_output.c (modified) (10 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-04 03:15:43 $
+*  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-06 22:31:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -660 +660 @@
                                     break;
                                 }
-                 
+
                                 // Add item to metadata
                                 if(!psMetadataAddItem(md, mdItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
@@ -1169 +1169 @@
                     }
                 }
+
+                char *strValue = NULL;
+                strValue = getToken(&linePtr, "#", &status,true);
+                char *strComment = NULL;
+                strComment = getToken(&linePtr,"~", &status,true);
+
                 // Add metadata to upper level metadata
                 addStatus = psMetadataAdd(upperLevelInfo->metadata,
                                           PS_LIST_TAIL,lowerLevelInfo->name,
                                           PS_DATA_METADATA | flags,
-                                          "",
+                                          strComment, //"",
                                           lowerLevelInfo->metadata);
+                psFree(strValue);
+                psFree(strComment);
                 if(!addStatus) {
                     psFree(keyName);

trunk/psLib/test/pstap/src/pstap.h

@@ -25 +25 @@
 ok(strcmp(VALUE, EXPECT) == 0, COMMENT, ## __VA_ARGS__);
 
+# define ok_strn(VALUE,EXPECT,N,COMMENT, ...)\
+ok(strncmp(VALUE, EXPECT, N) == 0, COMMENT, ## __VA_ARGS__);
+
 #elif __STDC_VERSION__ >= 199901L /* __GNUC__ */
 
@@ -38 +41 @@
 ok(strcmp(VALUE, EXPECT) == 0, __VA_ARGS__);
 
+# define ok_strn(VALUE,EXPECT,N, ...)\
+ok(strncmp(VALUE, EXPECT, N) == 0, __VA_ARGS__);
+
 #else /* __STDC_VERSION__ */
 # error "Needs gcc or C99 compiler for variadic macros."

trunk/psLib/test/types/metaconf.in

@@ -62 +62 @@
       @VECTORNEW S32 1 2 3 4 5   # Newest VECTOR
       cell             STR       pStArRs          # I am a p-Star
-   END  # I AM Newest METADATA
+   END  # I am a metadata
    ITEM02           F32       666.6            # I AM FLOAT
    ITEM03           F64       666.666          # I AM DOUBLE
-END  # I am a metadata
+END
 
      TYPE  C32  3

trunk/psLib/test/types/tap_psArguments_all.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(39);
+    plan_tests(27);
 
     diag("Tests for psArguments Functions");

trunk/psLib/test/types/tap_psMetadataConfig_input.c

@@ -74 +74 @@
     {
         out = psMetadataConfigRead(out, &nfail, "metaconf.in", false);
-        //        psMetadataPrint(NULL, out, 2);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL,

trunk/psLib/test/types/tap_psMetadataConfig_output.c

@@ -25 +25 @@
 int main(void)
 {
-    plan_tests(20);
+    plan_tests(25);
 
     diag("Tests for psMetadataConfig Output Functions");
@@ -181 +181 @@
             "psMetadataConfigWrite:           return false for empty metadata input.");
     }
-    //    psMetadataAddS32(md, PS_LIST_HEAD, "new S32", 0, "", 666);
-    psFree(md);
-    md = setupMeta();
     //Return true for valid inputs
     {
+        psFree(md);
+        md = setupMeta();
         ok( psMetadataConfigWrite(md, "mdcfg.wrt"),
             "psMetadataConfigWrite:           return true for valid inputs.");
+        char configTest[61];
+        char fileStr[62];
+        FILE *mdcfg = fopen("mdcfg.wrt", "r");
+        fgets(fileStr, 61, mdcfg);
+        strncpy(configTest,
+                "item1-1          BOOL      T                # I am a boolean", 60);
+        ok_strn(configTest, fileStr, 60,
+                "psMetadataConfigWrite:           return correct output.");
+        fclose(mdcfg);
     }
 
@@ -228 +236 @@
     {
         ok( !psMetadataConfigPrint(nofile, md),
-            "psMetadataConfigPrint:           return false for read-only FILE* input.");
-    }
+            "psMetadataConfigPrint:          return false for read-only FILE* input.");
+    }
+    fclose(nofile);
     //Return true for valid inputs
     {
         ok( psMetadataConfigPrint(openfile, md),
             "psMetadataConfigPrint:          return true for valid inputs.");
-    }
-
+        fclose(openfile);
+        char configTest[32];
+        char fileStr2[62];
+        FILE *mdcfg = fopen("mdcfg.prt", "r");
+        fgets(fileStr2, 31, mdcfg);
+        while (strlen(fileStr2) < 10)
+        {
+            fgets(fileStr2, 31, mdcfg);
+        }
+        strncpy(configTest,
+                "new S32          S32       666 ", 31);
+        ok_strn(configTest, fileStr2, 30,
+                "psMetadataConfigWrite:          return correct output.");
+        fclose(mdcfg);
+    }
 
     //Check for Memory leaks
     {
-        fclose(nofile);
-        fclose(openfile);
         psFree(md);
         remove
@@ -248 +268 @@
 }
 
-
 void testMetaConfigFormat(void)
 {
-    diag("  >>>Test 1:  psMetadataConfigFormat");
+    diag("  >>>Test 3:  psMetadataConfigFormat");
     psMetadata *md = NULL;
     psString out = NULL;
@@ -292 +311 @@
         psFree(md);
     }
-    //Return false for attempting to format vector with type = complex
+    //Return NULL for attempting to format vector with type = complex
     {
         psVector *vec = psVectorAlloc(60, PS_TYPE_C64);
@@ -307 +326 @@
         psFree(vec);
     }
-    //Return false for attempting to format psTime with type = -1
+    //Return NULL for attempting to format psTime with type = -1
     {
         psFree(md);
@@ -320 +339 @@
         psFree(time);
     }
-    //Return true for attempting to format NULL psTime metadataItem
+    //Return valid metadata for attempting to format NULL psTime metadataItem
     {
         psFree(md);
@@ -333 +352 @@
             "psMetadataConfigFormat:         return valid metadata for metadata "
             "containing a NULL time.");
+        char configTest[32];
+        strncpy(configTest, "time             TAI       NULL", 31);
+        ok_strn(configTest, out, 31,
+                "psMetadataConfigFormat:         return correct output string.");
         psFree(time);
         psFree(out);
         out = NULL;
     }
-    //Return true for attempting to format NULL psTime metadataItem
+    //Return valid metadata for attempting to format NULL psTime metadataItem
     {
         psFree(md);
@@ -347 +370 @@
             "psMetadataConfigFormat:         return valid metadata for metadata "
             "containing a NULL time.");
+        char configTest[62];
+        strncpy(configTest, "new_S32 MULTI\nnew_S32          S32       666", 61);
+        ok_strn(configTest, out, strlen(configTest),
+                "psMetadataConfigFormat:         return correct output string.");
         psFree(out);
         out = NULL;
     }
-    //Return true for attempting to format NULL psTime metadataItem
+    //Return valid metadata for attempting to format NULL psTime metadataItem
     {
         psFree(md);
@@ -358 +385 @@
         psMetadataAddS32(md, PS_LIST_TAIL, "f32", PS_META_DUPLICATE_OK, "f32_2", 665);
         out = psMetadataConfigFormat(md);
-        //        printf("\n%s\n", out);
         ok( out != NULL,
             "psMetadataConfigFormat:         return valid metadata for metadata "
             "containing a NULL time.");
+        char configTest[201];
+        strncpy(configTest,
+                "f32 MULTI"
+                "\nf32              S32       666              # f32_1"
+                "\nf32              S32       666              # f32_3"
+                "\nf32              S32       665              # f32_2", 200);
+        ok_strn(configTest, out, strlen(configTest),
+                "psMetadataConfigFormat:         return correct output string.");
         psFree(out);
         out = NULL;
     }
 
-    /*    //Return true for valid inputs
-    {
-    skip_start(  !psMetadataConfigWrite(md, "mdcfg.wrt"), 2,
-    "Skipping 2 tests because psMetadataConfigWrite failed");
-    out = psMetadataConfigRead(out, &nfail, "mdcfg.wrt", false);
-    psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
-    ok( out != NULL && nfail == 0,
-    "psMetadataConfigRead:           return correct metadata for valid inputs.");
-    skip_start(  tempItem == NULL, 1,
-    "Skipping 1 tests because metadata container is empty!");
-    ok_str( tempItem->name, "new_S32",
-    "psMetadataConfigRead:           return correct metadataItem from "
-    "returned metadata.");
-    skip_end();
-    skip_end();
-    }
-    */
     //Check for Memory leaks
     {
-        //        psFree(out);
-        //        remove("mdcfg.wrt");
         psFree(md);
         checkMem();