Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quote values in error messages #96

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Quote values in error messages #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions include/rsl/parameter_validators.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ template <typename T, typename Fn>
[[nodiscard]] auto size_compare(rclcpp::Parameter const& parameter, size_t const size,
std::string const& predicate_description, Fn const& predicate)
-> tl::expected<void, std::string> {
static constexpr auto format_string = "Length of parameter '{}' is {} but must be {} {}";
static constexpr auto format_string = "Length of parameter '{}' is '{}' but must be {} '{}'";
switch (parameter.get_type()) {
case rclcpp::ParameterType::PARAMETER_STRING:
if (auto value = parameter.get_value<std::string>(); !predicate(value.size(), size))
Expand All @@ -42,7 +42,7 @@ template <typename T, typename Fn>
std::string const& predicate_description, Fn const& predicate)
-> tl::expected<void, std::string> {
if (auto const param_value = parameter.get_value<T>(); !predicate(param_value, value))
return tl::unexpected(fmt::format("Parameter '{}' with the value {} must be {} {}",
return tl::unexpected(fmt::format("Parameter '{}' with the value '{}' must be {} '{}'",
parameter.get_name(), param_value, predicate_description,
value));
return {};
Expand Down Expand Up @@ -78,7 +78,7 @@ template <typename T>
for (auto const& value : values)
if (!contains(valid_values, value))
return tl::unexpected(
fmt::format("Entry '{}' in parameter '{}' is not in the set {{{}}}", value,
fmt::format("Entry '{}' in parameter '{}' is not in the set '{{{}}}'", value,
parameter.get_name(), fmt::join(valid_values, ", ")));
return {};
}
Expand Down Expand Up @@ -153,7 +153,7 @@ template <typename T>
for (auto val : param_value)
if (val < lower || val > upper)
return tl::unexpected(
fmt::format("Value {} in parameter '{}' must be within bounds [{}, {}]", val,
fmt::format("Value '{}' in parameter '{}' must be within bounds '[{}, {}]'", val,
parameter.get_name(), lower, upper));
return {};
}
Expand All @@ -171,7 +171,7 @@ template <typename T>
for (auto val : param_value)
if (val < lower)
return tl::unexpected(
fmt::format("Value {} in parameter '{}' must be above lower bound of {}", val,
fmt::format("Value '{}' in parameter '{}' must be above lower bound of '{}'", val,
parameter.get_name(), lower));
return {};
}
Expand All @@ -189,7 +189,7 @@ template <typename T>
for (auto val : param_value)
if (val > upper)
return tl::unexpected(
fmt::format("Value {} in parameter '{}' must be below upper bound of {}", val,
fmt::format("Value '{}' in parameter '{}' must be below upper bound of '{}'", val,
parameter.get_name(), upper));
return {};
}
Expand All @@ -206,7 +206,7 @@ template <typename T>
auto const& param_value = parameter.get_value<T>();
if (param_value < lower || param_value > upper)
return tl::unexpected(
fmt::format("Parameter '{}' with the value {} must be within bounds [{}, {}]",
fmt::format("Parameter '{}' with the value '{}' must be within bounds '[{}, {}]'",
parameter.get_name(), param_value, lower, upper));
return {};
}
Expand Down Expand Up @@ -290,9 +290,9 @@ template <typename T>
-> tl::expected<void, std::string> {
auto const& param_value = parameter.get_value<T>();
if (contains(collection, param_value)) return {};
return tl::unexpected(fmt::format("Parameter '{}' with the value {} is not in the set {{{}}}",
parameter.get_name(), param_value,
fmt::format("{}", fmt::join(collection, ", "))));
return tl::unexpected(fmt::format(
"Parameter '{}' with the value '{}' is not in the set '{{{}}}'", parameter.get_name(),
param_value, fmt::format("{}", fmt::join(collection, ", "))));
}

/**
Expand Down
28 changes: 15 additions & 13 deletions tests/parameter_validators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ TEST_CASE("rsl::subset_of") {
rsl::subset_of<std::string>(Parameter("test", std::vector<std::string>{"foo", "foo"}),
std::vector<std::string>{"", "1", "2", "three"});
REQUIRE(!result);
CHECK(result.error() == "Entry 'foo' in parameter 'test' is not in the set {, 1, 2, three}");
CHECK(result.error() == "Entry 'foo' in parameter 'test' is not in the set '{, 1, 2, three}'");
}

TEST_CASE("rsl::fixed_size") {
Expand All @@ -87,7 +87,7 @@ TEST_CASE("rsl::fixed_size") {

auto const result = rsl::fixed_size<std::string>(Parameter("test", "foo"), 0);
REQUIRE(!result);
CHECK(result.error() == "Length of parameter 'test' is 3 but must be equal to 0");
CHECK(result.error() == "Length of parameter 'test' is '3' but must be equal to '0'");
}

TEST_CASE("rsl::size_gt") {
Expand All @@ -113,7 +113,7 @@ TEST_CASE("rsl::size_gt") {

auto const result = rsl::size_gt<std::string>(Parameter("test", ""), 0);
REQUIRE(!result);
CHECK(result.error() == "Length of parameter 'test' is 0 but must be greater than 0");
CHECK(result.error() == "Length of parameter 'test' is '0' but must be greater than '0'");
}

TEST_CASE("rsl::size_lt") {
Expand All @@ -139,7 +139,7 @@ TEST_CASE("rsl::size_lt") {

auto const result = rsl::size_lt<std::string>(Parameter("test", "foo"), 3);
REQUIRE(!result);
CHECK(result.error() == "Length of parameter 'test' is 3 but must be less than 3");
CHECK(result.error() == "Length of parameter 'test' is '3' but must be less than '3'");
}

TEST_CASE("rsl::not_empty") {
Expand Down Expand Up @@ -179,7 +179,7 @@ TEST_CASE("rsl::element_bounds") {
auto const result =
rsl::element_bounds<int64_t>(Parameter("test", std::vector<int64_t>{1, 2, 3}), -5, 0);
REQUIRE(!result);
CHECK(result.error() == "Value 1 in parameter 'test' must be within bounds [-5, 0]");
CHECK(result.error() == "Value '1' in parameter 'test' must be within bounds '[-5, 0]'");
}

TEST_CASE("rsl::lower_element_bounds") {
Expand All @@ -199,7 +199,7 @@ TEST_CASE("rsl::lower_element_bounds") {
auto const result =
rsl::lower_element_bounds<int64_t>(Parameter("test", std::vector<int64_t>{1, 2, 3}), 3);
REQUIRE(!result);
CHECK(result.error() == "Value 1 in parameter 'test' must be above lower bound of 3");
CHECK(result.error() == "Value '1' in parameter 'test' must be above lower bound of '3'");
}

TEST_CASE("rsl::upper_element_bounds") {
Expand All @@ -219,7 +219,7 @@ TEST_CASE("rsl::upper_element_bounds") {
auto const result = rsl::upper_element_bounds<double>(
Parameter("test", std::vector<double>{1.0, 2.2, 1.1}), 0.0);
REQUIRE(!result);
CHECK(result.error() == "Value 1 in parameter 'test' must be below upper bound of 0");
CHECK(result.error() == "Value '1' in parameter 'test' must be below upper bound of '0'");
}

TEST_CASE("rsl::bounds") {
Expand All @@ -244,7 +244,8 @@ TEST_CASE("rsl::bounds") {

auto const result = rsl::bounds<double>(Parameter("test", -4.3), 1.0, 5.0);
REQUIRE(!result);
CHECK(result.error() == "Parameter 'test' with the value -4.3 must be within bounds [1, 5]");
CHECK(result.error() ==
"Parameter 'test' with the value '-4.3' must be within bounds '[1, 5]'");
}

TEST_CASE("rsl::lt") {
Expand All @@ -262,7 +263,7 @@ TEST_CASE("rsl::lt") {

auto const result = rsl::lt<double>(Parameter("test", 4.3), 1.0);
REQUIRE(!result);
CHECK(result.error() == "Parameter 'test' with the value 4.3 must be less than 1");
CHECK(result.error() == "Parameter 'test' with the value '4.3' must be less than '1'");
}

TEST_CASE("rsl::gt") {
Expand All @@ -280,7 +281,7 @@ TEST_CASE("rsl::gt") {

auto const result = rsl::gt<int64_t>(Parameter("test", 1), 1);
REQUIRE(!result);
CHECK(result.error() == "Parameter 'test' with the value 1 must be greater than 1");
CHECK(result.error() == "Parameter 'test' with the value '1' must be greater than '1'");
}

TEST_CASE("rsl::lt_eq") {
Expand All @@ -298,7 +299,8 @@ TEST_CASE("rsl::lt_eq") {

auto const result = rsl::lt_eq<double>(Parameter("test", 4.3), 1.0);
REQUIRE(!result);
CHECK(result.error() == "Parameter 'test' with the value 4.3 must be less than or equal to 1");
CHECK(result.error() ==
"Parameter 'test' with the value '4.3' must be less than or equal to '1'");
}

TEST_CASE("rsl::gt_eq") {
Expand All @@ -317,7 +319,7 @@ TEST_CASE("rsl::gt_eq") {
auto const result = rsl::gt_eq<double>(Parameter("test", -4.3), 1.0);
REQUIRE(!result);
CHECK(result.error() ==
"Parameter 'test' with the value -4.3 must be greater than or equal to 1");
"Parameter 'test' with the value '-4.3' must be greater than or equal to '1'");
}

TEST_CASE("rsl::one_of") {
Expand All @@ -342,7 +344,7 @@ TEST_CASE("rsl::one_of") {
auto const result =
rsl::one_of<double>(Parameter("test", 0.0), std::vector<double>{1.0, 2.0, 3.5});
REQUIRE(!result);
CHECK(result.error() == "Parameter 'test' with the value 0 is not in the set {1, 2, 3.5}");
CHECK(result.error() == "Parameter 'test' with the value '0' is not in the set '{1, 2, 3.5}'");
}

TEST_CASE("rsl::to_parameter_result_msg") {
Expand Down
Loading