3131
3232#include " Tests.hpp"
3333
34- #if TGUI_COMPILED_WITH_CPP_VER >= 17
3534using namespace std ::literals::string_view_literals;
36- #else
37- using namespace tgui ::literals::string_view_literals;
38- #endif
3935
4036TEST_CASE (" [String]" )
4137{
@@ -46,26 +42,15 @@ TEST_CASE("[String]")
4642 const std::u16string u16s (u" \u03b1\u03b2\u03b3\u03b4\u03b5 " );
4743 const std::u32string u32s (U" \u03b1\u03b2\u03b3\u03b4\u03b5 " );
4844
49- #if TGUI_COMPILED_WITH_CPP_VER >= 17
5045 const std::string_view view_s (s);
5146 const std::wstring_view view_ws (ws);
5247 const std::u16string_view view_u16s (u16s);
5348 const std::u32string_view view_u32s (u32s);
54- #else
55- const tgui::CharStringView view_s (s);
56- const tgui::StringViewImpl<wchar_t > view_ws (ws);
57- const tgui::StringViewImpl<char16_t > view_u16s (u16s);
58- const tgui::StringView view_u32s (u32s);
59- #endif
6049
6150#if defined(__cpp_lib_char8_t) && (__cpp_lib_char8_t >= 201811L)
6251 std::u8string u8s (u8" \u03b1\u03b2\u03b3\u03b4\u03b5 " );
6352
64- #if TGUI_COMPILED_WITH_CPP_VER >= 17
6553 std::u8string_view view_u8s (u8s);
66- #else
67- tgui::StringViewImpl<char8_t > view_u8s (u8s);
68- #endif
6954#endif
7055
7156 SECTION (" Constructor" )
@@ -144,15 +129,10 @@ TEST_CASE("[String]")
144129 REQUIRE (tgui::String (std::u8string (u8" \u03b1\u03b2\u03b3\u03b4\u03b5 " ), 2 , 6 ) == u8" \u03b2\u03b3\u03b4 " );
145130 REQUIRE (tgui::String (u8s.cbegin (), u8s.cend ()) == u8" \u03b1\u03b2\u03b3\u03b4\u03b5 " );
146131 REQUIRE (tgui::String (3 , u8 ' x' ) == " xxx" );
147-
148- #if TGUI_COMPILED_WITH_CPP_VER >= 17
149132 REQUIRE (tgui::String (u8" \U00010348 " sv) == u8" \U00010348 " );
150133 REQUIRE (tgui::String (u8" \u03b1\u03b2\u03b3\u03b4\u03b5 " sv, 2 , 6 ) == u8" \u03b2\u03b3\u03b4 " );
151- #endif
152-
153134 REQUIRE (tgui::String (view_u8s) == U" \u03b1\u03b2\u03b3\u03b4\u03b5 " );
154135#endif
155-
156136 REQUIRE (tgui::String (15 ) == " 15" );
157137 REQUIRE (tgui::String (-3 ) == " -3" );
158138 REQUIRE (tgui::String (0.5 ) == " 0.5" );
0 commit comments