QPQ-AG/getopt
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for multiple short options in a single command-line

Browse Source 
argument:
e.g. parse(SpecList, ["-abc"]). == parse(SpecList, ["-a", "-b", "-c"]).
This commit is contained in:
Juan Jose Comellas
2009-10-13 17:33:20 -03:00
parent 468002ff8e
commit 34e72bacb9
3 changed files with 194 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/getopt_test.erl
+96 -10
View File
@@ -24,21 +24,31 @@ parse_1_test_() ->
short = $a,
help = "Option with only short form and no argument"
},
Short2 =
#option{name = short2,
short = $b,
help = "Second option with only short form and no argument"
},
Short3 =
#option{name = short3,
short = $c,
help = "Third ption with only short form and no argument"
},
ShortArg =
#option{name = short_arg,
short = $b,
short = $d,
arg = string,
help = "Option with only short form and argument"
},
ShortDefArg =
#option{name = short_def_arg,
short = $c,
arg = {string, "default"},
short = $e,
arg = {string, "default-short"},
help = "Option with only short form and default argument"
},
ShortInt =
#option{name = short_int,
short = $e,
short = $f,
arg = integer,
help = "Option with only short form and integer argument"
},
@@ -56,7 +66,7 @@ parse_1_test_() ->
LongDefArg =
#option{name = long_def_arg,
long = "long-def-arg",
arg = {string, "default"},
arg = {string, "default-long"},
help = "Option with only long form and default argument"
},
LongInt =
@@ -82,7 +92,7 @@ parse_1_test_() ->
#option{name = short_long_def_arg,
short = $i,
long = "short-long-def-arg",
arg = {string, "default"},
arg = {string, "default-short-long"},
help = "Option with short form, long form and default argument"
},
ShortLongInt =
@@ -92,7 +102,72 @@ parse_1_test_() ->
arg = integer,
help = "Option with short form, long form and integer argument"
},
NonOptArg =
#option{name = non_opt_arg,
help = "Non-option argument"
},
NonOptInt =
#option{name = non_opt_int,
arg = integer,
help = "Non-option integer argument"
},
CombinedOptSpecs =
[
Short,
ShortArg,
ShortInt,
Short2,
Short3,
Long,
LongArg,
LongInt,
ShortLong,
ShortLongArg,
ShortLongInt,
NonOptArg,
NonOptInt,
ShortDefArg,
LongDefArg,
ShortLongDefArg
],
CombinedArgs =
[
[$-, Short#option.short],
[$-, ShortArg#option.short], "value1",
[$-, ShortInt#option.short], "100",
[$-, Short2#option.short, Short3#option.short],
"--long",
"--long-arg", "value2",
"--long-int", "101",
[$-, ShortLong#option.short],
"--short-long-arg", "value3",
"--short-long-int", "103",
"value4",
"104",
"dummy1",
"dummy2"
],
CombinedOpts =
[
Short#option.name,
{ShortArg#option.name, "value1"},
{ShortInt#option.name, 100},
Short2#option.name,
Short3#option.name,
Long#option.name,
{LongArg#option.name, "value2"},
{LongInt#option.name, 101},
ShortLong#option.name,
{ShortLongArg#option.name, "value3"},
{ShortLongInt#option.name, 103},
{NonOptArg#option.name, "value4"},
{NonOptInt#option.name, 104},
{ShortDefArg#option.name, "default-short"},
{LongDefArg#option.name, "default-long"},
{ShortLongDefArg#option.name, "default-short-long"}
],
CombinedRest = ["dummy1", "dummy2"],
[
{"No options and no arguments",
?_assertMatch({ok, {[], []}}, parse([], []))},
@@ -107,8 +182,11 @@ parse_1_test_() ->
%% Options with only the short form
{Short#option.help, ?_assertMatch({ok, {[short], []}}, parse([Short], [[$-, Short#option.short]]))},
{ShortArg#option.help, ?_assertMatch({ok, {[{short_arg, "value"}], []}}, parse([ShortArg], [[$-, ShortArg#option.short], "value"]))},
{ShortDefArg#option.help, ?_assertMatch({ok, {[{short_def_arg, "default"}], []}}, parse([ShortDefArg], []))},
{ShortDefArg#option.help, ?_assertMatch({ok, {[{short_def_arg, "default-short"}], []}}, parse([ShortDefArg], []))},
{ShortInt#option.help, ?_assertMatch({ok, {[{short_int, 100}], []}}, parse([ShortInt], [[$-, ShortInt#option.short], "100"]))},
{"Unsorted multiple short form options and arguments",
?_assertMatch({ok, {[short, short2, short3], ["arg1", "arg2"]}},
parse([Short, Short2, Short3], ["arg1", [$-, Short#option.short, Short2#option.short, Short3#option.short], "arg2"]))},
{"Short form option and arguments",
?_assertMatch({ok, {[short], ["arg1", "arg2"]}}, parse([Short], [[$-, Short#option.short], "arg1", "arg2"]))},
{"Short form option and arguments (unsorted)",
@@ -116,7 +194,7 @@ parse_1_test_() ->
%% Options with only the long form
{Long#option.help, ?_assertMatch({ok, {[long], []}}, parse([Long], ["--long"]))},
{LongArg#option.help, ?_assertMatch({ok, {[{long_arg, "value"}], []}}, parse([LongArg], ["--long-arg", "value"]))},
{LongDefArg#option.help, ?_assertMatch({ok, {[{long_def_arg, "default"}], []}}, parse([LongDefArg], []))},
{LongDefArg#option.help, ?_assertMatch({ok, {[{long_def_arg, "default-long"}], []}}, parse([LongDefArg], []))},
{LongInt#option.help, ?_assertMatch({ok, {[{long_int, 100}], []}}, parse([LongInt], ["--long-int", "100"]))},
{"Long form option and arguments",
?_assertMatch({ok, {[long], ["arg1", "arg2"]}}, parse([Long], ["--long", "arg1", "arg2"]))},
@@ -127,9 +205,17 @@ parse_1_test_() ->
{ShortLong#option.help, ?_assertMatch({ok, {[short_long], []}}, parse([ShortLong], ["--short-long"]))},
{ShortLongArg#option.help, ?_assertMatch({ok, {[{short_long_arg, "value"}], []}}, parse([ShortLongArg], [[$-, ShortLongArg#option.short], "value"]))},
{ShortLongArg#option.help, ?_assertMatch({ok, {[{short_long_arg, "value"}], []}}, parse([ShortLongArg], ["--short-long-arg", "value"]))},
{ShortLongDefArg#option.help, ?_assertMatch({ok, {[{short_long_def_arg, "default"}], []}}, parse([ShortLongDefArg], []))},
{ShortLongDefArg#option.help, ?_assertMatch({ok, {[{short_long_def_arg, "default-short-long"}], []}}, parse([ShortLongDefArg], []))},
{ShortLongInt#option.help, ?_assertMatch({ok, {[{short_long_int, 1234}], []}}, parse([ShortLongInt], [[$-, ShortLongInt#option.short], "1234"]))},
{ShortLongInt#option.help, ?_assertMatch({ok, {[{short_long_int, 1234}], []}}, parse([ShortLongInt], ["--short-long-int", "1234"]))},
%% Non-option arguments
{NonOptArg#option.help, ?_assertMatch({ok, {[{non_opt_arg, "value"}], []}}, parse([NonOptArg], ["value"]))},
{NonOptInt#option.help, ?_assertMatch({ok, {[{non_opt_int, 1234}], []}}, parse([NonOptInt], ["1234"]))},
{"Declared and undeclared non-option arguments",
?_assertMatch({ok, {[{non_opt_arg, "arg1"}], ["arg2", "arg3"]}}, parse([NonOptArg], ["arg1", "arg2", "arg3"]))},
%% Combined
{"Combined short, long and non-option arguments",
?_assertEqual({ok, {CombinedOpts, CombinedRest}}, parse(CombinedOptSpecs, CombinedArgs))},
{"Option with only short form and invalid integer argument",
?_assertEqual({error, {invalid_option_arg, {ShortInt#option.name, "value"}}}, parse([ShortInt], [[$-, ShortInt#option.short], "value"]))}
].