OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

move test module to the beginning of the file

master
Daniel Kolesa 2017-04-27 19:06:57 +02:00
parent 37def859e5
commit 69890906fd
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ostd/range.hh
View File

@ -49,6 +49,8 @@
#include <algorithm>
#include <optional>
#define OSTD_TEST_MODULE libostd_range
namespace ostd {
/** @addtogroup Ranges
@ -1330,7 +1332,7 @@ inline auto range(T v) {
return detail::number_range<T>(v);
}
OSTD_UNIT_TEST(range, {
OSTD_UNIT_TEST({
auto r = range(5, 10, 2);
fail_if(r.empty() || (r.front() != 5));
r.pop_front();
@ -1984,6 +1986,8 @@ namespace detail {
} /* namespace ostd */
#undef OSTD_TEST_MODULE
#endif
/** @} */

27
ostd/unit_test.hh
View File

@ -43,13 +43,13 @@ namespace test {
#define OSTD_TEST_MODULE_STRINGIFY(x) #x
#define OSTD_TEST_MODULE_STR(x) OSTD_TEST_MODULE_STRINGIFY(x)
#define OSTD_TEST_MODULE OSTD_TEST_MODULE_STR(OSTD_BUILD_TESTS)
#define OSTD_TEST_MODULE_CURRENT OSTD_TEST_MODULE_STR(OSTD_BUILD_TESTS)
namespace detail {
static std::vector<void (*)()> test_cases;
static bool add_test(std::string testn, void (*func)()) {
if (testn == OSTD_TEST_MODULE) {
if (testn == OSTD_TEST_MODULE_CURRENT) {
test_cases.push_back(func);
}
return true;
@ -59,20 +59,21 @@ namespace detail {
}
/** @brief Defines a unit test.
*
* The first argument is the name of a module this individual test will
* belong to. The second argument is the actual body of the test.
*
* The test is only enabled if the module name matches the value of the
* `OSTD_BUILD_TESTS` macro, defined before inclusion of this header. The
* macro also has to be defined for this to be available at all.
* macro also has to be defined for this to be available at all. The module
* name is defined using the `OSTD_TEST_MODULE` macro, which should be defined
* after including any headers and undefined at the end of the file.
*/
#define OSTD_UNIT_TEST(module, body) \
static bool test_case_##module##_##__LINE__ = \
ostd::test::detail::add_test(#module, []() { \
using namespace ostd::test; \
body \
});
#define OSTD_UNIT_TEST(body) \
static bool test_case_##OSTD_TEST_MODULE##_##__LINE__ = \
ostd::test::detail::add_test(
OSTD_TEST_MODULE_STR(OSTD_TEST_MODULE), []() { \
using namespace ostd::test; \
body \
} \
);
/** @brief Makes the test fail if the given value is true.
*
@ -134,7 +135,7 @@ std::pair<std::size_t, std::size_t> run() {
#else /* OSTD_BUILD_TESTS */
#define OSTD_UNIT_TEST(module, body)
#define OSTD_UNIT_TEST(body)
#endif /* OSTD_BUILD_TESTS */

2
test_runner.cc
View File

@ -33,7 +33,7 @@ constexpr auto COLOR_END = "";
static void write_test_src(file_stream &s, string_range modname) {
s.writefln(
"#define OSTD_BUILD_TESTS %s\n"
"#define OSTD_BUILD_TESTS libostd_%s\n"
"\n"
"#include <ostd/unit_test.hh>\n"
"#include <ostd/%s.hh>\n"