diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 11:03:00 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 11:03:00 +1000 |
commit | aabda9f5c63ec37ff1669461de6a408bb4865fda (patch) | |
tree | 5d59d83c15f75dacad3036065603e0dd0a8e7727 /tests/auto/qtextcodec/tst_qtextcodec.cpp | |
parent | eab70faca3ade07eb1a39f83a81887e42f483681 (diff) | |
parent | 6e50394c4eac9b3e91f6df7e944181cf7f54b0fe (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits)
Reduce usage of Q_ASSERT in autotests.
Fixed license header.
Remove Q_ASSERT's from qsharedmemory autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT from QXmlStream autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from QItemModel autotest
Remove Q_ASSERT's from QXmlStream autotest
Remove Q_ASSERT from QVariant autotest
Remove Q_ASSERT's from QTreeView autotest
Remove Q_ASSERT from qtesselator autotest
Remove unused function from qtessellator autotest
Remove Q_ASSERT's from qreadwritelock autotest
Remove Q_ASSERT's from QObject autotest
Remove Q_ASSERT's from QObject autotest
Remove Q_ASSERT's from QNetworkReply autotest
Remove Q_ASSERT from qitemmodel autotest
Remove Q_ASSERT's from QMutex autotest
Remove Q_ASSERT from QMetaType autotest
Remove Q_ASSERT's in qitemview autotest
...
Diffstat (limited to 'tests/auto/qtextcodec/tst_qtextcodec.cpp')
-rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 43656c8e84..d122b0bde8 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -428,7 +428,7 @@ void tst_QTextCodec::flagCodepointFFFF() const QString input(ch); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); const QByteArray asDecoded(codec->fromUnicode(input)); QCOMPARE(asDecoded, QByteArray("?")); @@ -465,7 +465,7 @@ void tst_QTextCodec::flagF7808080() const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); //QVERIFY(!codec->canEncode(QChar(0x1C0000))); @@ -482,7 +482,7 @@ void tst_QTextCodec::flagEFBFBF() const invalidInput[2] = char(0xBF); const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); { //QVERIFY(!codec->canEncode(QChar(0xFFFF))); @@ -1627,7 +1627,7 @@ void tst_QTextCodec::utf8bom() QFETCH(QString, result); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); QCOMPARE(codec->toUnicode(data.constData(), data.length(), 0), result); |