Skip to content

chore: simplify rs/tests.hpp #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ken-matsui merged 3 commits into from
Nov 28, 2025
Merged

chore: simplify rs/tests.hpp #1256

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebc0cee
chore: simplify rs/tests.hpp
ken-matsui Nov 28, 2025
8b84766
fix: include <print>
ken-matsui Nov 28, 2025
6e9a0d4
fix: remove noexcept
ken-matsui Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 7 additions & 32 deletions rs-cpp/include/rs/tests.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <filesystem>
#include <fmt/core.h>
#include <fmt/std.h>
#include <print>
#include <source_location>
#include <stdexcept>
#include <string>
Expand Down Expand Up @@ -34,35 +36,8 @@ concept Lt = requires(T lhs, U rhs) {
{ lhs < rhs } -> std::convertible_to<bool>;
};

// Returns the module name from a file path. There are two cases:
//
// 1. src/Rustify/Tests.cc -> Rustify/Tests
// (when we run `make test` from the root directory)
// 2. ../../src/Rustify/Tests.cc -> Rustify/Tests
// (when we run `cabin test`)
//
// We first should remove `../../` if it exists, then remove the first
// directory name since it can be either `src` or `tests`. Finally, we remove
// the file extension, which is basically any of C++ source file extensions.
constexpr std::string_view getModName(std::string_view file) noexcept {
if (file.empty()) {
return file;
}

std::size_t start = file.find("src/");
if (start == std::string_view::npos) {
start = file.find("lib/");
}
if (start == std::string_view::npos) {
return file;
}

const std::size_t end = file.find_last_of('.');
if (end == std::string_view::npos || end <= start) {
return file;
}

return file.substr(start, end - start);
std::string getModName(std::string_view file) {
return std::filesystem::relative(file).replace_extension().string();
}

constexpr std::string_view prettifyFuncName(std::string_view func) noexcept {
Expand All @@ -84,14 +59,14 @@ constexpr std::string_view prettifyFuncName(std::string_view func) noexcept {
}

inline void pass(const std::source_location& loc =
std::source_location::current()) noexcept {
fmt::print(" test {}::{} ... {}ok{}\n", getModName(loc.file_name()),
std::source_location::current()) {
std::print(" test {}::{} ... {}ok{}\n", getModName(loc.file_name()),
prettifyFuncName(loc.function_name()), GREEN, RESET);
}

[[noreturn]] inline void error(const std::source_location& loc,
const std::string_view msg) {
fmt::print(stderr,
std::print(stderr,
"\n test {}::{} ... {}FAILED{}\n\n"
"'{}' failed at '{}', {}:{}\n",
getModName(loc.file_name()), prettifyFuncName(loc.function_name()),
Expand Down
Loading