whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure we try the UTF-8 conversions with longer strings 

The SSE2-based conversion only kicks in with strings with 8 characters
or more in length.

Change-Id: Ic1daad0845571be03547553cc001d83550f0c89c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
bb10
Thiago Macieira 2014-04-23 11:05:00 -07:00 committed by The Qt Project
parent 9a07ea69d6
commit ec74461e9d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/codecs/utf8/tst_utf8.cpp
View File

@ -117,10 +117,10 @@ void tst_Utf8::roundTrip_data()
QTest::newRow("nul") << QByteArray("", 1) << QString(QChar(QChar::Null));
static const char ascii[] = "This is a standard US-ASCII message";
QTest::newRow("ascii") << QByteArray(ascii) << ascii;
QTest::newRow("ascii") << QByteArray(ascii) << QString::fromLatin1(ascii);
static const char ascii2[] = "\1This\2is\3an\4US-ASCII\020 message interspersed with control chars";
QTest::newRow("ascii2") << QByteArray(ascii2) << ascii2;
QTest::newRow("ascii2") << QByteArray(ascii2) << QString::fromLatin1(ascii2);
static const char utf8_1[] = "\302\240"; // NBSP
QTest::newRow("utf8_1") << QByteArray(utf8_1) << QString(QChar(QChar::Nbsp));
@ -169,6 +169,15 @@ void tst_Utf8::roundTrip()
QCOMPARE(to8Bit(from8Bit(utf8)), utf8);
QCOMPARE(from8Bit(to8Bit(utf16)), utf16);
// repeat with a longer message
utf8.prepend("12345678901234");
utf16.prepend(QLatin1String("12345678901234"));
QCOMPARE(to8Bit(utf16), utf8);
QCOMPARE(from8Bit(utf8), utf16);
QCOMPARE(to8Bit(from8Bit(utf8)), utf8);
QCOMPARE(from8Bit(to8Bit(utf16)), utf16);
}
void tst_Utf8::charByChar_data()