From e81330d327c3a9525a733871fa5cb938f8820525 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 19 Jun 2020 10:11:57 +0200 Subject: Add explicit encode()/decode() methods to QStringConverter The functional style interface is nice, but does feel alien in some contexts, so better also have explicit encode and decode methods. Change-Id: Ic07ced15f65cdb3a7f1cf044041e341d2ef87f79 Reviewed-by: Thiago Macieira Reviewed-by: Alex Blasche --- .../corelib/text/qstringconverter/tst_qstringconverter.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/auto/corelib/text') diff --git a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp index 58ae28bbf4..bf3f30bb82 100644 --- a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp +++ b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp @@ -114,9 +114,13 @@ void tst_QStringConverter::convertUtf8() QString uniString = decoder(ba); QCOMPARE(uniString, QString::fromUtf8(ba)); QCOMPARE(ba, uniString.toUtf8()); + uniString = decoder.decode(ba); + QCOMPARE(uniString, QString::fromUtf8(ba)); + QCOMPARE(ba, uniString.toUtf8()); QStringEncoder encoder(QStringEncoder::Utf8); QCOMPARE(ba, encoder(uniString)); + QCOMPARE(ba, encoder.encode(uniString)); } { @@ -127,12 +131,20 @@ void tst_QStringConverter::convertUtf8() for (int i = 0; i < ba.size(); ++i) uniString += decoder(ba.constData() + i, 1); QCOMPARE(uniString, QString::fromUtf8(ba)); + uniString.clear(); + for (int i = 0; i < ba.size(); ++i) + uniString += decoder.decode(ba.constData() + i, 1); + QCOMPARE(uniString, QString::fromUtf8(ba)); QStringEncoder encoder(QStringEncoder::Utf8); QByteArray reencoded; for (int i = 0; i < uniString.size(); ++i) reencoded += encoder(uniString.constData() + i, 1); QCOMPARE(ba, encoder(uniString)); + reencoded.clear(); + for (int i = 0; i < uniString.size(); ++i) + reencoded += encoder.encode(uniString.constData() + i, 1); + QCOMPARE(ba, encoder(uniString)); } } -- cgit v1.2.3