mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-29 20:23:55 +00:00
Code Issues Releases Wiki Activity

Fixing the foo foo problem

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-08-23 09:41:45 -07:00
parent b480e2f163
commit de56a9c87a
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/CLI/App.hpp
View File

@ -855,7 +855,7 @@ class App {
bool _valid_subcommand(const std::string &current) const { bool _valid_subcommand(const std::string &current) const {
for(const App_p &com : subcommands_) for(const App_p &com : subcommands_)
if(com->check_name(current)) if(com->check_name(current) && !*com)
return true; return true;
if(parent_ != nullptr) if(parent_ != nullptr)
return parent_->_valid_subcommand(current); return parent_->_valid_subcommand(current);

32
tests/SubcommandTest.cpp
View File

@ -101,13 +101,13 @@ TEST_F(TApp, RequiredAndSubcoms) { // #23
app.reset(); app.reset();
args = {"foo", "other"}; args = {"foo", "other"};
EXPECT_THROW(run(), CLI::ParseError); EXPECT_THROW(run(), CLI::ExtrasError); // RequiredError
} }
TEST_F(TApp, RequiredAndSubcomFallthrough) { TEST_F(TApp, RequiredAndSubcomFallthrough) {
std::string baz; std::string baz;
app.add_option("baz", baz, "Baz Description", true)->required(); app.add_option("baz", baz)->required();
app.add_subcommand("foo"); app.add_subcommand("foo");
auto bar = app.add_subcommand("bar"); auto bar = app.add_subcommand("bar");
app.fallthrough(); app.fallthrough();
@ -119,8 +119,34 @@ TEST_F(TApp, RequiredAndSubcomFallthrough) {
app.reset(); app.reset();
args = {"bar", "other2"}; args = {"bar", "other2"};
EXPECT_THROW(run(), CLI::ParseError); // RequiredError or ExtrasError (actual) EXPECT_THROW(run(), CLI::ExtrasError); // RequiredError
}
TEST_F(TApp, FooFooProblem) {
std::string baz_str, other_str;
auto baz = app.add_option("baz", baz_str);
auto foo = app.add_subcommand("foo");
auto other = foo->add_option("other", other_str);
args = {"foo", "foo"};
run();
EXPECT_TRUE(*foo);
EXPECT_FALSE(*baz);
EXPECT_TRUE(*other); // Fails
EXPECT_EQ(baz_str, "");
EXPECT_EQ(other_str, "foo"); // Fails
app.reset();
baz_str = "";
other_str = "";
baz->required();
run();
EXPECT_TRUE(*foo);
EXPECT_TRUE(*baz);
EXPECT_FALSE(*other);
EXPECT_EQ(baz_str, "foo");
EXPECT_EQ(other_str, "");
} }
TEST_F(TApp, Callbacks) { TEST_F(TApp, Callbacks) {