From 690aa93af956a60fa4bdfb759454fe5dc086b5e7 Mon Sep 17 00:00:00 2001 From: cyborg1811m Date: Mon, 22 Apr 2024 11:51:35 +0200 Subject: [PATCH] updated test output --- test/common_helper/test_define_test.hpp | 19 +++++++------------ test/common_helper/test_ret_val.h | 11 +++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/test/common_helper/test_define_test.hpp b/test/common_helper/test_define_test.hpp index 2fde5d4..9c3ecf5 100644 --- a/test/common_helper/test_define_test.hpp +++ b/test/common_helper/test_define_test.hpp @@ -72,36 +72,31 @@ class test_suite { auto test_arr = expand_test_tuple(_tests, std::make_index_sequence()); - std::cout << test_arr.size() << "\n"; - std::cout << "--------------\n"; for (auto [i, test_ref] : std::ranges::views::enumerate(test_arr)) { const auto& test = test_ref.get(); - std::cout << "Running Test: \"" << test.name() << "\"\n"; + std::cout << "Running Test: \"" << test.name() << "\" " + "(Test " << i+1 << "/" << test_arr.size() << ")\n"; if (test.evalFlag() == EvalFlag::RUNTIME || test.evalFlag() == EvalFlag::RUNTIME_CONSTEVAL) { ret_val_s ret; std::string ret_exc_str; try { ret = test.evaluate(); } catch (std::exception& e) { - ret_exc_str = e.what(); + ret_exc_str = std::string("Test failed with Exception: \"") + e.what() + "\""; ret = ret_val_s(test.name(), ReturnCode::FAILED, ret_exc_str.c_str()); } - std::cout << "Result of Runtime Evaluation of Test \"" << ret.test_name << "\" (number: " << i - << "): " - << (ret.val == ReturnCode::PASSED ? "PASSED" : "FAILED") << "\n" - << "\t" << ret.msg << "\n"; + std::cout << "Result of Runtime Evaluation of Test \"" << ret.test_name << "\": " << ret.val << "\n" + << "\t" << ret.msg << std::endl; } if (test.evalFlag() == EvalFlag::CONSTEVAL || test.evalFlag() == EvalFlag::RUNTIME_CONSTEVAL) { const ret_val_s& ret = test.c_res(); - std::cout << "Result of Consteval Evaluation of Test \"" << ret.test_name << "\" (number: " << i - << "): " - << (ret.val == ReturnCode::PASSED ? "PASSED" : "FAILED") << "\n" - << "\t" << ret.msg << "\n"; + std::cout << "Result of Consteval Evaluation of Test \"" << ret.test_name << "\": " << ret.val << "\n" + << "\t" << ret.msg << std::endl; } } diff --git a/test/common_helper/test_ret_val.h b/test/common_helper/test_ret_val.h index 97dc71f..b315bf6 100644 --- a/test/common_helper/test_ret_val.h +++ b/test/common_helper/test_ret_val.h @@ -28,4 +28,15 @@ struct ret_val { constexpr inline const ret_val_s& operator[](std::size_t i) const { return vals[i]; } }; +std::ostream& operator<<(std::ostream& os, const ReturnCode &rc) { + switch (rc) { + case FAILED: + return os << "FAILED"; + case PASSED: + return os << "PASSED"; + default: + return os; + } +} + #endif //CONST_CONTAINER_TEST_RETURN_VAL_H_