windows try no 3

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
ros2 · Apr 3, 2020 · a710fe4 · a710fe4
1 parent f8cfddd
commit a710fe4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rosbag2_cpp/test/rosbag2_cpp/test_multifile_reader.cpp b/rosbag2_cpp/test/rosbag2_cpp/test_multifile_reader.cpp
@@ -41,10 +41,10 @@ class MultifileReaderTest : public Test
   : storage_(std::make_shared<NiceMock<MockStorage>>()),
     converter_factory_(std::make_shared<StrictMock<MockConverterFactory>>()),
     storage_serialization_format_("rmw1_format"),
+    storage_uri_(rcpputils::fs::temp_directory_path().string()),
     relative_path_1_("some_relative_path_1"),
     relative_path_2_("some_relative_path_2"),
-    absolute_path_1_(rcpputils::fs::path("/some/absolute/path1").string()),  // convert to MS
-    storage_uri_(rcpputils::fs::temp_directory_path().string()),
+    absolute_path_1_((rcpputils::fs::path(storage_uri_) / "some/folder").string()),
     default_storage_options_({storage_uri_, ""})
   {}
 
@@ -91,10 +91,10 @@ class MultifileReaderTest : public Test
   std::shared_ptr<StrictMock<MockConverterFactory>> converter_factory_;
   std::unique_ptr<rosbag2_cpp::Reader> reader_;
   std::string storage_serialization_format_;
+  std::string storage_uri_;
   std::string relative_path_1_;
   std::string relative_path_2_;
   std::string absolute_path_1_;
-  std::string storage_uri_;
   rosbag2_cpp::StorageOptions default_storage_options_;
 };
 
@@ -106,7 +106,7 @@ class MultifileReaderTestVersion3 : public MultifileReaderTest
   {
     relative_path_1_ = "rosbag_name/some_relative_path_1";
     relative_path_2_ = "rosbag_name/some_relative_path_2";
-    absolute_path_1_ = rcpputils::fs::path("/some/absolute/path1").string();
+    absolute_path_1_ = (rcpputils::fs::path(storage_uri_) / "some/folder").string();
   }
 
   rosbag2_storage::BagMetadata get_metadata() const override

diff --git a/rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp b/rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp
@@ -56,7 +56,7 @@ class SequentialReaderTest : public Test
     message->topic_name = topic_with_type.name;
 
     auto relative_file_path =
-      (rcpputils::fs::path(storage_uri_) / rcpputils::fs::path("some/folder")).string();
+      (rcpputils::fs::path(storage_uri_) / "some/folder").string();
     auto storage_factory = std::make_unique<StrictMock<MockStorageFactory>>();
     auto metadata_io = std::make_unique<NiceMock<MockMetadataIo>>();
     rosbag2_storage::BagMetadata metadata;