Changeset 6187 for trunk/psLib/test/types

Timestamp:

Jan 23, 2006, 1:52:15 PM (21 years ago)

Author:

drobbin

Message:

Created psArguments.[ch] and moved psArguments fxn in from psMetadata (& tests).

Location:

trunk/psLib/test/types

Files:

• Makefile.am (modified) (2 diffs)
• tst_psArguments.c (added)
• tst_psMetadata_07.c (modified) (4 diffs)
• verified/tst_psArguments.stderr (added)
• verified/tst_psArguments.stdout (added)
• verified/tst_psMetadata_07.stderr (modified) (1 diff)
• verified/tst_psMetadata_07.stdout (modified) (1 diff)

trunk/psLib/test/types/Makefile.am

@@ -25 +25 @@
         tst_psMetadata_07 \
         tst_psMetadataIO  \
-        tst_psPixels
+        tst_psPixels \
+        tst_psArguments
 
 
@@ -47 +48 @@
 tst_psMetadataIO_SOURCES = tst_psMetadataIO.c
 tst_psPixels_SOURCES = tst_psPixels.c
+tst_psArguments_SOURCES = tst_psArguments.c
 
 check_DATA = \

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -16 +16 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-01-23 20:04:31 $
+*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-01-23 23:52:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 static psS32 testMetaAddPtr(void);
 static psS32 testMetaCopy(void);
-static psS32 testArgument(void);
 
 testDescription tests[] = {
@@ -40 +39 @@
                               {testMetaAddPtr, 4, "Test psMetadataAddPtr", 0, false},
                               {testMetaCopy, 5, "Test psMetadataCopy", 0, false},
-                              {testArgument, 6, "Test psArgument fxns", 0, false},
                               {NULL}
                           };
@@ -276 +274 @@
     return 0;
 }
-
-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 float from argument list\n");
-        }
-    } else {
-        printf("\nFailed to find string in argument list\n");
-        return 1;
-    }
-    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", 0.0);
-
-    printf("\nThis Should print the Argument Help list.\n\n");
-    psArgumentHelp(args);
-
-    if ( !psArgumentParse(args, &argc, argv) || argc != 1 ) {
-        psArgumentHelp(args);
-        psFree(args);
-        return 2;
-    }
-
-    psMetadataPrint(args, 4);
-
-    psFree(args);
-    return 0;
-}
-

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

@@ -50 +50 @@
 ---> TESTPOINT PASSED (psMetadata_07{Test psMetadataCopy} | tst_psMetadata_07.c)
 
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_07.c                                        *
-*            TestPoint: psMetadata_07{Test psArgument fxns}                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata_07{Test psArgument fxns} | tst_psMetadata_07.c)
-

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 
-
-This Should print the Argument Help list.
-
-Optional arguments, with default values:
-    -string    (SomeString)      Test String
-    -int       (1)               Int1
-               (2)               Int2
-    -float     (0.000000e+00)    Test Float
-Updating -string
-    -string (Test String): new
-    -int (Int1): 1
-    -int (Int2): 2
-    -float (Test Float): 0.000000