mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-30 04:33:53 +00:00
Code Issues Releases Wiki Activity

Removing requires (#112)

Browse Source
This commit is contained in:
Henry Schreiner 2018-04-25 18:33:43 -04:00 committed by GitHub
parent b957301c3a
commit bc61342d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/CLI/Option.hpp
View File

@ -313,26 +313,6 @@ class Option : public OptionBase<Option> {
return needs(opt1, args...); return needs(opt1, args...);
} }
#ifndef CLI11_CPP20
/// Sets required options \deprecated
CLI11_DEPRECATED("Use needs instead of requires (eventual keyword clash)")
Option *requires(Option *opt) { return needs(opt); }
/// Can find a string if needed \deprecated
template <typename T = App> Option *requires(std::string opt_name) {
for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
if(opt.get() != this && opt->check_name(opt_name))
return needs(opt.get());
throw IncorrectConstruction::MissingOption(opt_name);
}
/// Any number supported, any mix of string and Opt \deprecated
template <typename A, typename B, typename... ARG> Option *requires(A opt, B opt1, ARG... args) {
requires(opt);
return requires(opt1, args...);
}
#endif
/// Sets excluded options /// Sets excluded options
Option *excludes(Option *opt) { Option *excludes(Option *opt) {
excludes_.insert(opt); excludes_.insert(opt);

37
tests/AppTest.cpp
View File

@ -1234,43 +1234,6 @@ TEST_F(TApp, NeedsMixedFlags) {
run(); run();
} }
#ifndef CLI11_CPP20
TEST_F(TApp, RequiresMixedFlags) {
CLI::Option *opt1 = app.add_flag("--opt1");
app.add_flag("--opt2");
app.add_flag("--opt3");
app.add_flag("--optall")->requires(opt1, "--opt2", "--opt3");
run();
app.reset();
args = {"--opt1"};
run();
app.reset();
args = {"--opt2"};
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"};
run();
}
#endif
TEST_F(TApp, NeedsChainedFlags) { TEST_F(TApp, NeedsChainedFlags) {
CLI::Option *opt1 = app.add_flag("--opt1"); CLI::Option *opt1 = app.add_flag("--opt1");
CLI::Option *opt2 = app.add_flag("--opt2")->needs(opt1); CLI::Option *opt2 = app.add_flag("--opt2")->needs(opt1);

7
tests/CreationTest.cpp
View File

@ -168,13 +168,6 @@ TEST_F(TApp, IncorrectConstructionNeedsCannotFind) {
EXPECT_THROW(cat->needs("--nothing"), CLI::IncorrectConstruction); EXPECT_THROW(cat->needs("--nothing"), CLI::IncorrectConstruction);
} }
#ifndef CLI11_CPP20
TEST_F(TApp, IncorrectConstructionRequiresCannotFind) {
auto cat = app.add_flag("--cat");
EXPECT_THROW(cat->requires("--nothing"), CLI::IncorrectConstruction);
}
#endif
TEST_F(TApp, IncorrectConstructionExcludesCannotFind) { TEST_F(TApp, IncorrectConstructionExcludesCannotFind) {
auto cat = app.add_flag("--cat"); auto cat = app.add_flag("--cat");
EXPECT_THROW(cat->excludes("--nothing"), CLI::IncorrectConstruction); EXPECT_THROW(cat->excludes("--nothing"), CLI::IncorrectConstruction);