another try on windows

Signed-off-by: Karsten Knese <[email protected]>
ros2 · Apr 3, 2020 · d244af0 · d244af0
1 parent 8c7a36b
commit d244af0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp b/rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp
@@ -55,7 +55,8 @@ class SequentialReaderTest : public Test
     auto message = std::make_shared<rosbag2_storage::SerializedBagMessage>();
     message->topic_name = topic_with_type.name;
 
-    auto relative_file_path = rcpputils::fs::path("/absolute/path/to/storage").string();
+    auto relative_file_path =
+      (rcpputils::fs::path(storage_uri_) / rcpputils::fs::path("some/folder")).string();
     auto storage_factory = std::make_unique<StrictMock<MockStorageFactory>>();
     auto metadata_io = std::make_unique<NiceMock<MockMetadataIo>>();
     rosbag2_storage::BagMetadata metadata;

diff --git a/rosbag2_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.cpp b/rosbag2_tests/test/rosbag2_tests/test_rosbag2_record_end_to_end.cpp
@@ -258,7 +258,7 @@ TEST_F(RecordFixture, record_end_to_end_with_splitting_bagsize_split_is_at_least
 
     // Loop until expected_splits in case it split or the bagfile doesn't exist.
     for (int i = 0; i < expected_splits; ++i) {
-      const auto bag_file_path = get_bag_file_path(i);
+      const auto bag_file_path = get_bag_file_name(i);
 
       if (bag_file_path.exists()) {
         metadata.relative_file_paths.push_back(bag_file_path.string());
@@ -329,7 +329,7 @@ TEST_F(RecordFixture, record_end_to_end_with_splitting_max_size_not_reached) {
     rosbag2_storage::BagMetadata metadata;
     metadata.version = 4;
     metadata.storage_identifier = "sqlite3";
-    metadata.relative_file_paths = {get_bag_file_path(0).string()};
+    metadata.relative_file_paths = {get_bag_file_name(0).string()};
     metadata_io.write_metadata(root_bag_path_.string(), metadata);
   }
 #endif
@@ -388,7 +388,7 @@ TEST_F(RecordFixture, record_end_to_end_with_splitting_splits_bagfile) {
     metadata.storage_identifier = "sqlite3";
 
     for (int i = 0; i < expected_splits; ++i) {
-      const auto bag_file_path = get_bag_file_path(i);
+      const auto bag_file_path = get_bag_file_name(i);
 
       // There is no guarantee that the bagfile split expected_split times
       // due to possible io sync delays. Instead, assert that the bagfile split