Skip to content

Commit 0634ee9

Browse files
Fix the tests
1 parent b448c36 commit 0634ee9

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

control_toolbox/test/pid_ros_parameters_tests.cpp

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -605,42 +605,50 @@ TEST(PidParametersTest, GetParametersTest)
605605
TEST(PidParametersTest, GetParametersFromParams)
606606
{
607607
rclcpp::Node::SharedPtr node = std::make_shared<rclcpp::Node>("pid_parameters_test");
608-
609-
TestablePidROS pid(node, "", "", false);
608+
const bool ACTIVATE_STATE_PUBLISHER = false;
609+
TestablePidROS pid(node, "", "", ACTIVATE_STATE_PUBLISHER);
610610

611611
ASSERT_FALSE(pid.initialize_from_ros_parameters());
612612

613613
rclcpp::Parameter param_p;
614614
ASSERT_TRUE(node->get_parameter("p", param_p));
615-
ASSERT_TRUE(std::isnan(param_p.get_value<double>()));
615+
EXPECT_TRUE(std::isnan(param_p.get_value<double>()));
616616

617617
rclcpp::Parameter param_i;
618618
ASSERT_TRUE(node->get_parameter("i", param_i));
619-
ASSERT_TRUE(std::isnan(param_i.get_value<double>()));
619+
EXPECT_TRUE(std::isnan(param_i.get_value<double>()));
620620

621621
rclcpp::Parameter param_d;
622622
ASSERT_TRUE(node->get_parameter("d", param_d));
623-
ASSERT_TRUE(std::isnan(param_d.get_value<double>()));
623+
EXPECT_TRUE(std::isnan(param_d.get_value<double>()));
624624

625625
rclcpp::Parameter param_i_clamp_max;
626626
ASSERT_TRUE(node->get_parameter("i_clamp_max", param_i_clamp_max));
627-
ASSERT_TRUE(std::isnan(param_i_clamp_max.get_value<double>()));
627+
EXPECT_TRUE(std::isnan(param_i_clamp_max.get_value<double>()));
628628

629629
rclcpp::Parameter param_i_clamp_min;
630630
ASSERT_TRUE(node->get_parameter("i_clamp_min", param_i_clamp_min));
631-
ASSERT_TRUE(std::isnan(param_i_clamp_min.get_value<double>()));
631+
EXPECT_TRUE(std::isnan(param_i_clamp_min.get_value<double>()));
632632

633633
rclcpp::Parameter param_u_clamp_max;
634634
ASSERT_TRUE(node->get_parameter("u_clamp_max", param_u_clamp_max));
635-
ASSERT_TRUE(std::isinf(param_u_clamp_max.get_value<double>()));
635+
EXPECT_TRUE(std::isinf(param_u_clamp_max.get_value<double>()));
636636

637637
rclcpp::Parameter param_u_clamp_min;
638638
ASSERT_TRUE(node->get_parameter("u_clamp_min", param_u_clamp_min));
639-
ASSERT_TRUE(std::isinf(param_u_clamp_min.get_value<double>()));
639+
EXPECT_TRUE(std::isinf(param_u_clamp_min.get_value<double>()));
640+
641+
rclcpp::Parameter param_saturation;
642+
ASSERT_TRUE(node->get_parameter("saturation", param_saturation));
643+
EXPECT_FALSE(param_saturation.get_value<bool>());
640644

641645
rclcpp::Parameter param_tracking_time_constant;
642646
ASSERT_TRUE(node->get_parameter("tracking_time_constant", param_tracking_time_constant));
643-
ASSERT_TRUE(std::isnan(param_tracking_time_constant.get_value<double>()));
647+
EXPECT_TRUE(std::isnan(param_tracking_time_constant.get_value<double>()));
648+
649+
rclcpp::Parameter param_activate_state_publisher;
650+
ASSERT_TRUE(node->get_parameter("activate_state_publisher", param_activate_state_publisher));
651+
EXPECT_EQ(param_activate_state_publisher.get_value<bool>(), ACTIVATE_STATE_PUBLISHER);
644652
}
645653

646654
TEST(PidParametersTest, MultiplePidInstances)

0 commit comments

Comments
 (0)