Changeset 5222 for trunk/psLib/test/types

Timestamp:

Oct 3, 2005, 3:31:40 PM (21 years ago)

Author:

drobbin

Message:

Added testing for psArgument functions and updated some psTime (minor changes).

Location:

trunk/psLib/test/types

Files:

• tst_psMetadata_07.c (modified) (4 diffs)
• verified/tst_psMetadata_07.stdout (modified) (1 diff)

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -14 +14 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-30 01:34:45 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-10-04 01:31:40 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 static psS32 testMetaRemove(void);
 static psS32 testMetaAddPtr(void);
+static psS32 testArgument(void);
 
 testDescription tests[] = {
@@ -35 +36 @@
                               {testMetaRemove, 0, "Test psMetadataRemoveKey/Index", 0, false},
                               {testMetaAddPtr, 0, "Test psMetadataAddPtr", 0, false},
+                              {testArgument, 0, "Test psArgument fxns", 0, false},
                               {NULL}
                           };
@@ -221 +223 @@
 
 }
+
+psS32 testArgument(void)
+{
+    char *argv[6];
+    argv[0] = "./program";
+    argv[1] = "-string";
+    argv[2] = "new";
+    argv[3] = "-float";
+    argv[4] = "6.66";
+    argv[5] = "-vvv";
+    int argc = 6;
+
+    int i = psArgumentGet(argc, argv, "-float");
+    if ( i != 0 ) {
+        if ( !psArgumentRemove(i, &argc, argv) ) {
+            printf("\n Failed to remove string from argument list\n");
+        }
+    } else {
+        printf("\nFailed to find string in argument list\n");
+    }
+    psArgumentRemove(i, &argc, argv);
+    printf("\n Argument %d has been removed", i);
+    int log = psArgumentVerbosity(&argc, argv);
+    printf("\nLog level = %d \n", log);
+
+    psMetadata *args = psMetadataAlloc();
+    psMetadataAdd(args, PS_LIST_TAIL, "-string", PS_DATA_STRING, "Test String", "SomeString");
+    psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_S32 | PS_META_DUPLICATE_OK, "Int1", 1);
+    psMetadataAdd(args, PS_LIST_TAIL, "-int", PS_DATA_S32 | PS_META_DUPLICATE_OK, "Int2", 2);
+    psMetadataAdd(args, PS_LIST_TAIL, "-float", PS_DATA_F32, "Test Float", 6);
+
+    if ( !psArgumentParse(args, &argc, argv) || argc != 1 ) {
+        psArgumentHelp(args);
+        psFree(args);
+        return 0;
+    }
+
+    psMetadataPrint(args, 4);
+
+    psFree(args);
+    return 0;
+}
+

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

@@ -44 +44 @@
 ---> TESTPOINT PASSED (psMetadata{Test E - psMetadataConfigWrite} | tst_psMetadata_07.c)
 
+
+ Argument 3 has been removed
+Log level = 5 
+Updating -string
+    -string (Test String): new
+    -int (Int1): 1
+    -int (Int2): 2
+    -float (Test Float): 0.000000