diff options
Diffstat (limited to 'util/generic')
-rw-r--r-- | util/generic/strbuf_ut.cpp | 46 | ||||
-rw-r--r-- | util/generic/string_ut.cpp | 36 |
2 files changed, 41 insertions, 41 deletions
diff --git a/util/generic/strbuf_ut.cpp b/util/generic/strbuf_ut.cpp index 69cde785af..65f431d1a3 100644 --- a/util/generic/strbuf_ut.cpp +++ b/util/generic/strbuf_ut.cpp @@ -347,27 +347,27 @@ Y_UNIT_TEST_SUITE(TStrBufTest) { UNIT_ASSERT_STRINGS_EQUAL(s, ""); } } - -Y_UNIT_TEST_SUITE(TWtrBufTest) { - Y_UNIT_TEST(TestConstExpr) { - static constexpr TWtringBuf str1(u"qwe\0rty", 7); - static constexpr TWtringBuf str2(str1.data(), str1.size()); + +Y_UNIT_TEST_SUITE(TWtrBufTest) { + Y_UNIT_TEST(TestConstExpr) { + static constexpr TWtringBuf str1(u"qwe\0rty", 7); + static constexpr TWtringBuf str2(str1.data(), str1.size()); static constexpr TWtringBuf str3 = u"qwe\0rty"sv; - - UNIT_ASSERT_VALUES_EQUAL(str1.size(), 7); - - UNIT_ASSERT_VALUES_EQUAL(str1, str2); - UNIT_ASSERT_VALUES_EQUAL(str2, str3); - UNIT_ASSERT_VALUES_EQUAL(str1, str3); - - static constexpr std::u16string_view view1(str1); - UNIT_ASSERT_VALUES_EQUAL(str1, view1); - static_assert(str1.data() == view1.data()); - static_assert(str1.size() == view1.size()); - - static constexpr TWtringBuf str4(view1); - UNIT_ASSERT_VALUES_EQUAL(str1, str4); - static_assert(str1.data() == str4.data()); - static_assert(str1.size() == str4.size()); - } -} + + UNIT_ASSERT_VALUES_EQUAL(str1.size(), 7); + + UNIT_ASSERT_VALUES_EQUAL(str1, str2); + UNIT_ASSERT_VALUES_EQUAL(str2, str3); + UNIT_ASSERT_VALUES_EQUAL(str1, str3); + + static constexpr std::u16string_view view1(str1); + UNIT_ASSERT_VALUES_EQUAL(str1, view1); + static_assert(str1.data() == view1.data()); + static_assert(str1.size() == view1.size()); + + static constexpr TWtringBuf str4(view1); + UNIT_ASSERT_VALUES_EQUAL(str1, str4); + static_assert(str1.data() == str4.data()); + static_assert(str1.size() == str4.size()); + } +} diff --git a/util/generic/string_ut.cpp b/util/generic/string_ut.cpp index ac82e9091d..61855f9b0b 100644 --- a/util/generic/string_ut.cpp +++ b/util/generic/string_ut.cpp @@ -811,7 +811,7 @@ public: UNIT_TEST(TestDecodingMethods); UNIT_TEST(TestIterators); UNIT_TEST(TestReverseIterators); - UNIT_TEST(TestStringLiterals); + UNIT_TEST(TestStringLiterals); UNIT_TEST_SUITE_END(); private: @@ -895,14 +895,14 @@ private: str = hello; UNIT_ASSERT(str == hello); } - - void TestStringLiterals() { - TUtf16String s1 = u"hello"; - UNIT_ASSERT_VALUES_EQUAL(s1, TUtf16String::FromAscii("hello")); - - TUtf16String s2 = u"привет"; - UNIT_ASSERT_VALUES_EQUAL(s2, TUtf16String::FromUtf8("привет")); - } + + void TestStringLiterals() { + TUtf16String s1 = u"hello"; + UNIT_ASSERT_VALUES_EQUAL(s1, TUtf16String::FromAscii("hello")); + + TUtf16String s2 = u"привет"; + UNIT_ASSERT_VALUES_EQUAL(s2, TUtf16String::FromUtf8("привет")); + } }; UNIT_TEST_SUITE_REGISTRATION(TWideStringTest); @@ -936,7 +936,7 @@ public: UNIT_TEST(TestDecodingMethodsMixedStr); UNIT_TEST(TestIterators); UNIT_TEST(TestReverseIterators); - UNIT_TEST(TestStringLiterals); + UNIT_TEST(TestStringLiterals); UNIT_TEST_SUITE_END(); private: @@ -1093,14 +1093,14 @@ private: str = hello; UNIT_ASSERT(str == hello); } - - void TestStringLiterals() { - TUtf32String s1 = U"hello"; - UNIT_ASSERT_VALUES_EQUAL(s1, TUtf32String::FromAscii("hello")); - - TUtf32String s2 = U"привет"; - UNIT_ASSERT_VALUES_EQUAL(s2, TUtf32String::FromUtf8("привет")); - } + + void TestStringLiterals() { + TUtf32String s1 = U"hello"; + UNIT_ASSERT_VALUES_EQUAL(s1, TUtf32String::FromAscii("hello")); + + TUtf32String s2 = U"привет"; + UNIT_ASSERT_VALUES_EQUAL(s2, TUtf32String::FromUtf8("привет")); + } }; UNIT_TEST_SUITE_REGISTRATION(TUtf32StringTest); |