mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-03 14:03:52 +00:00
Code Issues Releases Wiki Activity

Added tests and a fix for requires, exludes

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-02-12 16:45:13 -05:00
parent 83eb7eb84b
commit b39ed56906
3 changed files with 117 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
## Version 0.3 (in progress) ## Version 0.3 (in progress)
* Added `->requires`, `->excludes`, and `->envname` from plumbum
* More tests for Help strings, improvements in formatting * More tests for Help strings, improvements in formatting
* Support type and set syntax in positionals help strings * Support type and set syntax in positionals help strings
* Added help groups, with `->group("name")` syntax * Added help groups, with `->group("name")` syntax

4
include/CLI/App.hpp
View File

@ -417,11 +417,11 @@ public:
throw RequiredError(opt->get_name()); throw RequiredError(opt->get_name());
// Requires // Requires
for (const Option* opt_req : opt->_requires) for (const Option* opt_req : opt->_requires)
if (opt_req->count() == 0) if (opt->count() > 0 && opt_req->count() == 0)
throw RequiresError(opt->get_name(), opt_req->get_name()); throw RequiresError(opt->get_name(), opt_req->get_name());
// Excludes // Excludes
for (const Option* opt_ex : opt->_excludes) for (const Option* opt_ex : opt->_excludes)
if (opt_ex->count() != 0) if (opt->count() > 0 && opt_ex->count() != 0)
throw ExcludesError(opt->get_name(), opt_ex->get_name()); throw ExcludesError(opt->get_name(), opt_ex->get_name());
} }

115
tests/AppTest.cpp
View File

@ -353,6 +353,119 @@ TEST_F(TApp, VectorFancyOpts) {
EXPECT_THROW(run(), CLI::ParseError); EXPECT_THROW(run(), CLI::ParseError);
} }
TEST_F(TApp, RequiresFlags) {
CLI::Option* opt = app.add_flag("-s,--string");
app.add_flag("--both")->requires(opt);
EXPECT_NO_THROW(run());
app.reset();
args = {"-s"};
EXPECT_NO_THROW(run());
app.reset();
args = {"-s", "--both"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--both"};
EXPECT_THROW(run(), CLI::RequiresError);
}
// TODO: add tests for requires, excludes, envname TEST_F(TApp, ExcludesFlags) {
CLI::Option* opt = app.add_flag("-s,--string");
app.add_flag("--nostr")->excludes(opt);
EXPECT_NO_THROW(run());
app.reset();
args = {"-s"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--nostr"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--nostr", "-s"};
EXPECT_THROW(run(), CLI::ExcludesError);
app.reset();
args = {"--string", "--nostr"};
EXPECT_THROW(run(), CLI::ExcludesError);
}
TEST_F(TApp, RequiresMultiFlags) {
CLI::Option* opt1 = app.add_flag("--opt1");
CLI::Option* opt2 = app.add_flag("--opt2");
CLI::Option* opt3 = app.add_flag("--opt3");
app.add_flag("--optall")->requires(opt1, opt2, opt3);
EXPECT_NO_THROW(run());
app.reset();
args = {"--opt1"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--opt2"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--optall"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--optall", "--opt1"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--optall", "--opt2", "--opt1"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--optall", "--opt1", "--opt2", "--opt3"};
EXPECT_NO_THROW(run());
}
TEST_F(TApp, RequiresChainedFlags) {
CLI::Option* opt1 = app.add_flag("--opt1");
CLI::Option* opt2 = app.add_flag("--opt2")->requires(opt1);
app.add_flag("--opt3")->requires(opt2);
EXPECT_NO_THROW(run());
app.reset();
args = {"--opt1"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--opt2"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--opt3"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--opt3", "--opt2"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--opt3", "--opt1"};
EXPECT_THROW(run(), CLI::RequiresError);
app.reset();
args = {"--opt2", "--opt1"};
EXPECT_NO_THROW(run());
app.reset();
args = {"--opt1", "--opt2", "--opt3"};
EXPECT_NO_THROW(run());
}
// TODO: add tests for envname