Changeset 7448 for trunk/psLib/test/types

Timestamp:

Jun 8, 2006, 3:25:42 PM (20 years ago)

Author:

drobbin

Message:

Added psMetadataPrint to tst_01 (moved from 07) and expanded test. Added type support to code for printing vectors. Also added FILE* argument to psMetadataPrint per SDRS.

Location:

trunk/psLib/test/types

Files:

• tst_psArguments.c (modified) (2 diffs)
• tst_psMetadata_01.c (modified) (3 diffs)
• verified/tst_psArguments.stdout (modified) (1 diff)
• verified/tst_psMetadata_01.stdout (modified) (1 diff)

trunk/psLib/test/types/tst_psArguments.c

@@ -5 +5 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-05-25 03:51:51 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-06-09 01:25:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
     }
 
-    psMetadataPrint(args, 4);
+    psMetadataPrint(NULL, args, 4);
 
     psFree(args);

trunk/psLib/test/types/tst_psMetadata_01.c

@@ -5 +5 @@
 *  @author  dRob, MHPCC
 *
-*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-06-07 01:39:17 $
+*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-06-09 01:25:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
     return ( !runTestSuite(stderr,"psMetadata_01",tests,argc,argv) );
 
-}
-
-static psMetadata *setupMeta(void)
-{
-    psMetadata *md = NULL;
-    md = psMetadataAlloc();
-
-    psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true);
-    psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55);
-    psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14);
-    psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28);
-    psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS");
-
-    return md;
 }
 
@@ -110 +96 @@
 }
 
+static psMetadata *setupMeta2(void)
+{
+    psMetadata *md = NULL;
+    psVector *vec = NULL;
+    psMetadata *newMD = NULL;
+    psTime *time;
+    int i = 0;
+    md = psMetadataAlloc();
+    newMD = psMetadataAlloc();
+    vec = psVectorAlloc(60, PS_DATA_S32);
+    time = psTimeAlloc(PS_TIME_TAI);
+    for (i = 0; i < 5; i++) {
+        vec->data.S32[i] = i+1;
+    }
+    vec->n = 5;
+    time->sec = 1000;
+    time->nsec = 25;
+    time->leapsecond = true;
+    psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true);
+    psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55);
+    psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, NULL, 3.14);
+    psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "", 6.28);
+    psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS");
+    psMetadataAddVector(md, PS_LIST_TAIL, "vector6", 0, "I am a vector", vec);
+    psMetadataAddTime(md, PS_LIST_TAIL, "time01", 0, "I am time", time);
+    psMetadataAddS8(md, PS_LIST_TAIL, "item6", 0, "I am S8", 6);
+    psMetadataAddS16(md, PS_LIST_TAIL, "item7", 0, "I am S16", -666);
+    psMetadataAddU8(md, PS_LIST_TAIL, "item8", 0, "I am U8", 6);
+    psMetadataAddU16(md, PS_LIST_TAIL, "item9", 0, "I am U16", 666);
+    psMetadataAddU32(md, PS_LIST_TAIL, "item10", 0, "I am U32", 666);
+
+    psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", 0, NULL, 666);
+    psMetadata *newestMD = NULL;
+    newestMD = psMetadataAlloc();
+    psMetadataAddVector(newestMD, PS_LIST_TAIL, "VECTORNEW", 0, "Newest VECTOR", vec);
+    psMetadataAddStr(newestMD, PS_LIST_TAIL, "cell", 0, "I am a p-Star", "pStArRs");
+    psMetadataAddMetadata(newMD, PS_LIST_TAIL, "META NEW", 0, "I AM Newest METADATA", newestMD);
+    psMetadataAddF32(newMD, PS_LIST_TAIL, "ITEM02", 0, "I AM FLOAT", 666.6);
+    psMetadataAddF64(newMD, PS_LIST_TAIL, "ITEM03", 0, "I AM DOUBLE", 666.666);
+
+    psMetadataAddMetadata(md, PS_LIST_TAIL, "metadata7", 0, "I am a metadata", newMD);
+    psFree(time);
+    psFree(newestMD);
+    psFree(vec);
+    psFree(newMD);
+    return md;
+}
+
 psS32 testMetadataPrint(void)
 {
     psMetadata *meta = NULL;
-    meta = setupMeta();
-    psMetadataPrint(meta, 0);
+    meta = setupMeta2();
+    psMetadataPrint(NULL, meta, 0);
     psFree(meta);
     return 0;

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

@@ -10 +10 @@
     -int       (1)               Int1
                (2)               Int2
-    -string (Test String): new
-    -float (Test Float): 0.000000
-    -int (Integers): 
-     int1 (Int1): 1
-     int2 (Int2): 2
+        -string (Test String): new
+        -float (Test Float): 0.000000
+        -int (Integers): 
+          int1 (Int1): 1
+          int2 (Int2): 2
+        -int  -- END
 

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

@@ -1 +1 @@
 item1 (I am a boolean): True
 item2 (I am a integer): 55
-item3 (I am a float): 3.140000
-item4 (I am a double): 6.280000
+item3: 3.140000
+item4: 6.280000
 item5 (I am a string): GNIRTS
+vector6 (I am a vector): S32  1 2 3 4 5 
+time01 (I am time): 1970-01-01T<DATE>.0Z
+item6 (I am S8): 6
+item7 (I am S16): -666
+item8 (I am U8): 6
+item9 (I am U16): 666
+item10 (I am U32): 666
+metadata7 (I am a metadata): 
+  ITEM01: 666
+  META NEW (I AM Newest METADATA): 
+    VECTORNEW (Newest VECTOR): S32  1 2 3 4 5 
+    cell (I am a p-Star): pStArRs
+  META NEW  -- END
+
+  ITEM02 (I AM FLOAT): 666.599976
+  ITEM03 (I AM DOUBLE): 666.666000
+metadata7  -- END
+