diff options
| author | myrrc <myrrc@yandex-team.ru> | 2022-02-10 16:50:05 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:50:05 +0300 |
| commit | 64407caacb4d68aeabc6afe1ddd28750bf7522f4 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/testing | |
| parent | 7a6e12b038f16b8bc4b7e77c2a2e08aa86ef7dc9 (diff) | |
| download | ydb-64407caacb4d68aeabc6afe1ddd28750bf7522f4.tar.gz | |
Restoring authorship annotation for <myrrc@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/testing')
| -rw-r--r-- | library/cpp/testing/unittest/registar.h | 34 | ||||
| -rw-r--r-- | library/cpp/testing/unittest/registar_ut.cpp | 26 |
2 files changed, 30 insertions, 30 deletions
diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h index 454e77a980..44517a0092 100644 --- a/library/cpp/testing/unittest/registar.h +++ b/library/cpp/testing/unittest/registar.h @@ -627,23 +627,23 @@ public: \ // Assert that a specific exception is thrown #define UNIT_ASSERT_EXCEPTION(A, E) UNIT_ASSERT_EXCEPTION_C(A, E, "") -#define UNIT_ASSERT_NO_EXCEPTION_RESULT_C(A, C) \ - [&] () mutable -> decltype(A) { \ - static_assert(!std::is_void_v<decltype(A)>); \ - try { return (A); } \ - catch (const ::NUnitTest::TAssertException&) { throw; } \ - catch (...) { \ - UNIT_FAIL_IMPL( \ - "exception-free assertion failed", \ - Sprintf("%s throws %s\nException message: %s", \ - #A, (::TStringBuilder() << C).data(), \ - CurrentExceptionMessage().data())); \ - return decltype(A){}; \ - } \ - }() - -#define UNIT_ASSERT_NO_EXCEPTION_RESULT(A) UNIT_ASSERT_NO_EXCEPTION_RESULT_C(A, "") - +#define UNIT_ASSERT_NO_EXCEPTION_RESULT_C(A, C) \ + [&] () mutable -> decltype(A) { \ + static_assert(!std::is_void_v<decltype(A)>); \ + try { return (A); } \ + catch (const ::NUnitTest::TAssertException&) { throw; } \ + catch (...) { \ + UNIT_FAIL_IMPL( \ + "exception-free assertion failed", \ + Sprintf("%s throws %s\nException message: %s", \ + #A, (::TStringBuilder() << C).data(), \ + CurrentExceptionMessage().data())); \ + return decltype(A){}; \ + } \ + }() + +#define UNIT_ASSERT_NO_EXCEPTION_RESULT(A) UNIT_ASSERT_NO_EXCEPTION_RESULT_C(A, "") + #define UNIT_ASSERT_NO_EXCEPTION_C(A, C) \ do { \ try { \ diff --git a/library/cpp/testing/unittest/registar_ut.cpp b/library/cpp/testing/unittest/registar_ut.cpp index bcab099997..1f36d53abb 100644 --- a/library/cpp/testing/unittest/registar_ut.cpp +++ b/library/cpp/testing/unittest/registar_ut.cpp @@ -275,22 +275,22 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) { } } - std::string ThrowStr() { - if (ThrowMe) { - throw *this; - } - - return {}; - } - + std::string ThrowStr() { + if (ThrowMe) { + throw *this; + } + + return {}; + } + void AssertNoException() { UNIT_ASSERT_NO_EXCEPTION(Throw()); } - void AssertNoExceptionRet() { - const TString res = UNIT_ASSERT_NO_EXCEPTION_RESULT(ThrowStr()); - } - + void AssertNoExceptionRet() { + const TString res = UNIT_ASSERT_NO_EXCEPTION_RESULT(ThrowStr()); + } + template <class TExpectedException> void AssertException() { UNIT_ASSERT_EXCEPTION(Throw(), TExpectedException); @@ -345,7 +345,7 @@ Y_UNIT_TEST_SUITE(TUnitTestMacroTest) { Y_UNIT_TEST(NoException) { UNIT_ASSERT_TEST_FAILS(TTestException().AssertNoException()); - UNIT_ASSERT_TEST_FAILS(TTestException().AssertNoExceptionRet()); + UNIT_ASSERT_TEST_FAILS(TTestException().AssertNoExceptionRet()); UNIT_ASSERT_NO_EXCEPTION(TTestException("", false).Throw()); } |