diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-03 05:32:28 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-05 02:06:03 (GMT) |
commit | 3290dd0d3563310f6bdbabf74105367bd8c611d3 (patch) | |
tree | 035c5a0692ca671792e4fa989a369dd8d175c8b5 | |
parent | 57f6ed6664f55ccee62b81750a2b3520249503fd (diff) | |
download | Qt-3290dd0d3563310f6bdbabf74105367bd8c611d3.zip Qt-3290dd0d3563310f6bdbabf74105367bd8c611d3.tar.gz Qt-3290dd0d3563310f6bdbabf74105367bd8c611d3.tar.bz2 |
Remove Q_ASSERT's from QTextEdit autotest
Convert Q_ASSERT to QCOMPARE and remove mention of Q_ASSERT in comments
to make it easier to check for unwanted Q_ASSERT's in the future.
Change-Id: I7ae250428d4d5682806e724a7207523e65cd9851
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
-rw-r--r-- | tests/auto/qtextedit/tst_qtextedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 9ca17b9..4a79e38 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -312,7 +312,7 @@ void tst_QTextEdit::getSetCheck() // void QTextEdit::setFontPointSize(qreal) obj1.setFontPointSize(qreal(1.1)); QCOMPARE(qreal(1.1), obj1.fontPointSize()); - // we currently Q_ASSERT_X in QFont::setPointSizeF for that + // we currently assert in QFont::setPointSizeF for that //obj1.setFontPointSize(0.0); //QCOMPARE(1.1, obj1.fontPointSize()); // Should not accept 0.0 => keep old @@ -322,7 +322,7 @@ void tst_QTextEdit::getSetCheck() QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(99); QCOMPARE(99, obj1.fontWeight()); // Range<1, 99> - /* Q_ASSERT_X in qfont.cpp + /* assertion in qfont.cpp obj1.setFontWeight(INT_MIN); QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(INT_MAX); @@ -2059,7 +2059,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag QCOMPARE(original.isNull(), false); QCOMPARE(original.size(), image.size()); - Q_ASSERT(image.depth() == 32); + QCOMPARE(image.depth(), 32); QCOMPARE(original.depth(), image.depth()); const int bytesPerLine = image.bytesPerLine(); |