From 0bbbbfc78beb2393ceea0de0fa85942f71d0a2ed Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 10 Dec 2024 16:48:48 +0100 Subject: [PATCH] tst_QAnyStringView: complete Char[] CanConvert sets Other view tests test Char[N] and const Char[N] separately. Do the same here. For many Char types, the array CanConvert test was missing completely. Add them. Pick-to: 6.9 6.8 6.5 Change-Id: I1d0b6de394d548554a547f190e74cb8cead6ecd4 Reviewed-by: Ivan Solovev --- .../text/qanystringview/tst_qanystringview.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp index f6f57081906..cd9ce8caec9 100644 --- a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp +++ b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp @@ -83,6 +83,7 @@ static_assert(!CanConvert>); static_assert(CanConvert); static_assert(CanConvert); +static_assert(CanConvert); static_assert(CanConvert< QString >); static_assert(CanConvert); @@ -96,6 +97,7 @@ static_assert(CanConvert); static_assert(CanConvert); static_assert(CanConvert); +static_assert(CanConvert); static_assert(CanConvert< ushort*>); static_assert(CanConvert); @@ -115,6 +117,9 @@ static_assert(!CanConvert>); static_assert(CanConvert); +static_assert(CanConvert< char8_t[123]>); +static_assert(CanConvert); + static_assert(CanConvert< char8_t*>); static_assert(CanConvert); @@ -147,6 +152,9 @@ static_assert(!CanConvert>); static_assert(CanConvert); +static_assert(CanConvert< char16_t[123]>); +static_assert(CanConvert); + static_assert(CanConvert< char16_t*>); static_assert(CanConvert); @@ -177,6 +185,9 @@ static_assert(CanConvert); static_assert(CanConvert); // ... except here +static_assert(!CanConvert< char32_t[123]>); +static_assert(!CanConvert); + static_assert(!CanConvert< char32_t*>); static_assert(!CanConvert); @@ -211,6 +222,9 @@ constexpr bool CanConvertFromWCharT = static_assert(CanConvert == CanConvertFromWCharT); // ### FIXME: should work everywhere +static_assert(CanConvert< wchar_t[123]> == CanConvertFromWCharT); +static_assert(CanConvert == CanConvertFromWCharT); + static_assert(CanConvert< wchar_t*> == CanConvertFromWCharT); static_assert(CanConvert == CanConvertFromWCharT);