Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds support for #88 #91

Merged
merged 5 commits into from
Apr 30, 2015
Merged

Adds support for #88 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6669f0a
feat(MultipleValues): implement shorthand for options with multiple v…
kbknapp Apr 30, 2015
42d9b14
tests(run_tests.py): update tests to allow new shorthand multi values
kbknapp Apr 30, 2015
ae09f05
feat(MultipleValues): adds support limited number and named values
kbknapp Apr 30, 2015
53f6b8c
feat(MultipleValues): add support for minimum and maximum number of v…
kbknapp Apr 30, 2015
cf7f6c8
tests(usage): update known good tests to new usage strings
kbknapp Apr 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 33 additions & 30 deletions clap-tests/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
tests clap library

USAGE:
claptests [FLAGS] [OPTIONS] [POSITIONAL] [SUBCOMMANDS]
claptests [POSITIONAL] [FLAGS] [OPTIONS] [SUBCOMMANDS]

FLAGS:
-f, --flag tests flags
Expand All @@ -32,15 +32,18 @@
subcmd tests subcommands'''

_excluded = '''The argument --flag cannot be used with -F
USAGE: claptests -F --long-option-2 <option2> [positional2]
USAGE:
claptests [positional2] -F --long-option-2 <option2>
For more information try --help'''

_excluded_l = '''The argument -f cannot be used -F
USAGE: claptests -F --long-option-2 <option2> [positional2]
USAGE:
claptests [positional2] -F --long-option-2 <option2>
For more information try --help'''

_required = '''One or more required arguments were not supplied
USAGE: claptests -F --long-option-2 <option2> [positional2]
USAGE:
claptests [positional2] -F --long-option-2 <option2>
For more information try --help'''

_fop = '''flag present 1 times
Expand Down Expand Up @@ -92,7 +95,7 @@
tests subcommands

USAGE:
claptests subcmd [FLAGS] [OPTIONS] [POSITIONAL]
claptests subcmd [POSITIONAL] [FLAGS] [OPTIONS]

FLAGS:
-h, --help Prints help information
Expand Down Expand Up @@ -145,32 +148,32 @@
'excluded first: ': ['{} -f -F'.format(_bin), _excluded],
'excluded last: ': ['{} -F -f'.format(_bin), _excluded_l],
'missing required: ': ['{} -F'.format(_bin), _required],
'F2(ll),O(s),P: ': ['{} --flag --flag -o some value'.format(_bin), _f2op],
'F2(ss),O(s),P: ': ['{} -f -f -o some value'.format(_bin), _f2op],
'O2(ll)P: ': ['{} --option some --option other value'.format(_bin), _o2p],
'O2(l=l=)P: ': ['{} --option=some --option=other value'.format(_bin), _o2p],
'O2(ss)P: ': ['{} -o some -o other value'.format(_bin), _o2p],
'F2(s2),O(s),P: ': ['{} -ff -o some value'.format(_bin), _f2op],
'F(s),O(s),P: ': ['{} -f -o some value'.format(_bin), _fop],
'F(l),O(l),P: ': ['{} --flag --option some value'.format(_bin), _fop],
'F(l),O(l=),P: ': ['{} --flag --option=some value'.format(_bin), _fop],
'F2(ll),O(s),P: ': ['{} value --flag --flag -o some'.format(_bin), _f2op],
'F2(ss),O(s),P: ': ['{} value -f -f -o some'.format(_bin), _f2op],
'O2(ll)P: ': ['{} value --option some --option other'.format(_bin), _o2p],
'O2(l=l=)P: ': ['{} value --option=some --option=other'.format(_bin), _o2p],
'O2(ss)P: ': ['{} value -o some -o other'.format(_bin), _o2p],
'F2(s2),O(s),P: ': ['{} value -ff -o some'.format(_bin), _f2op],
'F(s),O(s),P: ': ['{} value -f -o some'.format(_bin), _fop],
'F(l),O(l),P: ': ['{} value --flag --option some'.format(_bin), _fop],
'F(l),O(l=),P: ': ['{} value --flag --option=some'.format(_bin), _fop],
'sc help short: ': ['{} subcmd -h'.format(_bin), _schelp],
'sc help long: ': ['{} subcmd --help'.format(_bin), _schelp],
'scF(l),O(l),P: ': ['{} subcmd --flag --option some value'.format(_bin), _scfop],
'scF(l),O(s),P: ': ['{} subcmd --flag -o some value'.format(_bin), _scfop],
'scF(l),O(l=),P: ': ['{} subcmd --flag --option=some value'.format(_bin), _scfop],
'scF(s),O(l),P: ': ['{} subcmd -f --option some value'.format(_bin), _scfop],
'scF(s),O(s),P: ': ['{} subcmd -f -o some value'.format(_bin), _scfop],
'scF(s),O(l=),P: ': ['{} subcmd -f --option=some value'.format(_bin), _scfop],
'scF2(s),O(l),P: ': ['{} subcmd -ff --option some value'.format(_bin), _scf2op],
'scF2(s),O(s),P: ': ['{} subcmd -ff -o some value'.format(_bin), _scf2op],
'scF2(s),O(l=),P: ': ['{} subcmd -ff --option=some value'.format(_bin), _scf2op],
'scF2(l2),O(l),P: ': ['{} subcmd --flag --flag --option some value'.format(_bin), _scf2op],
'scF2(l2),O(s),P: ': ['{} subcmd --flag --flag -o some value'.format(_bin), _scf2op],
'scF2(l2),O(l=),P: ': ['{} subcmd --flag --flag --option=some value'.format(_bin), _scf2op],
'scF2(s2),O(l),P: ': ['{} subcmd -f -f --option some value'.format(_bin), _scf2op],
'scF2(s2),O(s),P: ': ['{} subcmd -f -f -o some value'.format(_bin), _scf2op],
'scF2(s2),O(l=),P: ': ['{} subcmd -f -f --option=some value'.format(_bin), _scf2op]
'scF(l),O(l),P: ': ['{} subcmd value --flag --option some'.format(_bin), _scfop],
'scF(l),O(s),P: ': ['{} subcmd value --flag -o some'.format(_bin), _scfop],
'scF(l),O(l=),P: ': ['{} subcmd value --flag --option=some'.format(_bin), _scfop],
'scF(s),O(l),P: ': ['{} subcmd value -f --option some'.format(_bin), _scfop],
'scF(s),O(s),P: ': ['{} subcmd value -f -o some'.format(_bin), _scfop],
'scF(s),O(l=),P: ': ['{} subcmd value -f --option=some'.format(_bin), _scfop],
'scF2(s),O(l),P: ': ['{} subcmd value -ff --option some'.format(_bin), _scf2op],
'scF2(s),O(s),P: ': ['{} subcmd value -ff -o some'.format(_bin), _scf2op],
'scF2(s),O(l=),P: ': ['{} subcmd value -ff --option=some'.format(_bin), _scf2op],
'scF2(l2),O(l),P: ': ['{} subcmd value --flag --flag --option some'.format(_bin), _scf2op],
'scF2(l2),O(s),P: ': ['{} subcmd value --flag --flag -o some'.format(_bin), _scf2op],
'scF2(l2),O(l=),P: ': ['{} subcmd value --flag --flag --option=some'.format(_bin), _scf2op],
'scF2(s2),O(l),P: ': ['{} subcmd value -f -f --option some'.format(_bin), _scf2op],
'scF2(s2),O(s),P: ': ['{} subcmd value -f -f -o some'.format(_bin), _scf2op],
'scF2(s2),O(l=),P: ': ['{} subcmd value -f -f --option=some'.format(_bin), _scf2op]
}

def pass_fail(name, check, good):
Expand All @@ -180,7 +183,7 @@ def pass_fail(name, check, good):
print('Pass')
return
failed = True
print('Fail\n\tShould be: {}\n\tBut is: {}'.format(good, check))
print('Fail\n\tShould be: \n{}\n\tBut is: \n{}'.format(good, check))


def main():
Expand Down
Loading