Move Cache to from namespace utils to io.

Author: daniel-zint

src/wmtk/io/Cache.cpp

@@ -28,7 +28,7 @@ std::string number_to_hex(long long l)
     return fmt::format("{0:x}", l);
 }
 
-namespace wmtk::utils {
+namespace wmtk::io {
 
 std::filesystem::path Cache::create_unique_directory(
     const std::string& prefix,
@@ -228,4 +228,4 @@ bool Cache::import_cache(const std::filesystem::path& import_location)
     return true;
 }
 
-} // namespace wmtk::utils
+} // namespace wmtk::io

src/wmtk/io/Cache.hpp

@@ -4,7 +4,7 @@
 #include <map>
 #include <wmtk/Mesh.hpp>
 
-namespace wmtk::utils {
+namespace wmtk::io {
 
 
 class Cache
@@ -124,4 +124,4 @@ class Cache
     inline static const std::string m_cache_content_name =
         "cache_contents"; // name of the json file used for import/export
 };
-} // namespace wmtk::utils
+} // namespace wmtk::io

tests/test_io.cpp

@@ -1,10 +1,10 @@
 #include <wmtk/Mesh.hpp>
 #include <wmtk/TetMesh.hpp>
 #include <wmtk/TriMesh.hpp>
+#include <wmtk/io/Cache.hpp>
 #include <wmtk/io/HDF5Writer.hpp>
 #include <wmtk/io/MeshReader.hpp>
 #include <wmtk/io/ParaviewWriter.hpp>
-#include <wmtk/io/Cache.hpp>
 #include <wmtk/utils/mesh_utils.hpp>
 
 #include <wmtk/operations/OperationFactory.hpp>
@@ -156,14 +156,14 @@ TEST_CASE("attribute_after_split", "[io]")
     m.serialize(writer);
 }
 
-TEST_CASE("cache_init", "[cache]")
+TEST_CASE("cache_init", "[cache][io]")
 {
     const fs::path dir = std::filesystem::current_path();
     const std::string prefix = "wmtk_cache";
 
     fs::path cache_dir;
     {
-        utils::Cache cache(prefix, dir);
+        io::Cache cache(prefix, dir);
         cache_dir = cache.get_cache_path();
 
         CHECK(fs::exists(cache_dir));
@@ -174,12 +174,12 @@ TEST_CASE("cache_init", "[cache]")
     CHECK_FALSE(fs::exists(cache_dir));
 }
 
-TEST_CASE("cache_files", "[cache]")
+TEST_CASE("cache_files", "[cache][io]")
 {
     fs::path filepath;
     std::string file_name = "my_new_file";
     {
-        utils::Cache cache("wmtk_cache", fs::current_path());
+        io::Cache cache("wmtk_cache", fs::current_path());
 
         filepath = cache.create_unique_file(file_name, ".txt");
 
@@ -194,9 +194,9 @@ TEST_CASE("cache_files", "[cache]")
     CHECK_FALSE(fs::exists(filepath));
 }
 
-TEST_CASE("cache_read_write_mesh", "[cache]")
+TEST_CASE("cache_read_write_mesh", "[cache][io]")
 {
-    utils::Cache cache("wmtk_cache", fs::current_path());
+    io::Cache cache("wmtk_cache", fs::current_path());
     TriMesh mesh = tests::single_triangle();
 
     const std::string name = "cached_mesh";
@@ -208,17 +208,17 @@ TEST_CASE("cache_read_write_mesh", "[cache]")
     CHECK_THROWS(cache.read_mesh("some_file_that_does_not_exist"));
 }
 
-TEST_CASE("cache_export_import", "[cache]")
+TEST_CASE("cache_export_import", "[cache][io]")
 {
     const fs::path export_location =
-        utils::Cache::create_unique_directory("wmtk_cache_export", fs::current_path());
+        io::Cache::create_unique_directory("wmtk_cache_export", fs::current_path());
 
     const std::vector<std::string> file_names = {"a", "b", "c"};
 
     // create cache
     fs::path first_cache_path;
     {
-        utils::Cache cache("wmtk_cache", fs::current_path());
+        io::Cache cache("wmtk_cache", fs::current_path());
         // generate some files
         for (const std::string& name : file_names) {
             const fs::path p = cache.create_unique_file(name, ".txt");
@@ -239,7 +239,7 @@ TEST_CASE("cache_export_import", "[cache]")
 
     // create new cache
     {
-        utils::Cache cache("wmtk_cache", fs::current_path());
+        io::Cache cache("wmtk_cache", fs::current_path());
         // import the previously exported
         CHECK(cache.import_cache(export_location));
 
@@ -254,7 +254,7 @@ TEST_CASE("cache_export_import", "[cache]")
 
     // try to import even though the cache contains a file
     {
-        utils::Cache cache("wmtk_cache", fs::current_path());
+        io::Cache cache("wmtk_cache", fs::current_path());
         cache.create_unique_file("some_file", "");
         // import should not work if the cache already contains files
         CHECK_FALSE(cache.import_cache(export_location));