Fixing logging unit tests and running automated uncrustify.

nburek · nburek · commit 14efb7bbc9f2 · 2018-12-03T20:45:07.000-08:00
diff --git a/rclcpp/include/rclcpp/any_service_callback.hpp b/rclcpp/include/rclcpp/any_service_callback.hpp
@@ -32,12 +32,12 @@ class AnyServiceCallback
 {
 private:
   using SharedPtrCallback = std::function<
-    void (
+    void(
       const std::shared_ptr<typename ServiceT::Request>,
       std::shared_ptr<typename ServiceT::Response>
     )>;
   using SharedPtrWithRequestHeaderCallback = std::function<
-    void (
+    void(
       const std::shared_ptr<rmw_request_id_t>,
       const std::shared_ptr<typename ServiceT::Request>,
       std::shared_ptr<typename ServiceT::Response>
diff --git a/rclcpp/include/rclcpp/any_subscription_callback.hpp b/rclcpp/include/rclcpp/any_subscription_callback.hpp
@@ -38,15 +38,15 @@ class AnySubscriptionCallback
   using MessageDeleter = allocator::Deleter<MessageAlloc, MessageT>;
   using MessageUniquePtr = std::unique_ptr<MessageT, MessageDeleter>;
 
-  using SharedPtrCallback = std::function<void (const std::shared_ptr<MessageT>)>;
+  using SharedPtrCallback = std::function<void(const std::shared_ptr<MessageT>)>;
   using SharedPtrWithInfoCallback =
-    std::function<void (const std::shared_ptr<MessageT>, const rmw_message_info_t &)>;
-  using ConstSharedPtrCallback = std::function<void (const std::shared_ptr<const MessageT>)>;
+    std::function<void(const std::shared_ptr<MessageT>, const rmw_message_info_t &)>;
+  using ConstSharedPtrCallback = std::function<void(const std::shared_ptr<const MessageT>)>;
   using ConstSharedPtrWithInfoCallback =
-    std::function<void (const std::shared_ptr<const MessageT>, const rmw_message_info_t &)>;
-  using UniquePtrCallback = std::function<void (MessageUniquePtr)>;
+    std::function<void(const std::shared_ptr<const MessageT>, const rmw_message_info_t &)>;
+  using UniquePtrCallback = std::function<void(MessageUniquePtr)>;
   using UniquePtrWithInfoCallback =
-    std::function<void (MessageUniquePtr, const rmw_message_info_t &)>;
+    std::function<void(MessageUniquePtr, const rmw_message_info_t &)>;
 
   SharedPtrCallback shared_ptr_callback_;
   SharedPtrWithInfoCallback shared_ptr_with_info_callback_;
diff --git a/rclcpp/include/rclcpp/client.hpp b/rclcpp/include/rclcpp/client.hpp
@@ -131,8 +131,8 @@ class Client : public ClientBase
   using SharedFuture = std::shared_future<SharedResponse>;
   using SharedFutureWithRequest = std::shared_future<std::pair<SharedRequest, SharedResponse>>;
 
-  using CallbackType = std::function<void (SharedFuture)>;
-  using CallbackWithRequestType = std::function<void (SharedFutureWithRequest)>;
+  using CallbackType = std::function<void(SharedFuture)>;
+  using CallbackWithRequestType = std::function<void(SharedFutureWithRequest)>;
 
   RCLCPP_SMART_PTR_DEFINITIONS(Client)
 
diff --git a/rclcpp/include/rclcpp/exceptions.hpp b/rclcpp/include/rclcpp/exceptions.hpp
@@ -116,7 +116,7 @@ throw_from_rcl_error(
   rcl_ret_t ret,
   const std::string & prefix = "",
   const rcl_error_state_t * error_state = nullptr,
-  void (* reset_error)() = rcl_reset_error);
+  void (*reset_error)() = rcl_reset_error);
 
 class RCLErrorBase
 {
diff --git a/rclcpp/include/rclcpp/function_traits.hpp b/rclcpp/include/rclcpp/function_traits.hpp
@@ -130,20 +130,20 @@ struct function_traits<FunctionT &&>: function_traits<FunctionT>
  */
 template<std::size_t Arity, typename FunctorT>
 struct arity_comparator : std::integral_constant<
-    bool, (Arity == function_traits<FunctorT>::arity)> {};
+    bool, (Arity == function_traits<FunctorT>::arity)>{};
 
 template<typename FunctorT, typename ... Args>
 struct check_arguments : std::is_same<
     typename function_traits<FunctorT>::arguments,
     std::tuple<Args ...>
->
+  >
 {};
 
 template<typename FunctorAT, typename FunctorBT>
 struct same_arguments : std::is_same<
     typename function_traits<FunctorAT>::arguments,
     typename function_traits<FunctorBT>::arguments
->
+  >
 {};
 
 }  // namespace function_traits
diff --git a/rclcpp/include/rclcpp/intra_process_manager.hpp b/rclcpp/include/rclcpp/intra_process_manager.hpp
@@ -326,7 +326,7 @@ class IntraProcessManager
       message_sequence_number,
       requesting_subscriptions_intra_process_id,
       target_subs_size
-    );
+      );
     typename TypedMRB::SharedPtr typed_buffer = std::static_pointer_cast<TypedMRB>(buffer);
     if (!typed_buffer) {
       return;
diff --git a/rclcpp/include/rclcpp/service.hpp b/rclcpp/include/rclcpp/service.hpp
@@ -89,12 +89,12 @@ class Service : public ServiceBase
 {
 public:
   using CallbackType = std::function<
-    void (
+    void(
       const std::shared_ptr<typename ServiceT::Request>,
       std::shared_ptr<typename ServiceT::Response>)>;
 
   using CallbackWithHeaderType = std::function<
-    void (
+    void(
       const std::shared_ptr<rmw_request_id_t>,
       const std::shared_ptr<typename ServiceT::Request>,
       std::shared_ptr<typename ServiceT::Response>)>;
diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
@@ -268,8 +268,8 @@ class Subscription : public SubscriptionBase
   }
 
   using GetMessageCallbackType =
-    std::function<void (uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>;
-  using MatchesAnyPublishersCallbackType = std::function<bool (const rmw_gid_t *)>;
+    std::function<void(uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>;
+  using MatchesAnyPublishersCallbackType = std::function<bool(const rmw_gid_t *)>;
 
   /// Implemenation detail.
   void setup_intra_process(
diff --git a/rclcpp/include/rclcpp/subscription_factory.hpp b/rclcpp/include/rclcpp/subscription_factory.hpp
@@ -57,7 +57,7 @@ struct SubscriptionFactory
 
   // Function that takes a MessageT from the intra process manager
   using SetupIntraProcessFunction = std::function<
-    void (
+    void(
       rclcpp::intra_process_manager::IntraProcessManager::SharedPtr ipm,
       rclcpp::SubscriptionBase::SharedPtr subscription,
       const rcl_subscription_options_t & subscription_options)>;
diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
@@ -95,8 +95,8 @@ class TimerBase
 };
 
 
-using VoidCallbackType = std::function<void ()>;
-using TimerCallbackType = std::function<void (TimerBase &)>;
+using VoidCallbackType = std::function<void()>;
+using TimerCallbackType = std::function<void(TimerBase &)>;
 
 /// Generic timer. Periodically executes a user-specified callback.
 template<
diff --git a/rclcpp/src/rclcpp/exceptions.cpp b/rclcpp/src/rclcpp/exceptions.cpp
@@ -44,7 +44,7 @@ throw_from_rcl_error(
   rcl_ret_t ret,
   const std::string & prefix,
   const rcl_error_state_t * error_state,
-  void (* reset_error)())
+  void (*reset_error)())
 {
   if (RCL_RET_OK == ret) {
     throw std::invalid_argument("ret is RCL_RET_OK");
diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
@@ -610,7 +610,7 @@ rclcpp::executor::operator<<(std::ostream & os, const FutureReturnCode & future_
 }
 
 std::string
-rclcpp::executor::to_string(const FutureReturnCode & future_return_code)
+rclcpp::executor::to_string(const FutureReturnCode &future_return_code)
 {
   using enum_type = std::underlying_type<FutureReturnCode>::type;
   std::string prefix = "Unknown enum value (";
diff --git a/rclcpp/src/rclcpp/time_source.cpp b/rclcpp/src/rclcpp/time_source.cpp
@@ -77,7 +77,7 @@ void TimeSource::attachNode(
     node_topics_,
     node_graph_,
     node_services_
-  );
+    );
   parameter_subscription_ =
     parameter_client_->on_parameter_event(std::bind(&TimeSource::on_parameter_event,
       this, std::placeholders::_1));
diff --git a/rclcpp/test/test_logging.cpp b/rclcpp/test/test_logging.cpp
@@ -89,27 +89,27 @@ TEST_F(TestLoggingMacros, test_logging_named) {
   }
   EXPECT_EQ(RCUTILS_LOG_SEVERITY_DEBUG, g_last_log_event.level);
   EXPECT_EQ("name", g_last_log_event.name);
-  EXPECT_EQ("message 3", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message 3", g_last_log_event.message);
 }
 
 TEST_F(TestLoggingMacros, test_logging_string) {
   for (std::string i : {"one", "two", "three"}) {
     RCLCPP_DEBUG(g_logger, "message " + i);
   }
   EXPECT_EQ(3u, g_log_calls);
-  EXPECT_EQ("message three", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message three", g_last_log_event.message);
 
   RCLCPP_DEBUG(g_logger, "message " "four");
-  EXPECT_EQ("message four", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message four", g_last_log_event.message);
 
   RCLCPP_DEBUG(g_logger, std::string("message " "five"));
-  EXPECT_EQ("message five", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message five", g_last_log_event.message);
 
   RCLCPP_DEBUG(g_logger, std::string("message %s"), "six");
-  EXPECT_EQ("message six", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message six", g_last_log_event.message);
 
   RCLCPP_DEBUG(g_logger, "message seven");
-  EXPECT_EQ("message seven", g_last_log_event.message);
+  EXPECT_EQ("[DEBUG] [name]: message seven", g_last_log_event.message);
 }
 
 TEST_F(TestLoggingMacros, test_logging_once) {
@@ -119,7 +119,7 @@ TEST_F(TestLoggingMacros, test_logging_once) {
   EXPECT_EQ(1u, g_log_calls);
   EXPECT_EQ(RCUTILS_LOG_SEVERITY_INFO, g_last_log_event.level);
   EXPECT_EQ("name", g_last_log_event.name);
-  EXPECT_EQ("message 1", g_last_log_event.message);
+  EXPECT_EQ("[INFO] [name]: message 1", g_last_log_event.message);
 
   // Check that another instance has a context that's independent to the call above's
   g_log_calls = 0;
@@ -129,15 +129,15 @@ TEST_F(TestLoggingMacros, test_logging_once) {
   EXPECT_EQ(1u, g_log_calls);
   EXPECT_EQ(RCUTILS_LOG_SEVERITY_INFO, g_last_log_event.level);
   EXPECT_EQ("name", g_last_log_event.name);
-  EXPECT_EQ("second message 1", g_last_log_event.message);
+  EXPECT_EQ("[INFO] [name]: second message 1", g_last_log_event.message);
 }
 
 TEST_F(TestLoggingMacros, test_logging_expression) {
   for (int i : {1, 2, 3, 4, 5, 6}) {
     RCLCPP_INFO_EXPRESSION(g_logger, i % 3, "message %d", i);
   }
   EXPECT_EQ(4u, g_log_calls);
-  EXPECT_EQ("message 5", g_last_log_event.message);
+  EXPECT_EQ("[INFO] [name]: message 5", g_last_log_event.message);
 }
 
 int g_counter = 0;
@@ -153,7 +153,7 @@ TEST_F(TestLoggingMacros, test_logging_function) {
     RCLCPP_INFO_FUNCTION(g_logger, &mod3, "message %d", i);
   }
   EXPECT_EQ(4u, g_log_calls);
-  EXPECT_EQ("message 5", g_last_log_event.message);
+  EXPECT_EQ("[INFO] [name]: message 5", g_last_log_event.message);
 }
 
 TEST_F(TestLoggingMacros, test_logging_skipfirst) {
diff --git a/rclcpp_action/include/rclcpp_action/client.hpp b/rclcpp_action/include/rclcpp_action/client.hpp
@@ -65,7 +65,7 @@ class Client : public ClientBase
 public:
   RCLCPP_SMART_PTR_DEFINITIONS_NOT_COPYABLE(Client)
 
-  using FeedbackCallback = std::function<void (
+  using FeedbackCallback = std::function<void(
         std::shared_ptr<ClientGoalHandle<ACTION>>, const typename ACTION::Feedback)>;
 
   Client(
diff --git a/rclcpp_action/include/rclcpp_action/server.hpp b/rclcpp_action/include/rclcpp_action/server.hpp
@@ -63,8 +63,8 @@ class Server : public ServerBase
 public:
   RCLCPP_SMART_PTR_DEFINITIONS_NOT_COPYABLE(Server)
 
-  using GoalCallback = std::function<void (rcl_action_goal_info_t &, typename ACTION::Goal *)>;
-  using CancelCallback = std::function<void (std::shared_ptr<ServerGoalHandle<ACTION>>)>;
+  using GoalCallback = std::function<void(rcl_action_goal_info_t &, typename ACTION::Goal *)>;
+  using CancelCallback = std::function<void(std::shared_ptr<ServerGoalHandle<ACTION>>)>;
 
   // TODO(sloretz) accept clock instance
   Server(

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ throw_from_rcl_error(`
`116`	`116`	`rcl_ret_t ret,`
`117`	`117`	`const std::string & prefix = "",`
`118`	`118`	`const rcl_error_state_t * error_state = nullptr,`
`119`		`- void (* reset_error)() = rcl_reset_error);`
	`119`	`+ void (*reset_error)() = rcl_reset_error);`
`120`	`120`
`121`	`121`	`class RCLErrorBase`
`122`	`122`	`{`
Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,8 @@ class Subscription : public SubscriptionBase`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`using GetMessageCallbackType =`
`271`		`- std::function<void (uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>;`
`272`		`- using MatchesAnyPublishersCallbackType = std::function<bool (const rmw_gid_t *)>;`
	`271`	`+ std::function<void(uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>;`
	`272`	`+ using MatchesAnyPublishersCallbackType = std::function<bool(const rmw_gid_t *)>;`
`273`	`273`
`274`	`274`	`/// Implemenation detail.`
`275`	`275`	`void setup_intra_process(`