Rename function to name()

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
ros2 · Aug 17, 2020 · 0e79466 · 0e79466
1 parent 78e8197
commit 0e79466
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/rosidl_generator_cpp/CMakeLists.txt b/rosidl_generator_cpp/CMakeLists.txt
@@ -92,13 +92,13 @@ if(BUILD_TESTING)
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
     )
   endif()
-  ament_add_gtest(test_fully_qualified_name test/test_fully_qualified_name.cpp)
-  if(TARGET test_fully_qualified_name)
-    add_dependencies(test_fully_qualified_name ${PROJECT_NAME})
-    ament_target_dependencies(test_fully_qualified_name
+  ament_add_gtest(test_name test/test_name.cpp)
+  if(TARGET test_name)
+    add_dependencies(test_name ${PROJECT_NAME})
+    ament_target_dependencies(test_name
       rosidl_runtime_cpp
       rosidl_runtime_c)
-    target_include_directories(test_fully_qualified_name PUBLIC
+    target_include_directories(test_name PUBLIC
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
     )
   endif()

diff --git a/rosidl_generator_cpp/resource/msg__traits.hpp.em b/rosidl_generator_cpp/resource/msg__traits.hpp.em
@@ -68,7 +68,7 @@ inline const char * data_type<@(message_typename)>()
 }
 
 template<>
-inline const char * fully_qualified_name<@(message_typename)>()
+inline const char * name<@(message_typename)>()
 {
   return "@(message_fully_qualified_name)";
 }

diff --git a/rosidl_generator_cpp/resource/srv__traits.hpp.em b/rosidl_generator_cpp/resource/srv__traits.hpp.em
@@ -28,7 +28,7 @@ inline const char * data_type<@(service_typename)>()
 }
 
 template<>
-inline const char * fully_qualified_name<@(service_typename)>()
+inline const char * name<@(service_typename)>()
 {
   return "@(service_fully_qualified_name)";
 }

diff --git a/...or_cpp/test/test_fully_qualified_name.cpp → rosidl_generator_cpp/test/test_name.cpp b/...or_cpp/test/test_fully_qualified_name.cpp → rosidl_generator_cpp/test/test_name.cpp
@@ -18,20 +18,20 @@
 #include "rosidl_generator_cpp/srv/basic_types.hpp"
 #include "rosidl_generator_cpp/srv/empty.hpp"
 
-TEST(Test_rosidl_generator_traits, check_msg_fully_qualified_name) {
+TEST(Test_rosidl_generator_traits, check_msg_name) {
   ASSERT_STREQ(
     "rosidl_generator_cpp/msg/Strings",
-    rosidl_generator_traits::fully_qualified_name<rosidl_generator_cpp::msg::Strings>());
+    rosidl_generator_traits::name<rosidl_generator_cpp::msg::Strings>());
   ASSERT_STREQ(
     "rosidl_generator_cpp/msg/Empty",
-    rosidl_generator_traits::fully_qualified_name<rosidl_generator_cpp::msg::Empty>());
+    rosidl_generator_traits::name<rosidl_generator_cpp::msg::Empty>());
 }
 
-TEST(Test_rosidl_generator_traits, check_srv_fully_qualified_name) {
+TEST(Test_rosidl_generator_traits, check_srv_name) {
   ASSERT_STREQ(
     "rosidl_generator_cpp/srv/BasicTypes",
-    rosidl_generator_traits::fully_qualified_name<rosidl_generator_cpp::srv::BasicTypes>());
+    rosidl_generator_traits::name<rosidl_generator_cpp::srv::BasicTypes>());
   ASSERT_STREQ(
     "rosidl_generator_cpp/srv/Empty",
-    rosidl_generator_traits::fully_qualified_name<rosidl_generator_cpp::srv::Empty>());
+    rosidl_generator_traits::name<rosidl_generator_cpp::srv::Empty>());
 }
diff --git a/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp b/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp
@@ -24,7 +24,7 @@ template<typename T>
 inline const char * data_type();
 
 template<typename T>
-inline const char * fully_qualified_name();
+inline const char * name();
 
 template<typename T>
 struct has_fixed_size : std::false_type {};