From 8143f9322460075484c6655e0c4bd5eabbba3d3b Mon Sep 17 00:00:00 2001 From: Ethan Sifferman Date: Wed, 3 Apr 2024 10:46:59 -0700 Subject: [PATCH 1/2] improved clarity in RequiredError --- include/CLI/Error.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/CLI/Error.hpp b/include/CLI/Error.hpp index f99d81058..84dcef5e8 100644 --- a/include/CLI/Error.hpp +++ b/include/CLI/Error.hpp @@ -239,22 +239,22 @@ class RequiredError : public ParseError { if((min_option == 1) && (max_option == 1) && (used == 0)) return RequiredError("Exactly 1 option from [" + option_list + "]"); if((min_option == 1) && (max_option == 1) && (used > 1)) { - return {"Exactly 1 option from [" + option_list + "] is required and " + std::to_string(used) + + return {"Exactly 1 option from [" + option_list + "] is required but " + std::to_string(used) + " were given", ExitCodes::RequiredError}; } if((min_option == 1) && (used == 0)) return RequiredError("At least 1 option from [" + option_list + "]"); if(used < min_option) { - return {"Requires at least " + std::to_string(min_option) + " options used and only " + - std::to_string(used) + "were given from [" + option_list + "]", + return {"Requires at least " + std::to_string(min_option) + " options used but only " + + std::to_string(used) + " were given from [" + option_list + "]", ExitCodes::RequiredError}; } if(max_option == 1) return {"Requires at most 1 options be given from [" + option_list + "]", ExitCodes::RequiredError}; - return {"Requires at most " + std::to_string(max_option) + " options be used and " + std::to_string(used) + - "were given from [" + option_list + "]", + return {"Requires at most " + std::to_string(max_option) + " options be used but " + std::to_string(used) + + " were given from [" + option_list + "]", ExitCodes::RequiredError}; } }; From 01a848c71650df1d61038fd54408f5b810add1d9 Mon Sep 17 00:00:00 2001 From: Ethan Sifferman Date: Sat, 6 Apr 2024 18:42:56 -0700 Subject: [PATCH 2/2] fixed test --- examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0ed2f8ec8..b95165c62 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -99,7 +99,7 @@ add_test(NAME option_groups_missing COMMAND option_groups) set_property(TEST option_groups_missing PROPERTY PASS_REGULAR_EXPRESSION "Exactly 1 option from" "is required") add_test(NAME option_groups_extra COMMAND option_groups --csv --binary) -set_property(TEST option_groups_extra PROPERTY PASS_REGULAR_EXPRESSION "and 2 were given") +set_property(TEST option_groups_extra PROPERTY PASS_REGULAR_EXPRESSION "but 2 were given") add_test(NAME option_groups_extra2 COMMAND option_groups --csv --address "192.168.1.1" -o "test.out") set_property(TEST option_groups_extra2 PROPERTY PASS_REGULAR_EXPRESSION "at most 1")