diff --git a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp index 6a398f3776..8e5848a592 100644 --- a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp +++ b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp @@ -255,16 +255,16 @@ private Q_SLOTS: void mid_QByteArray_data() { mid_data(); } void mid_QByteArray() { mid_impl(); } - void left_QString_data() { left_data(); } - void left_QString() { left_impl(); } - void left_QStringRef_data() { left_data(); } - void left_QStringRef() { left_impl(); } - void left_QStringView_data() { left_data(); } - void left_QStringView() { left_impl(); } - void left_QLatin1String_data() { left_data(); } - void left_QLatin1String() { left_impl(); } - void left_QByteArray_data() { left_data(); } - void left_QByteArray() { left_impl(); } + void left_truncate_QString_data() { left_data(); } + void left_truncate_QString() { left_impl(); } + void left_truncate_QStringRef_data() { left_data(); } + void left_truncate_QStringRef() { left_impl(); } + void left_truncate_QStringView_data() { left_data(); } + void left_truncate_QStringView() { left_impl(); } + void left_truncate_QLatin1String_data() { left_data(); } + void left_truncate_QLatin1String() { left_impl(); } + void left_truncate_QByteArray_data() { left_data(); } + void left_truncate_QByteArray() { left_impl(); } void right_QString_data() { right_data(); } void right_QString() { right_impl(); } @@ -288,17 +288,6 @@ private Q_SLOTS: void chop_QByteArray_data() { chop_data(); } void chop_QByteArray() { chop_impl(); } - void truncate_QString_data() { truncate_data(); } - void truncate_QString() { truncate_impl(); } - void truncate_QStringRef_data() { truncate_data(); } - void truncate_QStringRef() { truncate_impl(); } - void truncate_QStringView_data() { truncate_data(); } - void truncate_QStringView() { truncate_impl(); } - void truncate_QLatin1String_data() { truncate_data(); } - void truncate_QLatin1String() { truncate_impl(); } - void truncate_QByteArray_data() { truncate_data(); } - void truncate_QByteArray() { truncate_impl(); } - // // UTF-16-only checks: // @@ -795,11 +784,21 @@ void tst_QStringApiSymmetry::left_impl() const auto s = make(unicode, latin1, utf8); - const auto left = s.left(n); + { + const auto left = s.left(n); - QVERIFY(left == result); - QCOMPARE(left.isNull(), result.isNull()); - QCOMPARE(left.isEmpty(), result.isEmpty()); + QCOMPARE(left, result); + QCOMPARE(left.isNull(), result.isNull()); + QCOMPARE(left.isEmpty(), result.isEmpty()); + } + { + auto left = s; + left.truncate(n); + + QCOMPARE(left, result); + QCOMPARE(left.isNull(), result.isNull()); + QCOMPARE(left.isEmpty(), result.isEmpty()); + } } void tst_QStringApiSymmetry::right_data() @@ -909,25 +908,6 @@ void tst_QStringApiSymmetry::chop_impl() } } -template -void tst_QStringApiSymmetry::truncate_impl() -{ - QFETCH(const QStringRef, unicode); - QFETCH(const QLatin1String, latin1); - QFETCH(const int, n); - QFETCH(const QStringRef, result); - - const auto utf8 = unicode.toUtf8(); - - auto trunc = make(unicode, latin1, utf8); - - trunc.truncate(n); - - QVERIFY(trunc == result); - QCOMPARE(trunc.isNull(), result.isNull()); - QCOMPARE(trunc.isEmpty(), result.isEmpty()); -} - // // // UTF-16-only checks: