cmd: Add accessor functions for options

[openafs.git] / tests / cmd / command-t.c

diff --git a/tests/cmd/command-t.c b/tests/cmd/command-t.c
index bbd2997..c599f49 100644 (file)
--- a/tests/cmd/command-t.c
+++ b/tests/cmd/command-t.c
@@ -53,10 +53,13 @@ main(int argc, char **argv)
 {
     char *tv[100];
     struct cmd_syndesc *opts;
+    struct cmd_syndesc *retopts;
     int code;
     int tc;
+    int retval;
+    char *retstring;
 
-    plan(25);
+    plan(58);
 
     initialize_CMD_error_table();
 
@@ -70,6 +73,12 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(0, code, "dispatching simple comamnd line succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "parsing simple command line succeeds");
+    is_string("foo", retopts->parms[0].items->data, " ... 1st option matches");
+    is_string("bar", retopts->parms[1].items->data, " ... 2nd option matches");
+    ok(retopts->parms[2].items != NULL, " ... 3rd option matches");
+    cmd_FreeOptions(&retopts);
     cmd_FreeArgv(tv);
 
     /* unknown switch */
@@ -77,6 +86,8 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(CMD_UNKNOWNSWITCH, code, "invalid options fail as expected");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_UNKNOWNSWITCH, code, "and still fail with cmd_Parse");
     cmd_FreeArgv(tv);
 
     /* missing parameter */
@@ -84,6 +95,8 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(CMD_TOOFEW, code, "missing parameters fail as expected");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_TOOFEW, code, "and still fail with cmd_Parse");
     cmd_FreeArgv(tv);
 
     /* missing option */
@@ -91,22 +104,26 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(CMD_UNKNOWNSWITCH, code, "missing options fail as expected");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_UNKNOWNSWITCH, code, "and still fail with cmd_Parse");
     cmd_FreeArgv(tv);
 
     code = cmd_ParseLine("-first foo baz -second bar -third -flag", tv, &tc, 100);
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(CMD_NOTLIST, code, "too many parameters fails as expected");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_NOTLIST, code, "and still fail with cmd_Parse");
     cmd_FreeArgv(tv);
 
-
-
-
     /* Positional parameters */
     code = cmd_ParseLine("foo bar -flag", tv, &tc, 100);
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(0, code, "dispatching positional parameters succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "and works with cmd_Parse");
+    cmd_FreeOptions(&retopts);
     cmd_FreeArgv(tv);
 
     /* Abbreviations */
@@ -114,6 +131,10 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(0, code, "dispatching abbreviations succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "and works with cmd_Parse");
+    cmd_FreeOptions(&retopts);
+
     cmd_FreeArgv(tv);
 
     /* Ambiguous */
@@ -121,7 +142,79 @@ main(int argc, char **argv)
     is_int(0, code, "cmd_ParseLine succeeds");
     code = cmd_Dispatch(tc, tv);
     is_int(CMD_UNKNOWNSWITCH, code, "ambiguous abbreviations correctly fail");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_UNKNOWNSWITCH, code, "and fail with cmd_Parse too");
+    cmd_FreeArgv(tv);
+
+    /* Disable positional commands */
+    cmd_DisablePositionalCommands();
+    code = cmd_ParseLine("foo bar -flag", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Dispatch(tc, tv);
+    is_int(CMD_NOTLIST, code, "positional parameters can be disabled");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_NOTLIST, code, "and fail with cmd_Parse too");
+    cmd_FreeArgv(tv);
+
+    /* Disable abbreviations */
+    cmd_DisableAbbreviations();
+    code = cmd_ParseLine("-fi foo -s bar -flag", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Dispatch(tc, tv);
+    is_int(CMD_UNKNOWNSWITCH, code, "dispatching abbreviations succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(CMD_UNKNOWNSWITCH, code, "and fail with cmd_Parse too");
+
     cmd_FreeArgv(tv);
 
+    /* Try the new cmd_Parse function with something different*/
+    code = cmd_ParseLine("-first one -second two -flag", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "Parsing with cmd_Parse works");
+    is_string("one", retopts->parms[0].items->data, " ... 1st option matches");
+    is_string("two", retopts->parms[1].items->data, " ... 2nd option matches");
+    ok(retopts->parms[2].items != NULL, " ... 3rd option matches");
+
+    cmd_FreeOptions(&retopts);
+    cmd_FreeArgv(tv);
+    /* Try adding a couple of parameters at specific positions */
+    cmd_AddParmAtOffset(opts, "-fifth", CMD_SINGLE, CMD_OPTIONAL,
+                      "fifth option", 5);
+    cmd_AddParmAtOffset(opts, "-fourth", CMD_SINGLE, CMD_OPTIONAL,
+                      "fourth option", 4);
+    code = cmd_ParseLine("-first a -fourth b -fifth c", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "parsing our new options succeeds");
+    is_string("b", retopts->parms[4].items->data, " Fourth option in right place");
+    is_string("c", retopts->parms[5].items->data, " Fifth option in right place");
+    cmd_FreeOptions(&retopts);
+    cmd_FreeArgv(tv);
+
+    /* Check Accessors */
+    code = cmd_ParseLine("-first 1 -second second -flag", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+
+    code = cmd_OptionAsInt(retopts, 0, &retval);
+    is_int(0, code, "cmd_OptionsAsInt succeeds");
+    is_int(1, retval, " ... and returns correct value");
+
+    code = cmd_OptionAsString(retopts, 1, &retstring);
+    is_int(0, code, "cmd_OptionsAsString succeeds");
+    is_string("second", retstring, " ... and returns correct value");
+    free(retstring);
+    retstring = NULL;
+
+    code = cmd_OptionAsFlag(retopts, 2, &retval);
+    is_int(0, code, "cmd_OptionsAsFlag succeeds");
+    ok(retval, " ... and flag is correct");
+
+    cmd_FreeOptions(&retopts);
+    cmd_FreeArgv(tv);
+
+
     return 0;
 }
+