Improve UI tests (#602)

poac-dev · May 28, 2022 · 4eff87f · 4eff87f
1 parent 7734213
commit 4eff87f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/tests/ui/fmt/empty-name.cc b/tests/ui/fmt/empty-name.cc
@@ -23,6 +23,6 @@ main() {
     ofs << "[package]\n"
            "name = \"\""; // empty name
     ofs.close();
-    uitest<Target::Stdout>(__FILE__, {"fmt"}, temp_dir);
+    uitest<Target::Stdout>({"fmt"}, temp_dir);
   };
 }
diff --git a/tests/ui/fmt/invalid-manifest.cc b/tests/ui/fmt/invalid-manifest.cc
@@ -22,6 +22,6 @@ main() {
     std::ofstream ofs(temp_dir / "poac.toml");
     ofs << "[package]";
     ofs.close();
-    uitest<Target::Stderr>(__FILE__, {"fmt"}, temp_dir);
+    uitest<Target::Stderr>({"fmt"}, temp_dir);
   };
 }
diff --git a/tests/ui/fmt/no-clang-format.cc b/tests/ui/fmt/no-clang-format.cc
@@ -14,7 +14,6 @@ main() {
     cfg<override> = {.tag = {"no-cf"}};
   }
 
-  tag("no-cf") / "no clang-format"_test = [] {
-    uitest<Target::Stderr>(__FILE__, {"fmt"});
-  };
+  tag("no-cf") /
+      "no clang-format"_test = [] { uitest<Target::Stderr>({"fmt"}); };
 }
diff --git a/tests/ui/fmt/no-manifest.cc b/tests/ui/fmt/no-manifest.cc
@@ -14,6 +14,5 @@ main() {
     cfg<override> = {.tag = {"has-cf"}};
   }
 
-  tag("has-cf") /
-      "no manifest"_test = [] { uitest<Target::Stderr>(__FILE__, {"fmt"}); };
+  tag("has-cf") / "no manifest"_test = [] { uitest<Target::Stderr>({"fmt"}); };
 }
diff --git a/tests/ui/fmt/no-targets.cc b/tests/ui/fmt/no-targets.cc
@@ -23,6 +23,6 @@ main() {
     ofs << "[package]\n"
            "name = \"test\"";
     ofs.close();
-    uitest<Target::Stdout>(__FILE__, {"fmt"}, temp_dir);
+    uitest<Target::Stdout>({"fmt"}, temp_dir);
   };
 }
diff --git a/tests/ui/util/ui_test_util.hpp b/tests/ui/util/ui_test_util.hpp
@@ -11,6 +11,10 @@
 #include <string>
 #include <string_view>
 
+#if defined(__cpp_lib_source_location)
+#  include <source_location>
+#endif
+
 // external
 #include <boost/ut.hpp>
 
@@ -109,8 +113,13 @@ readfile(std::string_view name) {
 template <Target target>
 void
 uitest(
-    std::string_view name, std::initializer_list<std::string_view> args,
-    const fs::path& temp_dir = get_temp_dir()
+    std::initializer_list<std::string_view> args,
+    const fs::path& temp_dir = get_temp_dir(),
+#if defined(__cpp_lib_source_location)
+    std::string name = std::source_location::current().file_name()
+#else
+    std::string_view name = __builtin_FILE()
+#endif
 ) {
   const auto result = dispatch<target>(args, temp_dir);
   if (target == Target::Stdout) {
@@ -123,9 +132,4 @@ uitest(
 
 } // namespace poac::test
 
-#define POAC_UITEST_STDOUT(...) \
-  poac::test::uitest<poac::test::Target::Stdout>(__FILE__, {__VA_ARGS__})
-#define POAC_UITEST_STDERR(...) \
-  poac::test::uitest<poac::test::Target::Stderr>(__FILE__, {__VA_ARGS__})
-
 #endif // TESTS_UI_UTIL_UI_TEST_UTIL_HPP_