summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text/qstring
Commit message (Collapse)AuthorAgeFilesLines
* QString: ensure multi-arg arg() parses replacement like single-arg arg()Thiago Macieira2024-04-211-3/+9
| | | | | | | | | | | | | | | | | | | There was a discrepancy that the multi-arg arg() overload would accept any number of digits in the placeholder, resolving up to value 999 (e.g., %000001 was interpreted as placeholder #1), but the single-arg arg() overload only supported exactly one or two digits. The single-arg behavior was documented, so use it. [ChangeLog][Important Behavior Changes] The QString::arg() overload taking multiple QString-like arguments is now fixed to interpret placeholders like the other arg() overloads: it will find at most two digits after the '%' character. That is, the sequence "%123" is now interpreted as placeholder #12 followed by character '3' (verbatim). Pick-to: 6.7 Fixes: QTBUG-118581 Change-Id: I455fe22ef4ad4b2f9b01fffd17c767a948d41138 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* QString: use comparison helper macros - missing string views [3/3]Ivan Solovev2024-03-021-0/+19
| | | | | | | | | | | | | | | | | | | | | The comparison with QStringView works as is, there is no need to add explicit operators. Add the missing relational operators with QUtf8StringView. Once it is added, comparison of QString with u8"string literal" becomes ambiguous, so explicitly add operators for `const char8_t*` as well. This also makes the comparison with u8 string literals faster, because it now uses a view instead of constructing a QString. Adding QUtf8StringView overloads also makes comparison with `const char *` ambiguous if QT_RESTRICTED_CAST_FROM_ASCII is defined. To fix that, mark the overload as Q_WEAK_OVERLOAD. Luckily, we can just use the third Attributes parameter of the macro for that. Provide more unit-tests to cover the new relational operators. Task-number: QTBUG-117661 Change-Id: I60d1f4ad7ea607472deeb5c250e62f2bb7019268 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: use comparison helper macros - comparison with byte arrays [2/3]Ivan Solovev2024-03-021-0/+16
| | | | | | | | | | | | | | | | | | Use the comparison helper macros to replace the member relational operators for comparison with QByteArray and const char *. As QString and QByteArray are exported, we cannot simply remove the inline methods, so wrap them into QT_CORE_REMOVED_SINCE. Add relational operators with QByteArrayView. Provide more unit-tests for the comparison with the byte array types. This enables operator<=> for QString vs byte arrays in C++20 builds. Task-number: QTBUG-117661 Change-Id: I305343e1b6c5d78b10f2976573db4e904ba6b44b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: use comparison helper macros - trivial changes [1/3]Ivan Solovev2024-03-022-0/+52
| | | | | | | | | | | | | Replace the hidden friend relational operators with hidden friend helper functions and comparison helper macros. Provide more unit-tests for the updated types. This enables operator<=> in C++20 builds. Task-number: QTBUG-117661 Change-Id: I17329cd6422f272a435fc1da241203581eef7fbb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString/QByteArray: add slice() methodsAhmad Samir2024-02-291-0/+24
| | | | | | | | | [ChangeLog][QtCore][QString/QByteArray] Added slice() methods that work like sliced(), but modify the string/byte-array they are called on. Task-number: QTBUG-99218 Change-Id: I3075562983ef123d9aa022a2304c7e774cf2ea42 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix conversion warnings in tst_qstringIsak Fyksen2024-02-271-3/+3
| | | | | | | | Change type of variables `int` -> `size_t`, to match assigned value. Fixes: QTBUG-122300 Change-Id: I5b99bd6a3b307ba2ec4ef79bcc517da60ae36413 Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
* Change license for tests filesLucie Gérard2024-02-044-4/+4
| | | | | | | | | | | | According to QUIP-18 [1], all tests file should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I9657df5d660820e56c96d511ea49d321c54682e8 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* QString::arg: don't pass nullptr to memcpy()Thiago Macieira2024-01-111-2/+17
| | | | | | | | | | | | | | | | | | A null QString / QStringView has a null begin pointer stored as its array beginning (something we hide a little in the QString::data() function, but not in QStringView::data()). We've been passing a null pointer to memcpy() every time someone passed a null QStringView for QString's single-argument arg() call, though not the multi-string arg() version (which is the only one QStringView offers). Commit f5021835dfb4b0bf974794b598cbdf9f0f95898d made this worse by making QStringViews created from null QStrings retain the nullness (as was intended). Fixes: QTBUG-120624 Pick-to: 6.2 6.5 6.6 6.7 Change-Id: I6e2677aad2ab45759db2fffd17a870639b19340b Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QString: explain TransientDefaultLocale betterMarc Mutz2023-12-071-1/+2
| | | | | | | | | | | | | | | | | A default-constructed QLocale gets initialized with the currently-active default locale, and apparently retains that setting henceforth. That is why the `prior` member is not explicitly initialized, which is confusing at face value. Explain the mechanism better, and explicitly default-initialize the member, so the next reader of the code saves the time to research this. Amends 76dfda1ad12cc42cdd832aed1edbe5f76b0cbb2d. Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I1d1171f8564c70a971938b92b809f63ba5637d3a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* QStringView: add isLower and isUpperAnton Kudryavtsev2023-11-021-0/+2
| | | | | | | | [ChangeLog][QtCore][QStringView] Added isLower() and isUpper() Change-Id: Ie6cd20bd375d42cbdfb17953b2307d025c31ec77 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString/QByteArray: add lvalue and rvalue overloads of left/mid/rightThiago Macieira2023-10-251-3/+197
| | | | | | | | | | | | The first/last/sliced API may be what we suggest users use, but the vast majority of the installed codebase uses left/mid/right because they've been available since time immemorial. An additional benefit of this is to make left() and right() available as inline methods. Change-Id: Ifeb6206a9fa04424964bfffd1788383817ed906c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QString/QBA: add lvalue and rvalue overloads to first/last/sliced/choppedThiago Macieira2023-10-251-0/+77
| | | | | | | | | | | | Those ought to have been the original implementation, when they were added in commit 38096a3d7040edac4f769270d2402ff4e39d7694, for Qt 6.0. Because these classes are exported, we need to provide the previous only implementations for MSVC. All other compilers would provide inline or emit local, out-of-line copies. Change-Id: Ifeb6206a9fa04424964bfffd178836a2ae56157d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QString: assign() [4/4]: (it,it) overload for UTF-8 data typesDennis Oberst2023-09-281-1/+77
| | | | | | | | | | | | | | | | | | | | | | Implement the missing overload to handle UTF-8 specific data types, including char8_t (C++20), char, uchar and signed char. Introduce the helper function 'assign_helper_char8' which handles the non-contiguous_iterator case. The contiguous_iterator case is already handled by the QAnyStringView overload. Include 'qstringconverter.h' at the end of the file, since it can't be included at the top due to diamond dependency conflicts. QStringDecoder is an implementation detail we don't want users to depend on when using assign(it, it). It would be unnatural to not be able to use a function just because we didn't include an apparently unrelated header. [ChangeLog][QtCore][QString] Enabled assign() for UTF-8 data types. Fixes: QTBUG-114208 Change-Id: Ia39bbb70ca105a6bbf1a131b2533f29a919ff66d Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QString: use new assign() in operator=({QByteArray, QChar, char *})Dennis Oberst2023-09-051-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator=(~) and assign() share similar names but, until now, have not shared the same functionality. This patch introduces the usage of QString::assign() within the non-sharing assignment operators to effectively boost efficiency by reusing the available capacity. Since we're re-using the capacity we update the test case in places where they don't hold true anymore. Since these assignment operators are frequently used in many places, both within Qt and non-Qt code, this patch comes with benchmarks. The preview of the benchmark results are compared with this patch and before this patch. The results show a boost in performance for the QByteArray and 'const char*' overload. The QLatin1StringView overload already preserved the capacity and has a better performance than the assign() alternative, so don't us it there. (x86_64-little_endian-lp64 shared (dynamic) release build (O3); by gcc 13.2.1, endeavouros ; 13th Gen Intel(R) Core(TM) i9-13900K benchmarks executed with -perf -iterations 1000000 * The last value at the EOL represent the string size. QString &operator=(const QByteArray &a) (current) 64.3 cycles/iter; 300 instructions/iter; 17 nsec/iter (5) 65.8 cycles/iter; 366 instructions/iter; 12 nsec/iter (10) 62.9 cycles/iter; 301 instructions/iter; 11.5 nsec/iter (20) 61.3 cycles/iter; 315 instructions/iter; 11.1 nsec/iter (50) 71.4 cycles/iter; 386 instructions/iter; 13 nsec/iter (100) 136.9 cycles/iter; 811 instructions/iter; 24.5 nsec/iter (500) 245.8 cycles/iter; 1394 instructions/iter; 42.5 nsec/iter (1'000) QString &operator=(const QByteArray &a) (before) 78 cycles/iter; 399 instructions/iter; 15.3 nsec/iter (5) 82.3 cycles/iter; 465 instructions/iter; 15 nsec/iter (10) 76.7 cycles/iter; 400 instructions/iter; 14 nsec/iter (20) 79.5 cycles/iter; 414 instructions/iter; 14.5 nsec/iter (50) 91.4 cycles/iter; 485 instructions/iter; 16.7 nsec/iter (100) 189 cycles/iter; 910 instructions/iter; 34.4 nsec/iter (500) 320 cycles/iter; 1666 instructions/iter; 56 nsec/iter (1'000) QString &operator=(const char *ch) (current) 70 cycles/iter; 317 instructions/iter; 12 nsec/iter (5) 71 cycles/iter; 383 instructions/iter; 12.3 nsec/iter (10) 64 cycles/iter; 318 instructions/iter; 11.1 nsec/iter (20) 69 cycles/iter; 340 instructions/iter; 12 nsec/iter (50) 77 cycles/iter; 419 instructions/iter; 13.5 nsec/iter (100) 141 cycles/iter; 899 instructions/iter; 24.4 nsec/iter (500) 280 cycles/iter; 1518 instructions/iter; 48.4 nsec/iter (1'000) QString &operator=(const char *ch) (before) 86.7 cycles/iter; 416 instructions/iter; 15 nsec/iter (5) 87.8 cycles/iter; 482 instructions/iter; 15.7 nsec/iter (10) 82.4 cycles/iter; 417 instructions/iter; 14.3 nsec/iter (20) 90.2 cycles/iter; 443 instructions/iter; 15.6 nsec/iter (50) 101.4 cycles/iter; 518 instructions/iter; 17.7 nsec/iter (100) 204.4 cycles/iter; 994 instructions/iter; 36.5 nsec/iter (500) 337.9 cycles/iter; 1789 instructions/iter; 58.9 nsec/iter (1'000) * current implemented as: assign(other) QString &operator=(QLatin1StringView other) (current) 47.4 cycles/iter; 237 instructions/iter; 8.2 nsec/iter (5) 46.2 cycles/iter; 237 instructions/iter; 7.9 nsec/iter (10) 46.8 cycles/iter; 255 instructions/iter; 8 nsec/iter (20) 59 cycles/iter; 273 instructions/iter; 10.2 nsec/iter (50) 55 cycles/iter; 300 instructions/iter; 9.5 nsec/iter (100) 94.3 cycles/iter; 525 instructions/iter; 16.3 nsec/iter (500) 166 cycles/iter; 804 instructions/iter; 28.7 nsec/iter (1'000) QString &operator=(QLatin1StringView other) (before) 14 cycles/iter; 79 instructions/iter; 2.5 nsec/iter (5) 14 cycles/iter; 79 instructions/iter; 2.6 nsec/iter (10) 16 cycles/iter; 97 instructions/iter; 3 nsec/iter (20) 19 cycles/iter; 115 instructions/iter; 3.5 nsec/iter (50) 23 cycles/iter; 142 instructions/iter; 4.2 nsec/iter (100) 91 cycles/iter; 367 instructions/iter; 16.6 nsec/iter (500) 131 cycles/iter; 646 instructions/iter; 23.4 nsec/iter (1'000) Task-number: QTBUG-106201 Change-Id: Ie852f6abd1cf16164802acddb048eae5df59758f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_QString: assign(it,it) add test-cases for empty rangeDennis Oberst2023-09-051-0/+20
| | | | | | Pick-to: 6.6 Change-Id: Iaf2ddb247aa279166110ad8793b1e37e66e8b11b Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QString: deduplicate datatagsMårten Nordheim2023-09-041-9/+9
| | | | | | | | | By saying what's special about some of them Pick-to: 6.6 6.5 Change-Id: I17bf2e12a27bf55f621020ddf3819ee9e606847d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* wasm: rename JsString -> EcmaStringMorten Sørvig2023-08-301-4/+4
| | | | | | | | | | | | | QString::fromJsString -> QString::fromEcmaString() QString::toJsString() -> QString::toEcmaString() For API naming compatibility with QByteArray::fromEcmaUin8Array() Pick-to: 6.6 Change-Id: If6e2121e31e630d6728ed24e41d14b763f395aaa Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io> Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* QString/QByteArray: fix append() wrt. raw dataMårten Nordheim2023-08-211-0/+17
| | | | | | | | | | | | | | | | | | | | When appending to an empty string or byte array, we optimize and copy the internal pointer. But if the other string/byte array was created with fromRawData this might be temporary data on the stack/heap and might be de-allocated or overwritten before the string/byte array is used or is forced to make a deep-copy. This would lead to incorrect data being used. This is easy to overlook if you plan to append multiple strings together, potentially supplied through an argument. Upon appending a second string it would make a full copy, but there might not be a guarantee for that. So, it's hard for users to avoid this pitfall! Fixes: QTBUG-115752 Pick-to: 6.6 6.5 6.2 Change-Id: Ia9aa5f463121c2ce2e0e8eee8a6c8612b7297f2b Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add a better pangram to a QString::length() test-caseEdward Welbourne2023-08-081-2/+2
| | | | | | | | There was a gap in its numbering, and the quick brown fix could do with some competition. Change-Id: I1283bbb6ba321ae2b65b4459327f2428a45f85cc Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QString: use _data based testing for trimmedAhmad Samir2023-07-221-21/+29
| | | | | | | The same _data() will be re-used with trim(). Change-Id: Ie9b794b7e8d40552d9cacb71df0f8a151d4348a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* String-like containers: add implicit conversions towards std:: string viewsGiuseppe D'Angelo2023-07-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++20 std::basic_string_view has gained a range constructor (like QStringView always had), but that range constructor has been made explicit. This means we can't just pass a QString(View) to a function taking a u16string_view. The consensus seems to be that that types that should implictly convert towards stdlib's string views should do that via implicit conversion operators. This patch adds them for * QByteArrayView => std::string_view * QString(View) => std::u16string_view * QUtf8StringView => std::string_view or std::u8string_view, depending on the storage_type QLatin1StringView doesn't have a matching std:: view so I'm not enabling its conversion. QByteArray poses a challenge, in that it already defines a conversion towards const char *. (One can disable that conversion with a macro.) That conversion makes it impossible to support: QByteArray ba; std::string_view sv1(ba); // 1 std::string_view sv2 = ba; // 2 because: * if only operator const char *() is defined, then (2) doesn't work (situation right now); * if both conversions to const char * and string_view are defined, then (1) is ambiguous on certain compilers (MSVC, QCC). Interestingly enough, not on GCC/Clang, but only in C++17 and later modes. I can't kill the conversion towards const char * (API break, and we use it *everywhere* in Qt), hence, QByteArray does not get the implicit conversion, at least not in this patch. [ChangeLog][QtCore][QByteArrayView] Added an implicit conversion operator towards std::string_view. [ChangeLog][QtCore][QString] Added an implicit conversion operator towards std::u16string_view. [ChangeLog][QtCore][QStringView] Added an implicit conversion operator towards std::u16string_view. [ChangeLog][QtCore][QUtf8StringView] Added an implicit conversion operator towards std::string_view (QUtf8StringView is using char as its storage type in Qt 6). Note that QUtf8StringView is planned to use char8_t in Qt 7, therefore it is expected that the conversion will change towards std::u8string_view in Qt 7. Change-Id: I6d3b64d211a386241ae157765cd1b03f531f909a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CI: Enable tests under corelib/text for Wasm platformPiotr Wierciński2023-07-102-2/+4
| | | | | | | | | | We are gradually enabling more tests for WebAssembly platform for better test coverage. Long linking time is no longer an issue due to test batching. Change-Id: I7ee9f877ecda726bc23d8dd2507c616bb381ebc1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* CMake: Make corelib tests standalone projectsAlexandru Croitor2023-07-051-0/+6
| | | | | | | | | | | | | | | | | | Add the boilerplate standalone test prelude to each test, so that they can be opened with an IDE without the qt-cmake-standalone-test script, but directly with qt-cmake or cmake. Boilerplate was added using the following scripts: https://git.qt.io/alcroito/cmake_refactor Manual adjustments were made where the code was inserted in the wrong location. Task-number: QTBUG-93020 Change-Id: I28b6d3815c5f43d2c33ea65764f6f3f8f129eaf3 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: add STL-style assign() [3/4]: (it,it) overload for char32_tMarc Mutz2023-06-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | This no longer is range-length preserving now, so adapt the documentation. For the non-contiguous iterator case, it's actually ok to always resize(0) and then append(), because, unlike for QList and QVLA, the resize(0) doesn't actually iterate the container to destroy elements. It just sets some members and conveniently detach()es for us. The char8_t case is even more complicated, since we can, atm, not include qstringconverter.h into qstring.h, yet qstringconverter is required for stateful UTF-8 decoding in the input_iterator case. So that's postponed to yet another patch, and maybe won't make it into 6.6. But I feel it's important to have at least one non-length-preserving version of assign(it, it) in before release lest users come to rely on this documented (and de-facto) feature of the the step-2 assign(). Fixes: QTBUG-106198 Pick-to: 6.6 Change-Id: Id458776e91b16fb2c80196e339cb817adee5d6d9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QString: add STL-style assign() [2/4]: (it,it) overload for ↵Marc Mutz2023-06-071-0/+99
| | | | | | | | | | | | | | QChar-convertible *it Restrict the permissible value_types to those QStringView can take, plus QLatin1Char. All of these implicitly convert to QChar and give the correct result, even when converted char-by-char. Task-number: QTBUG-106198 Pick-to: 6.6 Change-Id: Icb44244cb08af391161c4309467d4e0d2d3d3d62 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
* Add tst_QString::prependEventuallyProducesFreeSpaceAtBegin()Marc Mutz2023-06-071-0/+10
| | | | | | | | | | This seems to work with prepend(char), but not with prepend("data"), cf. QTBUG-114167. Task-number: QTBUG-114167 Pick-to: 6.5 6.6 Change-Id: I7aa4dca7c2b5938c2e5ad416231945c23140d659 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QString: add STL-style assign() [1/4]: non-(it,it) overloadsDennis Oberst2023-06-041-0/+98
| | | | | | | | | | | | | | | | | | | | | Implemented assign() methods for QString to align with the criteria of std::basic_string, addressing the previously missing functionality. This is a subset of the overloads provided by the standard. Reference: https://en.cppreference.com/w/cpp/string/basic_string/assign The assign(it, it) overload is a bit more complicated and will be added in follow-up patches. [ChangeLog][QtCore][QString] Added assign(). Task-number: QTBUG-106198 Change-Id: Ia1481d184865f46db872cf94c266fef83b962351 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QString: add a tst_QString variant with QT_NO_CAST_FROM_ASCIIAhmad Samir2023-04-292-81/+118
| | | | | | | | | | | | | | Now the tst_qstring is compiled three times: - with QT_NO_CAST_FROM_ASCII defined - with QT_RESTRICTED_CAST_FROM_ASCII defined - with neither of the above defined so as to cover more code paths. Pick-to: 6.5 Task-number: QTBUG-109228 Change-Id: I65eca0f6f6aea66fed6eeda1eb77a50a97210807 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Corelib: s/Q_OS_MAC/Q_OS_DARWIN/wg except for doc and definitionEdward Welbourne2023-03-201-1/+1
| | | | | | | | | | I got tired of being told off by the inanity 'bot for faithfully reflecting existing #if-ery in new #if-ery. Retain only the documentation and definition of the deprecated define. Change-Id: I47f47b76bd239a360f27ae5afe593dfad8746538 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [10/13]Ahmad Samir2023-03-152-154/+159
| | | | | | | | | | | | Drive-by changes: - Cleanup creating a QChar[], by creating a char16_t[] and reinterpret_cast'ing it - Use human-readable Unicode characters where possible Pick-to: 6.5 Change-Id: Ice2c36ff3ea4b6a5562cf907a7809166a51abd28 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: build tst_QString::arg() without ASCII casting [13/13]Ahmad Samir2023-02-201-121/+123
| | | | | | | | | | Drive-by change: use UTF-16 instead of UTF-8 for Eastern Arabic Numerals, both are not human-readable but UTF-16 is one code point instead of the two for UTF-8, less \x. Pick-to: 6.5 Change-Id: I721f3989b7d776ddc4f9d337b21dca9d398fcc0d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: build tst_QString::contructor() without ASCII casts [12/13]Ahmad Samir2023-02-201-24/+37
| | | | | | | | | | | | | | Constructing from const char* etc is already covered by constructorQByteArray. I took a guess that the "// b(10)" comment is about testing constructing a QString from a QChar[] that has an explicit \0 charcater. I tried finding what the initial intent was but the trail went cold at the "Initial import from the monolithic Qt" commit. Pick-to: 6.5 Change-Id: I15bcdb24e55286eb6cd3056af0714a1eed581635 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change unittests to compile with QT_NO_CAST_FROM_ASCII [7/13]Ahmad Samir2023-02-171-121/+143
| | | | | | | | | | | | | | I.e. the second arg to QCOMPARE isn't what's being tested. Drive-by changes: - More _L1 usage, less blocky and easier to read - QCOMPARE's second arg can be a View, it is smart enough and can compare them just fine - Replace a "//15 chars" comment with a QCOMPARE check Pick-to: 6.5 Change-Id: I4f4b84b16b543df37b0ba2f9dd781b045b2ed397 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: split toNum unittestsAhmad Samir2023-02-171-131/+216
| | | | | | | | | | | - Port macros to QTest data rows in separate unittests - Move DOUBLE_TEST-related data to toDouble() unittest - Drop one redundant unittest: QTest::newRow("const-charstar") << (const char*)0; Pick-to: 6.5 Change-Id: Ie809895e9f5d58c2d3ec419689f409b55e24fcf7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: unittests: clean-up creating a QChar[]Ahmad Samir2023-02-171-3/+5
| | | | | | Pick-to: 6.5 Change-Id: I3864d145c05ae4268fe576f84723acc5eba3c2cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [3/13]Ahmad Samir2023-02-171-108/+119
| | | | | | Pick-to: 6.5 Change-Id: I5127831d5f9dcf200d0892b1ab58760180dda610 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: build count/contains() unittests with no ASCII casting [11/13]Ahmad Samir2023-02-171-63/+98
| | | | | | | | Drive-by change: Test more count/contains() overloads. Pick-to: 6.5 Change-Id: Ife3afe9aab68e18cc1587c11108a18a413c339c3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [9/13]Ahmad Samir2023-02-171-118/+118
| | | | | | Pick-to: 6.5 Change-Id: I20dcf2d69c1446faef79bd24a78b1b86feec4ccb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [8/13]Ahmad Samir2023-02-171-139/+139
| | | | | | Pick-to: 6.5 Change-Id: I72ebb7bb19e35a10aa85ea7da6ee6b1b332050a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [6/13]Ahmad Samir2023-02-171-78/+78
| | | | | | Pick-to: 6.5 Change-Id: Ib747bd69f15c3e1d2deaa5a0168fcbcddbbb8f8e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: split some double/Nan/Inf unittestsAhmad Samir2023-02-161-47/+77
| | | | | | | | | And switch to using test data rows (rooting out two macros in the process). Pick-to: 6.5 Change-Id: Ib31e6b59f90f0983c0efc4bef7cb246aedfcab5b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [5/13]Ahmad Samir2023-02-161-93/+93
| | | | | | | | | Drive-by change: change C-style cast, (qlonglong)0, to C++ style cast qlonglong(0). Pick-to: 6.5 Change-Id: Ie7a36c17ac9c14f0606fcb4b112eba3f0180232e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [4/13]Ahmad Samir2023-02-161-165/+183
| | | | | | Pick-to: 6.5 Change-Id: I086d20547912da45282b88e290fdae9d2029c6bf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [2/13]Ahmad Samir2023-02-161-122/+122
| | | | | | Pick-to: 6.5 Change-Id: If3b5eaf9964b3834c116522bc9a6bb89cd5b1626 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: change test data to compile with QT_NO_CAST_FROM_ASCII [1/13]Ahmad Samir2023-02-161-118/+117
| | | | | | | | | | | | | | | | | Change test data to compile with NO_CAST_FROM_ASCII uncoditionally where casting from ASCII isn't what's being tested by a unittest. The goal is to add a variant of tst_qstring that is compiled with QT_NO_CAST_FROM_ASCII so that the unittests cover that code path too. The commits are split into smaller chunks (where there is a common link between changed code, that code is put in a commit, otherwise I kept the number of changed lines below ~150) to make reviewing them easier. Pick-to: 6.5 Change-Id: I14256f1bde7749a3023753dbb7ed8be72cb6bc14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: don't detach in replace_helper()Ahmad Samir2023-02-091-6/+41
| | | | | | | | | | | | | | | | | | | | I.e. don't detach in the replace() overloads that delegate to replace_helper() if this string is shared, instead create a new string and copy characters from this string to it, along with the "after" string, then swap it with this. Do the same thing if "before" is shorter than "after" and there isn't enough capacity to do the replacement without reallocating. Use std::copy* and std::move*, which will both fallback to memmove/memcpy, but they have C++ API, which is more readable. [ChangeLog][QtCore][QString] Using replace() on a currently shared QString is now done more efficiently Task-number: QTBUG-106184 Change-Id: If74ffa1ed47636dc23d543d6dc123d8f2b21d537 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: optimize insert(qsizetype, QUtf8StringView)Ahmad Samir2023-02-091-0/+1
| | | | | | | | | | | Utf8 data is variable-width, ideally we want to write characters at most once, so insert directly into the QString buffer if inserting at the end (by delegating to append(QUtf8SV)), and use an intermediate buffer to hold the converted data before inserting anywhere else. Task-number: QTBUG-108546 Change-Id: Iabfaeecaf34a1ba11946bd67951e69a45d954d6d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: don't detach in insert()Ahmad Samir2023-02-091-42/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of detaching when the string is shared, or if the the insertion would cause a reallocation, create a new string and copy characters to it as needed, then swap it with "this" string. This is more efficient than detaching which would copy the whole string before inserting, as some characters would be copied multiple times. Use detachAndGrow(), otherwise QStringBuilder unitests fail: PASS : tst_QStringBuilder1::initTestCase() FAIL! : tst_QStringBuilder1::scenario() 'prepends < max_prepends' returned FALSE. () Loc: [tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp(61)] PASS : tst_QStringBuilder1::cleanupTestCase() The issue is that now when inserting, if the string is going to reallocated, we create a new string, so the freeSpaceAtBegin() optimization doesn't work the same way. void checkItWorksWithFreeSpaceAtBegin(const String &chunk, const Separator &separator) { // GIVEN: a String with freeSpaceAtBegin() and less than chunk.size() freeSpaceAtEnd() String str; int prepends = 0; const int max_prepends = 10; while (str.data_ptr().freeSpaceAtBegin() < chunk.size() && prepends++ < max_prepends) str.prepend(chunk); QVERIFY(prepends < max_prepends); ... ... each str.prepend() would have reallocated. [ChangeLog][QtCore][QString] Calling insert() on a currently shared string is now done more efficiently. Task-number: QTBUG-106186 Change-Id: I07ce8d6bde50919fdc587433e624ace9cee05be8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString, QByteArray: don't detach in removeIf/erase/eraseif()Ahmad Samir2023-02-091-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the object is shared, instead of detaching, copy characters from "this" to a new object except for the chacters that would be erased, this is more efficient than detaching (which would copy the whole data then erase). - Extend tst_QString::removeIf() to catch a corner-case (that I saw with tst_QByteArray::removeIf()). - Add q_uninitialized_remove_copy_if, which works like std::remove_copy_if but for uninitialized memory like q_uninitialized_relocate_n (but copies rather than relocates/moves). With the same static_assert from q_relocate_overlap_n that the type destructor is non-throwing. Added q_uninitialized_remove_copy_if in this commit rather than a separate one so that it's unittested by its usage in eraseIf(). [ChangeLog][QtCore][QString, QByteArray] Removing characters from a currently shared string or byte array is now done more efficiently Task-number: QTBUG-106181 Task-number: QTBUG-106183 Change-Id: Icc0ed31633cef71d482b97e0d2d20d763163d383 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString: remove some redundant unittestsAhmad Samir2023-02-021-12/+0
| | | | | | | | | | | | | The QChar::toLatin1() args in: str.replace(index, len, QChar(after[0]).toLatin1()) s2.replace(ch.toLatin1(), after, cs) will be converted to QChar, so it's always calling the same QString overload, I argue that we're not testing QChar implicit conversions here. Change-Id: I3962cab2b34684f970638575e6bd15dd1067a8c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 10:42:22 +0000