summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-06-11 21:45:59 +0300
committerQt by Nokia <qt-info@nokia.com>2012-06-16 21:14:35 +0200
commitff1aba7d92ae6661713eb068161c6235719028b9 (patch)
treeffed1aaecf28e4f20ffaa7479ccd551ed4c0e6ad /tests/auto
parent3a77bbe68b087890fe966035eeb12b917b087c15 (diff)
Make QTBF autotest support SMP code points in the test data
I didn't do this earlier since the current test data doesn't contain any SMP code points, the Unicode 6.2 test data does - so, I can confirm this code really works. Change-Id: Ieae35e8480a89e22d846fd038e79592fefbbf2ee Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index eef293136a..ad48ebf047 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -154,8 +154,12 @@ static void generateDataFromFile(const QString &fname)
bool ok = true;
uint ucs4 = part.toInt(&ok, 16);
QVERIFY(ok && ucs4 > 0);
- QVERIFY(!QChar::requiresSurrogates(ucs4));
- testString.append(QChar(ucs4));
+ if (QChar::requiresSurrogates(ucs4)) {
+ testString.append(QChar::highSurrogate(ucs4));
+ testString.append(QChar::lowSurrogate(ucs4));
+ } else {
+ testString.append(QChar(ucs4));
+ }
}
QVERIFY(!testString.isEmpty());
QVERIFY(!expectedBreakPositions.isEmpty());