fix(rosbag2_cpp): Remove unnecessary ManualSplitSequentialWriter.

After making split_bagfile public, this class was no longer necessary. Signed-off-by: Rick Shanor <rickshanor@gmail.com>
ros2 · Oct 10, 2022 · d4e52cc · d4e52cc
1 parent 0305626
commit d4e52cc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/rosbag2_cpp/test/rosbag2_cpp/fake_data.cpp b/rosbag2_cpp/test/rosbag2_cpp/fake_data.cpp
@@ -28,7 +28,7 @@ void write_sample_split_bag(
 {
   std::string topic_name = "testtopic";
 
-  ManualSplitSequentialWriter writer{};
+  rosbag2_cpp::writers::SequentialWriter writer{};
   writer.open(storage_options, rosbag2_cpp::ConverterOptions{});
   writer.create_topic(
   {

diff --git a/rosbag2_cpp/test/rosbag2_cpp/fake_data.hpp b/rosbag2_cpp/test/rosbag2_cpp/fake_data.hpp
@@ -20,12 +20,6 @@
 
 #include "rosbag2_cpp/writers/sequential_writer.hpp"
 
-class ManualSplitSequentialWriter : public rosbag2_cpp::writers::SequentialWriter
-{
-public:
-  using rosbag2_cpp::writers::SequentialWriter::split_bagfile;
-};
-
 // Write vector of <timestamp, uint32_data_value> pairs to bag files, splitting every N messages
 void write_sample_split_bag(
   const rosbag2_storage::StorageOptions & storage_options,

diff --git a/rosbag2_transport/test/rosbag2_transport/test_record_services.cpp b/rosbag2_transport/test/rosbag2_transport/test_record_services.cpp
@@ -183,11 +183,6 @@ TEST_F(RecordSrvsSplitBagfileTest, split_bagfile)
   MockSequentialWriter & mock_writer =
     static_cast<MockSequentialWriter &>(writer.get_implementation_handle());
   EXPECT_FALSE(mock_writer.split_bagfile_called());
-
-  std::chrono::duration<float> duration(2.0);
-  std::this_thread::sleep_for(duration);
-  EXPECT_FALSE(mock_writer.split_bagfile_called());
-
   successful_service_request<SplitBagfile>(cli_split_bagfile_);
   EXPECT_TRUE(mock_writer.split_bagfile_called());
 }