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

Adding test, fixing option name to single name in message

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-11-24 20:35:26 -05:00 committed by Henry Schreiner
parent 85857d99e1
commit 44de4de118
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/CLI/Option.hpp
View File

@ -437,7 +437,7 @@ class Option : public OptionBase<Option> {
for(const std::function<std::string(std::string &)> &vali : validators_) { for(const std::function<std::string(std::string &)> &vali : validators_) {
std::string err_msg = vali(result); std::string err_msg = vali(result);
if(!err_msg.empty()) if(!err_msg.empty())
throw ValidationError(get_name() + ": " + err_msg); throw ValidationError(single_name() + ": " + err_msg);
} }
} }

25
tests/AppTest.cpp
View File

@ -1172,8 +1172,8 @@ TEST_F(TApp, SetWithDefaultsIC) {
EXPECT_THROW(run(), CLI::ConversionError); EXPECT_THROW(run(), CLI::ConversionError);
} }
// Added to test defaults on dual method // Added to test ->transform
TEST_F(TApp, OrderedModifingValidators) { TEST_F(TApp, OrderedModifingTransforms) {
std::vector<std::string> val; std::vector<std::string> val;
auto m = app.add_option("-m", val); auto m = app.add_option("-m", val);
m->transform([](std::string x) { return x + "1"; }); m->transform([](std::string x) { return x + "1"; });
@ -1185,3 +1185,24 @@ TEST_F(TApp, OrderedModifingValidators) {
EXPECT_EQ(val, std::vector<std::string>({"one12", "two12"})); EXPECT_EQ(val, std::vector<std::string>({"one12", "two12"}));
} }
TEST_F(TApp, ThrowingTransform) {
std::string val;
auto m = app.add_option("-m,--mess", val);
m->transform([](std::string x) -> std::string { throw CLI::ValidationError("My Message"); });
EXPECT_NO_THROW(run());
app.reset();
args = {"-mone"};
ASSERT_THROW(run(), CLI::ValidationError);
app.reset();
try {
run();
} catch(const CLI::ValidationError &e) {
EXPECT_EQ(e.what(), std::string("--mess: My Message"));
}
}