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.

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

Add tests type_support module #1308

Merged
merged 16 commits into from
Sep 15, 2020
10 changes: 10 additions & 0 deletions rclcpp/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,16 @@ if(TARGET test_subscription_traits)
)
target_link_libraries(test_subscription_traits ${PROJECT_NAME})
endif()
ament_add_gtest(test_type_support rclcpp/test_type_support.cpp)
if(TARGET test_type_support)
ament_target_dependencies(test_type_support
"rmw"
"rosidl_runtime_cpp"
"rosidl_typesupport_cpp"
"test_msgs"
)
target_link_libraries(test_type_support ${PROJECT_NAME})
endif()
ament_add_gtest(test_find_weak_nodes rclcpp/test_find_weak_nodes.cpp)
if(TARGET test_find_weak_nodes)
ament_target_dependencies(test_find_weak_nodes
Expand Down
4 changes: 4 additions & 0 deletions rclcpp/test/rclcpp/test_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,9 @@ TEST_F(TestService, basic_public_getters) {
// Use get_service_handle specific to const service
std::shared_ptr<const rcl_service_t> const_service_handle = base.get_service_handle();
EXPECT_NE(nullptr, const_service_handle);

EXPECT_EQ(RCL_RET_OK, rcl_service_fini(
&service_handle,
node_handle_int->get_node_base_interface()->get_rcl_node_handle()));
}
}
196 changes: 196 additions & 0 deletions rclcpp/test/rclcpp/test_type_support.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
// Copyright 2017 Open Source Robotics Foundation, Inc.
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include <gtest/gtest.h>

#include <string>
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
#include <memory>
#include <vector>

#include "rclcpp/exceptions.hpp"
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
#include "rclcpp/rclcpp.hpp"
#include "rclcpp/type_support_decl.hpp"
#include "test_msgs/msg/empty.hpp"

class TestTypeSupport : public ::testing::Test
{
public:
static void SetUpTestCase()
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
{
if (!rclcpp::ok()) {
rclcpp::init(0, nullptr);
}
}

protected:
void initialize(const rclcpp::NodeOptions & node_options = rclcpp::NodeOptions())
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
{
node = std::make_shared<rclcpp::Node>("my_node", "/ns", node_options);
}

void TearDown()
{
node.reset();
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
}

rclcpp::Node::SharedPtr node;
};

const rcl_publisher_options_t PublisherOptions()
{
return rclcpp::PublisherOptionsWithAllocator<std::allocator<void>>().template
to_rcl_publisher_options<test_msgs::msg::Empty>(rclcpp::QoS(10));
}

// Auxiliary classes used to test rosidl_message_type_support_t getters
// defined in type_support.hpp
const rosidl_message_type_support_t *ts_parameter_event =
rclcpp::type_support::get_parameter_event_msg_type_support();

class TestTSParameterEvent : public rclcpp::PublisherBase
{
public:
explicit TestTSParameterEvent(rclcpp::Node * node)
: rclcpp::PublisherBase(
node->get_node_base_interface().get(),
"topicTSParameterEvent",
*ts_parameter_event,
PublisherOptions()) {}
};

const rosidl_message_type_support_t *ts_set_parameter_result =
rclcpp::type_support::get_set_parameters_result_msg_type_support();

class TestTSSetParameterResult : public rclcpp::PublisherBase
{
public:
explicit TestTSSetParameterResult(rclcpp::Node * node)
: rclcpp::PublisherBase(
node->get_node_base_interface().get(),
"topicTSSetParameterResult",
*ts_set_parameter_result,
PublisherOptions()) {}
};

const rosidl_message_type_support_t *ts_parameter_descriptor =
rclcpp::type_support::get_parameter_descriptor_msg_type_support();

class TestTSParameterDescriptor : public rclcpp::PublisherBase
{
public:
explicit TestTSParameterDescriptor(rclcpp::Node * node)
: rclcpp::PublisherBase(
node->get_node_base_interface().get(),
"topicTSParameterDescriptor",
*ts_parameter_descriptor,
PublisherOptions()) {}
};

const rosidl_message_type_support_t *ts_list_parameter_result =
rclcpp::type_support::get_list_parameters_result_msg_type_support();

class TestTSListParametersResult : public rclcpp::PublisherBase
{
public:
explicit TestTSListParametersResult(rclcpp::Node * node)
: rclcpp::PublisherBase(
node->get_node_base_interface().get(),
"topicTSListParametersResult",
*ts_list_parameter_result,
PublisherOptions()) {}
};

/*
Test that the publisher is created properly for different msg typesupport
*/
TEST_F(TestTypeSupport, basic_getters) {
initialize();
{
auto publisher = TestTSParameterEvent(node.get());
std::shared_ptr<const rcl_publisher_t> publisher_handle = publisher.get_publisher_handle();
EXPECT_NE(nullptr, publisher_handle);
}
{
auto publisher = TestTSSetParameterResult(node.get());
std::shared_ptr<const rcl_publisher_t> publisher_handle = publisher.get_publisher_handle();
EXPECT_NE(nullptr, publisher_handle);
}
{
auto publisher = TestTSParameterDescriptor(node.get());
std::shared_ptr<const rcl_publisher_t> publisher_handle = publisher.get_publisher_handle();
EXPECT_NE(nullptr, publisher_handle);
}
{
auto publisher = TestTSListParametersResult(node.get());
std::shared_ptr<const rcl_publisher_t> publisher_handle = publisher.get_publisher_handle();
EXPECT_NE(nullptr, publisher_handle);
}
}

void test_type_support_init_fini(const rosidl_service_type_support_t * ts){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be part of the TestTypeSupport fixture? If you chopped up each check in test_service_getters into their own tests, you wouldn't need to create a second node here.

Also, I think this function should return an ::testing::AssertionResult, then you can wrap each call to test_type_support_init_fini in an EXPECT_TRUE. If there is a failure in this function, it will not only print out your custom failure message, but also the line in test_service_getters where the EXPECT_TRUE failed. Otherwise, if line 150 failed, you currently get no more helpful feedback than that there was a failure at line 150.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take a look to the complete I made based in your comments, let me know if you think this is ok

auto node_handle_int = rclcpp::Node::make_shared("base_node");
rcl_service_t service_handle = rcl_get_zero_initialized_service();
rcl_service_options_t service_options = rcl_service_get_default_options();
rcl_ret_t ret = rcl_service_init(
&service_handle,
node_handle_int->get_node_base_interface()->get_rcl_node_handle(),
ts, "base_node_service", &service_options);
if (ret != RCL_RET_OK) {
FAIL();
return;
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
}
EXPECT_EQ(RCL_RET_OK, rcl_service_fini(
&service_handle,
node_handle_int->get_node_base_interface()->get_rcl_node_handle()));
}

/* Testing type support getters */
TEST_F(TestTypeSupport, test_service_getters) {
initialize();
{
const rosidl_service_type_support_t * ts =
Blast545 marked this conversation as resolved.
Show resolved Hide resolved
rclcpp::type_support::get_get_parameters_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_get_parameters_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_get_parameter_types_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_set_parameters_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_list_parameters_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_describe_parameters_srv_type_support();
test_type_support_init_fini(ts);
}
{
const rosidl_service_type_support_t * ts =
rclcpp::type_support::get_set_parameters_atomically_srv_type_support();
test_type_support_init_fini(ts);
}
}