diff options
author | gleb-kov <gleb-kov@yandex-team.ru> | 2022-02-16 20:08:53 +0300 |
---|---|---|
committer | gleb-kov <gleb-kov@yandex-team.ru> | 2022-02-16 20:08:53 +0300 |
commit | 76cbe125b7d39dca64a0de7b86eee37fd575e4df (patch) | |
tree | 07e37c2710f2e28d0703b034d5055410a8cef162 /util/generic | |
parent | ba7bb8654688e77fb83af2e6f9e82ef5ea10dfc5 (diff) | |
download | ydb-76cbe125b7d39dca64a0de7b86eee37fd575e4df.tar.gz |
util unittests: replace try-catch-UNIT_ASSERT via UNIT_ASSERT_EXCEPTION
ref:f59ddae7dbb42f5fa999e6071769f709e8b80b85
Diffstat (limited to 'util/generic')
-rw-r--r-- | util/generic/deque_ut.cpp | 10 | ||||
-rw-r--r-- | util/generic/string_ut.cpp | 32 | ||||
-rw-r--r-- | util/generic/vector_ut.cpp | 11 |
3 files changed, 5 insertions, 48 deletions
diff --git a/util/generic/deque_ut.cpp b/util/generic/deque_ut.cpp index 93bf50fa92..38c421c7c7 100644 --- a/util/generic/deque_ut.cpp +++ b/util/generic/deque_ut.cpp @@ -184,15 +184,7 @@ void TDequeTest::TestAt() { UNIT_ASSERT(d.at(0) == 10); d.at(0) = 20; UNIT_ASSERT(cd.at(0) == 20); - - for (;;) { - try { - d.at(1) = 20; - UNIT_ASSERT(false); - } catch (...) { - return; - } - } + UNIT_ASSERT_EXCEPTION(d.at(1) = 20, std::out_of_range); } void TDequeTest::TestAutoRef() { diff --git a/util/generic/string_ut.cpp b/util/generic/string_ut.cpp index ac82e9091d..ca7b673fdb 100644 --- a/util/generic/string_ut.cpp +++ b/util/generic/string_ut.cpp @@ -78,31 +78,13 @@ class TStringStdTestImpl { protected: void Constructor() { - // @todo use UNIT_TEST_EXCEPTION - try { - TStringType s((size_t)-1, *Data_.a()); - UNIT_ASSERT(false); - } catch (const std::length_error&) { - UNIT_ASSERT(true); - } catch (...) { - //Expected exception is length_error: - UNIT_ASSERT(false); - } + UNIT_ASSERT_EXCEPTION(TStringType((size_t)-1, *Data_.a()), std::length_error); } void reserve() { #if 0 TStringType s; - // @todo use UNIT_TEST_EXCEPTION - try { - s.reserve(s.max_size() + 1); - UNIT_ASSERT(false); - } catch (const std::length_error&) { - UNIT_ASSERT(true); - } catch (...) { - //Expected exception is length_error: - UNIT_ASSERT(false); - } + UNIT_ASSERT_EXCEPTION(s.reserve(s.max_size() + 1), std::length_error); // Non-shared behaviour - never shrink @@ -526,15 +508,7 @@ protected: UNIT_ASSERT(dest[pos++] == *Data_.o()); UNIT_ASSERT(dest[pos++] == 1); - // @todo use UNIT_TEST_EXCEPTION - try { - s.copy(dest, 4, 5); - UNIT_ASSERT(!"expected std::out_of_range"); - } catch (const std::out_of_range&) { - UNIT_ASSERT(true); - } catch (...) { - UNIT_ASSERT(!"expected std::out_of_range"); - } + UNIT_ASSERT_EXCEPTION(s.copy(dest, 4, 5), std::out_of_range); } void cbegin_cend() { diff --git a/util/generic/vector_ut.cpp b/util/generic/vector_ut.cpp index 0f6b4037a0..4a9d286572 100644 --- a/util/generic/vector_ut.cpp +++ b/util/generic/vector_ut.cpp @@ -334,16 +334,7 @@ private: v.at(0) = 20; UNIT_ASSERT(cv.at(0) == 20); - for (;;) { - try { - v.at(1) = 20; - UNIT_ASSERT(false); - } catch (std::out_of_range const&) { - return; - } catch (...) { - UNIT_ASSERT(false); - } - } + UNIT_ASSERT_EXCEPTION(v.at(1) = 20, std::out_of_range); } void TestPointer() { |