Skip to content

Commit

Permalink
Corrected old tests
Browse files Browse the repository at this point in the history
Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
  • Loading branch information
ivanpauno committed May 22, 2019
1 parent ab30574 commit 0a3d9c8
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions rclcpp/test/test_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1450,13 +1450,13 @@ TEST_F(TestNode, describe_parameter_undeclared_parameters_not_allowed) {
{
auto result = node->describe_parameter(name1);
EXPECT_EQ(result.name, name1);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_FALSE(result.read_only);
}
{
auto result = node->describe_parameter(name2);
EXPECT_EQ(result.name, name2);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(result.read_only);
}
}
Expand Down Expand Up @@ -1490,13 +1490,13 @@ TEST_F(TestNode, describe_parameter_undeclared_parameters_allowed) {
{
auto result = node->describe_parameter(name1);
EXPECT_EQ(result.name, name1);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_FALSE(result.read_only);
}
{
auto result = node->describe_parameter(name2);
EXPECT_EQ(result.name, name2);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(result.type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(result.read_only);
}
}
Expand Down Expand Up @@ -1533,11 +1533,11 @@ TEST_F(TestNode, describe_parameters_undeclared_parameters_not_allowed) {
EXPECT_EQ(results.size(), 2u);

EXPECT_EQ(results[0].name, name1);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_FALSE(results[0].read_only);

EXPECT_EQ(results[1].name, name2);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(results[1].read_only);
}
{
Expand Down Expand Up @@ -1578,15 +1578,15 @@ TEST_F(TestNode, describe_parameters_undeclared_parameters_not_allowed) {
EXPECT_EQ(results.size(), 3u);

EXPECT_EQ(results[0].name, name2);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(results[0].read_only);

EXPECT_EQ(results[1].name, name1);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_FALSE(results[1].read_only);

EXPECT_EQ(results[2].name, name2);
EXPECT_EQ(results[2].type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(results[2].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(results[2].read_only);
}
}
Expand All @@ -1611,11 +1611,11 @@ TEST_F(TestNode, describe_parameters_undeclared_parameters_allowed) {
EXPECT_EQ(results.size(), 2u);

EXPECT_EQ(results[0].name, name1);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER);
EXPECT_EQ(results[0].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_FALSE(results[0].read_only);

EXPECT_EQ(results[1].name, name2);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_STRING);
EXPECT_EQ(results[1].type, rcl_interfaces::msg::ParameterType::PARAMETER_NOT_SET);
EXPECT_TRUE(results[1].read_only);
}
{
Expand Down

0 comments on commit 0a3d9c8

Please sign in to comment.