Skip to content

Commit 1b49f5b

Browse files
committed
modified tests according to expection
1 parent 6ab7e05 commit 1b49f5b

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

nav2_costmap_2d/test/unit/binary_filter_test.cpp

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ class TestNode : public ::testing::Test
258258
void createNodesWithParams();
259259
void addBinaryParam(
260260
std::string param_node_name, std::string param_namespace,
261-
std::string param_name, bool default_value_set, bool default_param_value);
261+
std::string param_name, bool default_value_set, bool default_param_value,
262+
bool is_critical = true);
262263
void resetBinaryParams();
263264
void verifyBinaryParams(bool param1_expected_value, bool param2_expected_value);
264265

@@ -294,6 +295,7 @@ class TestNode : public ::testing::Test
294295
std::string name;
295296
bool default_value_set;
296297
bool default_value;
298+
bool is_critical;
297299
} BinaryParam;
298300

299301
std::vector<BinaryParam> binary_params_{};
@@ -479,6 +481,13 @@ bool TestNode::createBinaryFilter(const std::string & global_frame, double flip_
479481
std::string(FILTER_NAME) + "." + param.namespace_ + ".default_state",
480482
param.default_value));
481483
}
484+
node_->declare_parameter(
485+
std::string(FILTER_NAME) + "." + param.namespace_ + ".is_critical",
486+
rclcpp::ParameterValue(true));
487+
node_->set_parameter(
488+
rclcpp::Parameter(
489+
std::string(FILTER_NAME) + "." + param.namespace_ + ".is_critical",
490+
param.is_critical));
482491
}
483492

484493
binary_filter_ = std::make_shared<nav2_costmap_2d::BinaryFilter>();
@@ -878,17 +887,19 @@ void TestNode::reset()
878887
* @param param_name
879888
* @param default_value_set whether default value is set or not
880889
* @param default_param_value default value of the param (ignored if default_value_set is false)
890+
* @param is_critical Whether any fail on changing this should lead to an error
881891
*/
882892
void TestNode::addBinaryParam(
883893
std::string param_node_name, std::string param_namespace, std::string param_name,
884-
bool default_value_set, bool default_param_value)
894+
bool default_value_set, bool default_param_value, bool is_critical)
885895
{
886896
BinaryParam param;
887897
param.namespace_ = param_namespace;
888898
param.node_name = param_node_name;
889899
param.name = param_name;
890900
param.default_value_set = default_value_set;
891901
param.default_value = default_param_value;
902+
param.is_critical = is_critical;
892903
binary_params_.push_back(param);
893904
}
894905

@@ -1003,7 +1014,7 @@ TEST_F(TestNode, testWrongBinaryParamNode)
10031014
publishMaps(nav2_costmap_2d::BINARY_FILTER, MASK_TOPIC, 0.0, 1.0);
10041015

10051016
// Set woring Param1 node name
1006-
addBinaryParam("wrong_node_name", PARAM_NAMESPACE_0, PARAM_NAME_0, true, true);
1017+
addBinaryParam("wrong_node_name", PARAM_NAMESPACE_0, PARAM_NAME_0, true, true, false);
10071018
addBinaryParam(NODE_NAME_1, PARAM_NAMESPACE_1, PARAM_NAME_1, true, false);
10081019
createNodesWithParams();
10091020
ASSERT_TRUE(createBinaryFilter("map", 10.0));
@@ -1025,7 +1036,7 @@ TEST_F(TestNode, testWrongBinaryParamName)
10251036
publishMaps(nav2_costmap_2d::BINARY_FILTER, MASK_TOPIC, 0.0, 1.0);
10261037

10271038
// Set wrong node name for first parameter
1028-
addBinaryParam(NODE_NAME_0, PARAM_NAMESPACE_0, "wrong_param_name", true, true);
1039+
addBinaryParam(NODE_NAME_0, PARAM_NAMESPACE_0, "wrong_param_name", true, true, false);
10291040
addBinaryParam(NODE_NAME_1, PARAM_NAMESPACE_1, PARAM_NAME_1, true, false);
10301041
createNodesWithParams();
10311042
ASSERT_TRUE(createBinaryFilter("map", 10.0));

0 commit comments

Comments
 (0)