Simplify MockKeyboardHandler

Signed-off-by: Emerson Knapp <[email protected]>
ros2 · Sep 24, 2021 · ac3c0c6 · ac3c0c6
1 parent 8a42ac5
commit ac3c0c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 43 deletions.
diff --git a/rosbag2_transport/test/rosbag2_transport/mock_keyboard_handler.hpp b/rosbag2_transport/test/rosbag2_transport/mock_keyboard_handler.hpp
@@ -26,43 +26,13 @@
 class MockKeyboardHandler : public KeyboardHandler
 {
 public:
-  MockKeyboardHandler(
-    KeyboardHandler::KeyCode pause_resume_toggle_key,
-    KeyboardHandler::KeyCode play_next_key)
-  : pause_resume_toggle_key_(pause_resume_toggle_key),
-    play_next_key_(play_next_key)
-  {
-    is_init_succeed_ = true;
-  }
-
-  KEYBOARD_HANDLER_PUBLIC void pause_resume()
-  {
-    press_key(pause_resume_toggle_key_);
-  }
-
-  KEYBOARD_HANDLER_PUBLIC void play_next()
-  {
-    press_key(play_next_key_);
-  }
-
-  /// \brief destructor
-  KEYBOARD_HANDLER_PUBLIC
-  virtual ~MockKeyboardHandler()
-  {
-    exit_ = true;
-  }
-
-private:
-  KeyboardHandler::KeyCode pause_resume_toggle_key_;
-  KeyboardHandler::KeyCode play_next_key_;
-  std::thread key_handler_thread_;
-  std::atomic_bool exit_;
-  std::exception_ptr thread_exception_ptr{nullptr};
+  MockKeyboardHandler() = default;
 
-  void press_key(KeyboardHandler::KeyCode key_code)
+  void simulate_key_press(
+    KeyboardHandler::KeyCode key_code,
+    KeyboardHandler::KeyModifiers key_modifiers = KeyboardHandler::KeyModifiers::NONE)
   {
     std::lock_guard<std::mutex> lk(callbacks_mutex_);
-    KeyboardHandler::KeyModifiers key_modifiers = KeyboardHandler::KeyModifiers::NONE;
     auto range = callbacks_.equal_range(KeyAndModifiers{key_code, key_modifiers});
     for (auto it = range.first; it != range.second; ++it) {
       it->second.callback(key_code, key_modifiers);

diff --git a/rosbag2_transport/test/rosbag2_transport/test_keyboard_controls.cpp b/rosbag2_transport/test/rosbag2_transport/test_keyboard_controls.cpp
@@ -135,24 +135,20 @@ TEST_F(RosBag2PlayTestFixture, test_keyboard_controls)
   auto prepared_mock_reader = std::make_unique<MockSequentialReader>();
   prepared_mock_reader->prepare(messages, topics_and_types);
   auto reader = std::make_unique<rosbag2_cpp::Reader>(std::move(prepared_mock_reader));
-  auto keyboard_handler = new MockKeyboardHandler(
-    play_options_.pause_resume_toggle_key,
-    play_options_.play_next_key);
+  auto keyboard_handler = std::make_shared<MockKeyboardHandler>();
 
   // play bag in thread
   auto player = std::make_shared<CountPlayer>(
-    std::move(reader), std::shared_ptr<KeyboardHandler>(keyboard_handler),
+    std::move(reader), keyboard_handler,
     storage_options_, play_options_);
   std::thread player_thread = std::thread([player]() {player->play();});
 
   EXPECT_THAT(player->is_paused(), false);
-  keyboard_handler->play_next();
-  EXPECT_THAT(player->is_paused(), false);
-  keyboard_handler->pause_resume();
+  keyboard_handler->simulate_key_press(play_options_.pause_resume_toggle_key);
   EXPECT_THAT(player->is_paused(), true);
-  keyboard_handler->play_next();
+  keyboard_handler->simulate_key_press(play_options_.play_next_key);
   EXPECT_THAT(player->is_paused(), true);
-  keyboard_handler->pause_resume();
+  keyboard_handler->simulate_key_press(play_options_.pause_resume_toggle_key);
   EXPECT_THAT(player->is_paused(), false);
 
   if (player_thread.joinable()) {