Refactor unit test temp file helper

timower · May 31, 2024 · fc4303e · fc4303e
1 parent d13854e
commit fc4303e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/test/unit/TempFiles.h b/test/unit/TempFiles.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <catch2/catch_test_macros.hpp>
+
+#include <filesystem>
+
+class TemporaryDirectory {
+public:
+  TemporaryDirectory() : dir("/tmp/unit-tests") {
+    REQUIRE_NOTHROW(std::filesystem::create_directory(dir));
+  }
+  TemporaryDirectory(const TemporaryDirectory&) = delete;
+  TemporaryDirectory(TemporaryDirectory&&) = default;
+  TemporaryDirectory& operator=(const TemporaryDirectory&) = delete;
+  TemporaryDirectory& operator=(TemporaryDirectory&&) = default;
+
+  ~TemporaryDirectory() {
+    if (!dir.empty() && std::filesystem::is_directory(dir)) {
+      REQUIRE_NOTHROW(std::filesystem::remove_all(dir));
+    }
+  }
+
+  std::filesystem::path dir;
+};
diff --git a/test/unit/TestTilem.cpp b/test/unit/TestTilem.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
 
+#include "TempFiles.h"
 #include "rMLibTestHelper.h"
 
 #include "Calculator.h"
@@ -11,24 +12,9 @@
 using namespace rmlib;
 using namespace tilem;
 
-class TemporaryDirectory {
-public:
-  TemporaryDirectory() : dir("/tmp/tilem") {
-    REQUIRE_NOTHROW(std::filesystem::create_directory(dir));
-  }
-
-  ~TemporaryDirectory() {
-    if (!dir.empty() && std::filesystem::is_directory(dir)) {
-      REQUIRE_NOTHROW(std::filesystem::remove_all(dir));
-    }
-  }
-
-  std::string dir;
-};
-
 TEST_CASE("Tilem", "[tilem][ui]") {
   TemporaryDirectory tmp;
-  const auto romPath = tmp.dir + "/unit_test.rom";
+  const auto romPath = tmp.dir / "unit_test.rom";
 
   auto ctx = TestContext::make();
 
@@ -54,7 +40,8 @@ TEST_CASE("Tilem", "[tilem][ui]") {
 
     // Wait for the download to finish.
     ctx.pump();
-    while (!ctx.findByText("Downloading ROM '" + romPath + "' ...").empty()) {
+    while (!ctx.findByText("Downloading ROM '" + romPath.string() + "' ...")
+              .empty()) {
       ctx.pump();
     }
     ctx.pump(std::chrono::milliseconds(500));

diff --git a/test/unit/assets/tilem-error.png b/test/unit/assets/tilem-error.png