fix

tier4 · Feb 27, 2025 · 15a7533 · 15a7533
1 parent 3bae2ee
commit 15a7533
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/agnocastlib/test/integration/include/node_for_no_starvation_test.hpp b/src/agnocastlib/test/integration/include/node_for_no_starvation_test.hpp
@@ -36,7 +36,8 @@ class NodeForNoStarvation : public rclcpp::Node
     const int64_t num_agnocast_sub_cbs, const int64_t num_ros2_sub_cbs,
     const int64_t num_agnocast_cbs_to_be_added, const std::chrono::milliseconds pub_period);
 
+  ~NodeForNoStarvation();
+
   bool is_all_ros2_sub_cbs_called() const;
   bool is_all_agnocast_sub_cbs_called() const;
-  void remove_mqueues();
 };
diff --git a/src/agnocastlib/test/integration/src/node_for_no_starvation_test.cpp b/src/agnocastlib/test/integration/src/node_for_no_starvation_test.cpp
@@ -28,7 +28,7 @@ NodeForNoStarvation::NodeForNoStarvation(
   ros2_sub_cbs_called_.assign(num_ros2_sub_cbs, false);
 }
 
-void NodeForNoStarvation::remove_mqueues()
+NodeForNoStarvation::~NodeForNoStarvation()
 {
   for (auto & mq_receiver : mq_receivers_) {
     if (mq_close(mq_receiver.first) == -1) {

diff --git a/src/agnocastlib/test/integration/test_agnocast_multi_threaded_executor.cpp b/src/agnocastlib/test/integration/test_agnocast_multi_threaded_executor.cpp
@@ -37,11 +37,7 @@ class MultiThreadedAgnocastExecutorNoStarvationTest
     executor_->add_node(test_node_);
   }
 
-  void TearDown() override
-  {
-    test_node_->remove_mqueues();
-    rclcpp::shutdown();
-  }
+  void TearDown() override { rclcpp::shutdown(); }
 
   std::shared_ptr<NodeForNoStarvation> test_node_;
   std::shared_ptr<agnocast::MultiThreadedAgnocastExecutor> executor_;

diff --git a/src/agnocastlib/test/integration/test_agnocast_single_threaded_executor.cpp b/src/agnocastlib/test/integration/test_agnocast_single_threaded_executor.cpp
@@ -30,11 +30,7 @@ class SingleThreadedAgnocastExecutorNoStarvationTest : public ::testing::TestWit
     executor_->add_node(test_node_);
   }
 
-  void TearDown() override
-  {
-    test_node_->remove_mqueues();
-    rclcpp::shutdown();
-  }
+  void TearDown() override { rclcpp::shutdown(); }
 
   std::shared_ptr<NodeForNoStarvation> test_node_;
   std::shared_ptr<agnocast::SingleThreadedAgnocastExecutor> executor_;