Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions rosidl_generator_cpp/resource/action__traits.hpp.em
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,24 @@ TEMPLATE(

@{
action_typename = '::'.join(action.namespaced_type.namespaced_name())
action_fully_qualified_name = '/'.join(action.namespaced_type.namespaced_name())
}@
@
namespace rosidl_generator_traits
{

template<>
inline const char * data_type<@(action_typename)>()
{
return "@(action_typename)";
}

template<>
inline const char * name<@(action_typename)>()
{
return "@(action_fully_qualified_name)";
}

template<>
struct is_action<@(action_typename)>
: std::true_type
Expand Down
31 changes: 31 additions & 0 deletions rosidl_generator_tests/test/rosidl_generator_cpp/test_name.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include <gtest/gtest.h>
#include "rosidl_generator_tests/action/fibonacci.hpp"
#include "rosidl_generator_tests/msg/empty.hpp"
#include "rosidl_generator_tests/msg/strings.hpp"
#include "rosidl_generator_tests/srv/basic_types.hpp"
Expand All @@ -27,6 +28,15 @@ TEST(Test_rosidl_generator_traits, check_msg_name) {
rosidl_generator_traits::name<rosidl_generator_tests::msg::Empty>());
}

TEST(Test_rosidl_generator_traits, check_msg_data_type) {
ASSERT_STREQ(
"rosidl_generator_tests::msg::Strings",
rosidl_generator_traits::data_type<rosidl_generator_tests::msg::Strings>());
ASSERT_STREQ(
"rosidl_generator_tests::msg::Empty",
rosidl_generator_traits::data_type<rosidl_generator_tests::msg::Empty>());
}

TEST(Test_rosidl_generator_traits, check_srv_name) {
ASSERT_STREQ(
"rosidl_generator_tests/srv/BasicTypes",
Expand All @@ -35,3 +45,24 @@ TEST(Test_rosidl_generator_traits, check_srv_name) {
"rosidl_generator_tests/srv/Empty",
rosidl_generator_traits::name<rosidl_generator_tests::srv::Empty>());
}

TEST(Test_rosidl_generator_traits, check_srv_data_type) {
ASSERT_STREQ(
"rosidl_generator_tests::srv::BasicTypes",
rosidl_generator_traits::data_type<rosidl_generator_tests::srv::BasicTypes>());
ASSERT_STREQ(
"rosidl_generator_tests::srv::Empty",
rosidl_generator_traits::data_type<rosidl_generator_tests::srv::Empty>());
}

TEST(Test_rosidl_generator_traits, check_action_name) {
ASSERT_STREQ(
"rosidl_generator_tests/action/Fibonacci",
rosidl_generator_traits::name<rosidl_generator_tests::action::Fibonacci>());
}

TEST(Test_rosidl_generator_traits, check_action_data_type) {
ASSERT_STREQ(
"rosidl_generator_tests::action::Fibonacci",
rosidl_generator_traits::data_type<rosidl_generator_tests::action::Fibonacci>());
}