diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-02-20 22:20:29 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:39 +0300 |
| commit | efac4023df5f9fb63374cfb78abc93b1f0f2f6bf (patch) | |
| tree | bfa1c9c4518234c7dbc5851c526cc698a7d88c8c /testing | |
| parent | 9114556ba72ae6e0a92097218fe24b2be984e238 (diff) | |
C++11 way for logging & macroses.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/testing.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testing/testing.hpp b/testing/testing.hpp index df678f7219..5f6b671d14 100644 --- a/testing/testing.hpp +++ b/testing/testing.hpp @@ -26,36 +26,36 @@ namespace my } #define TEST(X, msg) { if (X) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X")", ::my::impl::Message msg));}} + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X")", ::my::impl::Message msg));}} #define TEST_EQUAL(X, Y, msg) { if ((X) == (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" == "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" == "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_NOT_EQUAL(X, Y, msg) { if ((X) != (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" != "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" != "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_LESS(X, Y, msg) { if ((X) < (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" < "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" < "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_LESS_OR_EQUAL(X, Y, msg) { if ((X) <= (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" <= "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" <= "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_GREATER(X, Y, msg) { if ((X) > (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" > "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" > "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_GREATER_OR_EQUAL(X, Y, msg) { if ((X) >= (Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" >= "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" >= "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_ALMOST_EQUAL(X, Y, msg) { if (::my::AlmostEqual(X, Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST(my::AlmostEqual("#X", "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST(my::AlmostEqual("#X", "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} #define TEST_NOT_ALMOST_EQUAL(X, Y, msg) { if (!::my::AlmostEqual(X, Y)) {} else { \ - ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST(!my::AlmostEqual("#X", "#Y")", \ + ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST(!my::AlmostEqual("#X", "#Y")", \ ::my::impl::Message(X, Y), \ ::my::impl::Message msg));}} |