(test/gurka/) Using C++17 filesystem with few changes

test/gurka/gurka.cc

@@ -28,7 +28,7 @@
 #include <osmium/object_pointer_collection.hpp>
 #include <osmium/osm/object_comparisons.hpp>
 
-#include <filesystem.h>
+#include <filesystem>
 #include <regex>
 #include <string>
 #include <tuple>

test/gurka/test_admin_sidewalk_crossing_override.cc

@@ -1,7 +1,8 @@
+#include <filesystem>
+
 #include <gtest/gtest.h>
 
 #include "baldr/admin.h"
-#include "filesystem.h"
 #include "gurka.h"
 #include "mjolnir/admin.h"
 #include "mjolnir/adminbuilder.h"
@@ -119,8 +120,8 @@ TEST(AdminTest, TestBuildAdminFromPBF) {
   // Create test/data/admin/map.pbf
   const std::string workdir = "test/data/admin_belarus";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_admin_uk_override.cc

@@ -1,7 +1,7 @@
+#include <filesystem>
 #include <gtest/gtest.h>
 
 #include "baldr/admin.h"
-#include "filesystem.h"
 #include "gurka.h"
 #include "mjolnir/admin.h"
 #include "mjolnir/adminbuilder.h"
@@ -115,8 +115,8 @@ TEST(AdminTest, TestBuildAdminFromPBF) {
   // Create test/data/admin/map.pbf
   const std::string workdir = "test/data/admin_uk";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_config_speed.cc

@@ -2,6 +2,8 @@
 #include "src/mjolnir/speed_assigner.h"
 #include <gtest/gtest.h>
 
+#include <filesystem>
+
 using namespace valhalla;
 
 TEST(Standalone, DefaultSpeedConfig) {
@@ -129,9 +131,9 @@ TEST(Standalone, DefaultSpeedConfig) {
     }
   }
 
-  if (!filesystem::create_directories("test/data"))
+  if (!std::filesystem::exists("test/data") && !std::filesystem::create_directories("test/data"))
     throw std::runtime_error("couldn't create directories");
-  filesystem::remove("test/data/speed_config.json");
+  std::filesystem::remove("test/data/speed_config.json");
 
   {
     std::ofstream speed_config("test/data/speed_config.json");
@@ -281,9 +283,9 @@ TEST(Standalone, SuburbanSpeedConfig) {
     }
   }
 
-  if (!filesystem::create_directories("test/data"))
+  if (!std::filesystem::exists("test/data") && !std::filesystem::create_directories("test/data"))
     throw std::runtime_error("couldn't create directories");
-  filesystem::remove("test/data/speed_config_suburban.json");
+  std::filesystem::remove("test/data/speed_config_suburban.json");
 
   {
     std::ofstream speed_config("test/data/speed_config_suburban.json");

test/gurka/test_elevation.cc

@@ -5,6 +5,8 @@
 #include "loki/worker.h"
 #include "midgard/pointll.h"
 
+#include <filesystem>
+
 #include <gtest/gtest.h>
 #include <prime_server/http_protocol.hpp>
 #include <prime_server/prime_server.hpp>
@@ -125,8 +127,8 @@ TEST(Standalone, ElevationCompareToSkadi) {
     }
   }
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_landmarks.cc

@@ -248,8 +248,8 @@ TEST(LandmarkTest, TestBuildDatabase) {
 }
 
 TEST(LandmarkTest, TestParseLandmarks) {
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 
@@ -393,8 +393,8 @@ TEST(LandmarkTest, TestTileStoreLandmarks) {
 }
 
 TEST(LandmarkTest, TestAddLandmarksToTiles) {
-  if (!filesystem::exists(workdir_tiles)) {
-    bool created = filesystem::create_directories(workdir_tiles);
+  if (!std::filesystem::exists(workdir_tiles)) {
+    bool created = std::filesystem::create_directories(workdir_tiles);
     EXPECT_TRUE(created);
   }
 
@@ -429,8 +429,8 @@ TEST(LandmarkTest, TestAddLandmarksToTiles) {
 // hierarchy max level", and "Could not compute FileSuffix for GraphId with invalid tile
 // id:0/245760/0". We need to fix it in the future.
 TEST(LandmarkTest, DISABLED_ErrorTest) {
-  if (!filesystem::exists(workdir_tiles)) {
-    bool created = filesystem::create_directories(workdir_tiles);
+  if (!std::filesystem::exists(workdir_tiles)) {
+    bool created = std::filesystem::create_directories(workdir_tiles);
     EXPECT_TRUE(created);
   }
 
@@ -508,8 +508,8 @@ TEST(LandmarkTest, TestLandmarksInManeuvers) {
   const std::string db_path = workdir + "/landmarks.sqlite";
   const std::string pbf = workdir + "/map.pbf";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_route_summary.cc

@@ -1,4 +1,5 @@
 #include <cmath>
+#include <filesystem>
 #include <sstream>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -112,7 +113,7 @@ TEST(TestRouteSummary, GetSummary) {
   gurka::assert::osrm::expect_summaries(result, {expected_route_summary0, expected_route_summary1,
                                                  expected_route_summary2});
 
-  filesystem::remove_all(workdir);
+  std::filesystem::remove_all(workdir);
 }
 
 TEST(TestRouteSummary, DupSummaryFix) {
@@ -202,5 +203,5 @@ TEST(TestRouteSummary, DupSummaryFix) {
   const std::string expected_route_summary1 = "RT 1, RT 2, RT 4";
   gurka::assert::osrm::expect_summaries(result, {expected_route_summary0, expected_route_summary1});
 
-  filesystem::remove_all(workdir);
+  std::filesystem::remove_all(workdir);
 }

test/gurka/test_stop_signs.cc

@@ -1,3 +1,5 @@
+#include <filesystem>
+
 #include "gurka.h"
 #include "test/test.h"
 #include <gtest/gtest.h>
@@ -72,8 +74,8 @@ TEST(Standalone, StopSigns) {
 
   const std::string workdir = "test/data/gurka_stop_signs";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_traffic_signals.cc

@@ -1,3 +1,5 @@
+#include <filesystem>
+
 #include "gurka.h"
 #include "test/test.h"
 #include <gtest/gtest.h>
@@ -73,8 +75,8 @@ TEST(Standalone, TrafficSignals) {
 
   const std::string workdir = "test/data/gurka_traffic_signals";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }
 

test/gurka/test_yield_signs.cc

@@ -1,3 +1,5 @@
+#include <filesystem>
+
 #include "gurka.h"
 #include "test/test.h"
 #include <gtest/gtest.h>
@@ -72,8 +74,8 @@ TEST(Standalone, yieldSigns) {
 
   const std::string workdir = "test/data/gurka_yeild_signs";
 
-  if (!filesystem::exists(workdir)) {
-    bool created = filesystem::create_directories(workdir);
+  if (!std::filesystem::exists(workdir)) {
+    bool created = std::filesystem::create_directories(workdir);
     EXPECT_TRUE(created);
   }