X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2Fcmd%2Fcommand-t.c;h=8237f3fb7009fb5d8471b4184386a1ab00844224;hp=aec9c8a7267a28ecfc42f71b50cce2b124fd262e;hb=c877c0b419d04a0e754f99b9d975f2229b660df5;hpb=d0d8b391b0c634f44cb019fd73fddf6ee523cfaa diff --git a/tests/cmd/command-t.c b/tests/cmd/command-t.c index aec9c8a..8237f3f 100644 --- a/tests/cmd/command-t.c +++ b/tests/cmd/command-t.c @@ -33,16 +33,27 @@ #include -#include +#include + +enum cmdOptions { + copt_flag = 0, + copt_first, + copt_second, + copt_sugar, + copt_fourth, + copt_fifth, + copt_perhaps, + copt_sanity +}; static int testproc(struct cmd_syndesc *as, void *rock) { - is_string("foo", as->parms[0].items->data, + is_string("foo", as->parms[copt_first].items->data, "first option matches"); - is_string("bar", as->parms[1].items->data, + is_string("bar", as->parms[copt_second].items->data, "second option matches"); - ok(as->parms[2].items != NULL, + ok(as->parms[copt_flag].items != NULL, "flag is set"); return 0; @@ -57,16 +68,16 @@ main(int argc, char **argv) int code; int tc; int retval; - char *retstring; + char *retstring = NULL; - plan(70); + plan(85); initialize_CMD_error_table(); opts = cmd_CreateSyntax(NULL, testproc, NULL, NULL); + cmd_AddParm(opts, "-flag", CMD_FLAG, CMD_OPTIONAL, "a flag"); cmd_AddParm(opts, "-first", CMD_SINGLE, CMD_REQUIRED, "first option"); cmd_AddParm(opts, "-second", CMD_LIST, CMD_OPTIONAL, "second option"); - cmd_AddParm(opts, "-flag", CMD_FLAG, CMD_OPTIONAL, "a flag"); /* A simple command line */ code = cmd_ParseLine("-first foo -second bar -flag", tv, &tc, 100); @@ -75,9 +86,11 @@ main(int argc, char **argv) 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"); + is_string("foo", retopts->parms[copt_first].items->data, + " ... 1st option matches"); + is_string("bar", retopts->parms[copt_second].items->data, + " ... 2nd option matches"); + ok(retopts->parms[copt_flag].items != NULL, " ... 3rd option matches"); cmd_FreeOptions(&retopts); cmd_FreeArgv(tv); @@ -146,6 +159,19 @@ main(int argc, char **argv) is_int(CMD_UNKNOWNSWITCH, code, "and fail with cmd_Parse too"); cmd_FreeArgv(tv); + /* Check that paramaters with abbreviation disabled don't make things + * ambiguous */ + cmd_AddParmAtOffset(opts, copt_sugar, "-sugar", CMD_SINGLE, + CMD_OPTIONAL | CMD_NOABBRV, "sugar with that"); + 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(0, code, "disabling specific abbreviations succeeds"); + code = cmd_Parse(tc, tv, &retopts); + is_int(0, code, "and works with cmd_Parse into the bargain"); + cmd_FreeOptions(&retopts); + cmd_FreeArgv(tv); + /* Disable positional commands */ cmd_DisablePositionalCommands(); code = cmd_ParseLine("foo bar -flag", tv, &tc, 100); @@ -172,23 +198,27 @@ main(int argc, char **argv) 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"); + is_string("one", retopts->parms[copt_first].items->data, + " ... 1st option matches"); + is_string("two", retopts->parms[copt_second].items->data, + " ... 2nd option matches"); + ok(retopts->parms[copt_flag].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); + cmd_AddParmAtOffset(opts, copt_fifth, "-fifth", CMD_SINGLE, CMD_OPTIONAL, + "fifth option"); + cmd_AddParmAtOffset(opts, copt_fourth, "-fourth", CMD_SINGLE, CMD_OPTIONAL, + "fourth option" ); 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"); + is_string("b", retopts->parms[copt_fourth].items->data, + " Fourth option in right place"); + is_string("c", retopts->parms[copt_fifth].items->data, + " Fifth option in right place"); cmd_FreeOptions(&retopts); cmd_FreeArgv(tv); @@ -197,17 +227,17 @@ main(int argc, char **argv) is_int(0, code, "cmd_ParseLine succeeds"); code = cmd_Parse(tc, tv, &retopts); - code = cmd_OptionAsInt(retopts, 0, &retval); + code = cmd_OptionAsInt(retopts, copt_first, &retval); is_int(0, code, "cmd_OptionsAsInt succeeds"); is_int(1, retval, " ... and returns correct value"); - code = cmd_OptionAsString(retopts, 1, &retstring); + code = cmd_OptionAsString(retopts, copt_second, &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); + code = cmd_OptionAsFlag(retopts, copt_flag, &retval); is_int(0, code, "cmd_OptionsAsFlag succeeds"); ok(retval, " ... and flag is correct"); @@ -215,14 +245,14 @@ main(int argc, char **argv) cmd_FreeArgv(tv); /* Add an alias */ - code = cmd_AddParmAlias(opts, 1, "-twa"); + code = cmd_AddParmAlias(opts, copt_second, "-twa"); is_int(0, code, "cmd_AddParmAlias succeeds"); code = cmd_ParseLine("-first 1 -twa tup", tv, &tc, 100); is_int(0, code, "cmd_ParseLine succeeds"); code = cmd_Parse(tc, tv, &retopts); is_int(0, code, "cmd_Parse succeeds for alias"); - cmd_OptionAsString(retopts, 1, &retstring); + cmd_OptionAsString(retopts, copt_second, &retstring); is_string("tup", retstring, " ... and we have the correct value"); free(retstring); retstring = NULL; @@ -242,7 +272,7 @@ main(int argc, char **argv) is_int(0, code, "cmd_ParseLine succeeds"); code = cmd_Parse(tc, tv, &retopts); is_int(0, code, "cmd_Parse succeeds for option-as-flag as opt"); - code = cmd_OptionAsInt(retopts, 6, &retval); + code = cmd_OptionAsInt(retopts, copt_perhaps, &retval); is_int(0, code, "cmd_OptionAsInt succeeds"); is_int(2, retval, " ... and we have the correct value"); cmd_FreeOptions(&retopts); @@ -254,13 +284,35 @@ main(int argc, char **argv) is_int(0, code, "cmd_ParseLine succeeds"); code = cmd_Parse(tc, tv, &retopts); is_int(0, code, "cmd_Parse succeeds for option-as-flag as flag"); - code = cmd_OptionAsInt(retopts, 6, &retval); + code = cmd_OptionAsInt(retopts, copt_perhaps, &retval); is_int(CMD_MISSING, code, " ... pulling out a value fails as expected"); - cmd_OptionAsFlag(retopts, 6, &retval); + cmd_OptionAsFlag(retopts, copt_perhaps, &retval); ok(retval, " ... but parsing as a flag works"); cmd_FreeOptions(&retopts); cmd_FreeArgv(tv); + /* Check that we can produce help output */ + code = cmd_ParseLine("-help", tv, &tc, 100); + is_int(0, code, "cmd_ParseLine succeeds"); + code = cmd_Parse(tc, tv, &retopts); + is_int(CMD_USAGE, code, "cmd_Parse returns usage error with help output"); + ok(retopts == NULL, " ... and options is empty"); + + /* Check splitting with '=' */ + + code = cmd_ParseLine("-first 1 -perhaps=6 -sanity=3", tv, &tc, 100); + is_int(0, code, "cmd_ParseLine succeeds"); + code = cmd_Parse(tc, tv, &retopts); + is_int(0, code, "cmd_Parse succeeds for items split with '='"); + code = cmd_OptionAsInt(retopts, copt_perhaps, &retval); + is_int(0, code, "cmd_OptionAsInt succeeds"); + is_int(6, retval, " ... and we have the correct value once"); + code = cmd_OptionAsInt(retopts, copt_sanity, &retval); + is_int(0, code, "cmd_OptionAsInt succeeds"); + is_int(3, retval, " ... and we have the correct value twice"); + cmd_FreeOptions(&retopts); + cmd_FreeArgv(tv); + return 0; }