diff options
Diffstat (limited to 'tests/auto/widgets')
14 files changed, 118 insertions, 58 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index d8833e232d..c3d2c4a9e7 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -276,7 +276,7 @@ void tst_QDialog::showMaximized() QVERIFY(dialog.isMaximized()); QVERIFY(!dialog.isVisible()); - dialog.show(); + dialog.setVisible(true); QVERIFY(dialog.isMaximized()); QVERIFY(dialog.isVisible()); @@ -309,7 +309,7 @@ void tst_QDialog::showMinimized() QVERIFY(dialog.isMinimized()); QVERIFY(!dialog.isVisible()); - dialog.show(); + dialog.setVisible(true); QVERIFY(dialog.isMinimized()); QVERIFY(dialog.isVisible()); diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 37cc6522a2..c8f76c36ff 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -274,6 +274,11 @@ private slots: public slots: void dummySlot() {} + +private: +#if defined Q_OS_BLACKBERRY + QScopedPointer<QWidget> rootWindow; +#endif }; void tst_QGraphicsView::initTestCase() @@ -281,6 +286,13 @@ void tst_QGraphicsView::initTestCase() #ifdef Q_OS_WINCE_WM qApp->setAutoMaximizeThreshold(-1); #endif + +#if defined Q_OS_BLACKBERRY + // On BlackBerry first window is always shown full screen. However, many tests rely on specific + // window sizes. Create a dummy full screen window, so subsequent windows have correct size. + rootWindow.reset(new QWidget); + rootWindow->show(); +#endif } void tst_QGraphicsView::cleanup() @@ -1300,7 +1312,7 @@ void tst_QGraphicsView::fitInView() view.setFixedSize(400, 200); #endif - view.show(); + view.showNormal(); view.fitInView(scene.itemsBoundingRect(), Qt::IgnoreAspectRatio); qApp->processEvents(); @@ -1412,7 +1424,7 @@ void tst_QGraphicsView::itemsAtPosition() view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setScene(&scene); - view.show(); + view.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&view)); QPoint screenPos = view.viewport()->mapToGlobal(viewPos); @@ -1530,7 +1542,7 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust() view.setRenderHint(QPainter::Antialiasing, adjustForAntialiasing); view.setFrameStyle(0); view.resize(300, 300); - view.show(); + view.showNormal(); QVERIFY(QTest::qWaitForWindowActive(&view)); QTRY_VERIFY(rect->numPaints > 0); @@ -2524,9 +2536,9 @@ public: bool dirtyPainter; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *w) { - dirtyPainter = (painter->pen().color() != Qt::black); + dirtyPainter = (painter->pen().color() != w->palette().color(w->foregroundRole())); painter->setPen(Qt::red); } }; @@ -2801,7 +2813,7 @@ void tst_QGraphicsView::scrollBarRanges() view.setHorizontalScrollBarPolicy(hbarpolicy); view.setVerticalScrollBarPolicy(vbarpolicy); - view.show(); + view.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&view)); const int offset = view.style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, 0); @@ -3529,7 +3541,7 @@ void tst_QGraphicsView::moveItemWhileScrolling() view.setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing); view.resize(200, 200); view.painted = false; - view.show(); + view.showNormal(); if (changedConnected) QObject::connect(view.scene(), SIGNAL(changed(QList<QRectF>)), this, SLOT(dummySlot())); QVERIFY(QTest::qWaitForWindowExposed(&view)); @@ -4622,7 +4634,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() QGraphicsView view(&scene); view.scale(4.15, 4.15); - view.show(); + view.showNormal(); qApp->setActiveWindow(&view); QVERIFY(QTest::qWaitForWindowActive(&view)); @@ -4699,12 +4711,17 @@ void tst_QGraphicsView::hoverLeave() const QPoint outOfWindow = view.geometry().topRight() + QPoint(50, 0); QCursor::setPos(outOfWindow); - view.show(); + view.showNormal(); qApp->setActiveWindow(&view); QVERIFY(QTest::qWaitForWindowActive(&view)); QPoint pos = view.viewport()->mapToGlobal(view.mapFromScene(item->mapToScene(10, 10))); QCursor::setPos(pos); + +#if defined(Q_OS_QNX) + QEXPECT_FAIL("", "QCursor does not set native cursor on QNX", Abort); +#endif + QTRY_VERIFY(item->receivedEnterEvent); QCOMPARE(item->enterWidget, view.viewport()); diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 1005bf6b3c..83c4582645 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1246,7 +1246,7 @@ void tst_QAbstractItemView::task250754_fontChange() vLayout->addWidget(&tree); QStandardItemModel *m = new QStandardItemModel(this); - for (int i=0; i<5; ++i) { + for (int i=0; i<20; ++i) { QStandardItem *item = new QStandardItem(QString("Item number %1").arg(i)); for (int j=0; j<5; ++j) { QStandardItem *child = new QStandardItem(QString("Child Item number %1").arg(j)); @@ -1256,10 +1256,11 @@ void tst_QAbstractItemView::task250754_fontChange() } tree.setModel(m); - w.resize(160, 240); // Minimum width for windows with frame on Windows 8 + tree.setHeaderHidden(true); // The header is (in certain styles) dpi dependent + w.resize(160, 300); // Minimum width for windows with frame on Windows 8 centerOnScreen(&w); moveCursorAway(&w); - w.show(); + w.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&w)); QFont font = tree.font(); font.setPixelSize(10); @@ -1579,11 +1580,16 @@ void tst_QAbstractItemView::testDelegateDestroyEditor() void tst_QAbstractItemView::testClickedSignal() { +#if defined Q_OS_BLACKBERRY + QWidget rootWindow; + rootWindow.show(); + QTest::qWaitForWindowExposed(&rootWindow); +#endif QTableWidget view(5, 5); centerOnScreen(&view); moveCursorAway(&view); - view.show(); + view.showNormal(); QApplication::setActiveWindow(&view); QVERIFY(QTest::qWaitForWindowActive(&view)); QCOMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow()); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 3e6df0f136..869b335a95 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -621,6 +621,9 @@ void tst_QHeaderView::sectionSize_data() void tst_QHeaderView::sectionSize() { +#if defined Q_OS_QNX + QSKIP("The section size is dpi dependent on QNX"); +#endif QFETCH(QList<int>, boundsCheck); QFETCH(QList<int>, defaultSizes); QFETCH(int, initialDefaultSize); @@ -734,6 +737,9 @@ void tst_QHeaderView::visualIndexAt_data() void tst_QHeaderView::visualIndexAt() { +#if defined Q_OS_QNX + QSKIP("The section size is dpi dependent on QNX"); +#endif QFETCH(QList<int>, hidden); QFETCH(QList<int>, from); QFETCH(QList<int>, to); diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 9f5484983d..78a3ad021b 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -1468,15 +1468,16 @@ void tst_QListView::wordWrap() model.setStringList(list); lv.setModel(&model); lv.setWordWrap(true); - lv.setFixedSize(150, 150); -#ifdef Q_OS_BLACKBERRY - // BB standard font size is too big, triggering - // a horizontal scrollbar even when word-wrapping - // is enabled + lv.setFixedSize(400, 150); + +#if defined Q_OS_BLACKBERRY QFont font = lv.font(); - font.setPointSize(5); + // On BB10 the root window is stretched over the whole screen + // This makes sure that the text will be long enough to produce + // a vertical scrollbar + font.setPixelSize(50); lv.setFont(font); -#endif // Q_OS_BLACKBERRY +#endif lv.showNormal(); QApplication::processEvents(); @@ -2019,7 +2020,7 @@ void tst_QListView::taskQTBUG_9455_wrongScrollbarRanges() w.setViewMode(QListView::IconMode); w.resize(116, 132); w.setMovement(QListView::Static); - const int spacing = 40; + const int spacing = 200; w.setSpacing(spacing); w.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&w)); @@ -2113,6 +2114,12 @@ void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems_data() void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems() { +#if defined Q_OS_BLACKBERRY + // On BB10 we need to create a root window which is automatically stretched + // over the whole screen + QWindow rootWindow; + rootWindow.show(); +#endif QFETCH(int, flow); QListView lv; @@ -2309,6 +2316,12 @@ void tst_QListView::spacing() void tst_QListView::testScrollToWithHidden() { +#if defined Q_OS_BLACKBERRY + // On BB10 we need to create a root window which is automatically stretched + // over the whole screen + QWindow rootWindow; + rootWindow.show(); +#endif QListView lv; QStringListModel model; @@ -2321,7 +2334,7 @@ void tst_QListView::testScrollToWithHidden() lv.setRowHidden(1, true); lv.setSpacing(5); - lv.show(); + lv.showNormal(); QTest::qWaitForWindowExposed(&lv); QCOMPARE(lv.verticalScrollBar()->value(), 0); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 8147ed7885..5474043cf6 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -43,7 +43,6 @@ #include <QtTest/QtTest> #include <QtGui/QtGui> #include <QtWidgets/QtWidgets> -#include <qeventloop.h> #include <qlist.h> #include <qlistwidget.h> @@ -209,14 +208,7 @@ void tst_QListWidget::cleanupTestCase() void tst_QListWidget::init() { testWidget->clear(); - - if (testWidget->viewport()->children().count() > 0) { - QEventLoop eventLoop; - for (int i=0; i < testWidget->viewport()->children().count(); ++i) - connect(testWidget->viewport()->children().at(i), SIGNAL(destroyed()), &eventLoop, SLOT(quit())); - QTimer::singleShot(100, &eventLoop, SLOT(quit())); - eventLoop.exec(); - } + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); } void tst_QListWidget::checkDefaultValues() @@ -317,7 +309,8 @@ void tst_QListWidget::closePersistentEditor() // actual test childCount = testWidget->viewport()->children().count(); testWidget->closePersistentEditor(item); - QTRY_COMPARE(testWidget->viewport()->children().count(), childCount - 1); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); + QCOMPARE(testWidget->viewport()->children().count(), childCount - 1); } void tst_QListWidget::setItemHidden() @@ -1582,7 +1575,7 @@ void tst_QListWidget::task217070_scrollbarsAdjusted() for(int f=150; f>90 ; f--) { v.resize(f,100); QTest::qWait(30); - QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || vbar->isVisible()); + QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient, 0, vbar) || vbar->isVisible()); //the horizontal scrollbar must not be visible. QVERIFY(!hbar->isVisible()); } diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index b07009aa3c..0579914940 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -3047,7 +3047,13 @@ void tst_QTreeView::styleOptionViewItem() static const char* s_pos[] = { "Invalid", "Beginning", "Middle", "End", "OnlyOne" }; return s_pos[pos]; } - public: + public: + MyDelegate() + : QStyledItemDelegate(), + count(0), + allCollapsed(false) + {} + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const { QVERIFY(qstyleoption_cast<const QStyleOptionViewItemV4 *>(&option)); diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index dfa7592813..390858ac5b 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -3092,9 +3092,14 @@ void tst_QTreeWidget::task253109_itemHeight() void tst_QTreeWidget::task206367_duplication() { QWidget topLevel; + // Explicitly set the font size because it is dpi dependent on some platforms + QFont font; + font.setPixelSize(40); + topLevel.setFont(font); QTreeWidget treeWidget(&topLevel); topLevel.show(); treeWidget.resize(200, 200); + treeWidget.setHeaderHidden(true); treeWidget.setSortingEnabled(true); QTreeWidgetItem* rootItem = new QTreeWidgetItem( &treeWidget, QStringList("root") ); @@ -3105,10 +3110,9 @@ void tst_QTreeWidget::task206367_duplication() itemFile->setExpanded(true); } rootItem->setExpanded(true); - QTest::qWait(2000); //there should be enough room for 2x2 items. If there is a scrollbar, it means the items are duplicated - QVERIFY(!treeWidget.verticalScrollBar()->isVisible()); + QTRY_VERIFY(!treeWidget.verticalScrollBar()->isVisible()); } diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 1003a9fb1f..3b7c2ac14d 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -713,7 +713,7 @@ void tst_QGridLayout::spacingsAndMargins() grid1.setColumnStretch(columns-1, 1); grid1.setRowStretch(rows-1, 1); - toplevel.show(); + toplevel.showNormal(); toplevel.adjustSize(); QApplication::processEvents(); QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); @@ -1230,6 +1230,9 @@ void tst_QGridLayout::layoutSpacing_data() style->reimplementSubelementRect = true; QApplication::setStyle(style); QWidget *w = new QWidget(); + QFont font; + font.setPixelSize(10); + w->setFont(font); setFrameless(w); QGridLayout *layout = new QGridLayout(); QPushButton *pb1 = new QPushButton(QLatin1String("Push 1"), w); diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 4ba4cffb78..fd2a82886c 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -611,7 +611,7 @@ void tst_QCompleter::directoryModel_data() QTest::newRow("(/u)") << "/u" << "" << "Users" << "/Users"; #else QTest::newRow("()") << "" << "" << "/" << "/"; -#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) +#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) QTest::newRow("(/h)") << "/h" << "" << "home" << "/home"; #endif QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc"; @@ -657,7 +657,7 @@ void tst_QCompleter::fileSystemModel_data() // QTest::newRow("(/d)") << "/d" << "" << "Developer" << "/Developer"; #else QTest::newRow("()") << "" << "" << "/" << "/"; -#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) +#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) QTest::newRow("(/h)") << "/h" << "" << "home" << "/home"; #endif QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc"; diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 45167bac60..077e1aa1df 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3903,7 +3903,7 @@ void tst_QLineEdit::bidiVisualMovement() do { oldPos = newPos; - QVERIFY(oldPos == positionList[i]); + QCOMPARE(oldPos, positionList[i]); if (basicDir == QChar::DirL) { QTest::keyClick(&le, Qt::Key_Right); } else @@ -3913,12 +3913,12 @@ void tst_QLineEdit::bidiVisualMovement() i++; } while (moved); - QVERIFY(i == positionList.size()); + QCOMPARE(i, positionList.size()); do { i--; oldPos = newPos; - QVERIFY(oldPos == positionList[i]); + QCOMPARE(oldPos, positionList[i]); if (basicDir == QChar::DirL) { QTest::keyClick(&le, Qt::Key_Left); } else @@ -3939,6 +3939,7 @@ void tst_QLineEdit::bidiLogicalMovement() { QFETCH(QString, logical); QFETCH(int, basicDir); + QFETCH(IntList, positionList); QLineEdit le; le.setText(logical); @@ -3951,7 +3952,7 @@ void tst_QLineEdit::bidiLogicalMovement() do { oldPos = newPos; - QVERIFY(oldPos == i); + QCOMPARE(oldPos, i); if (basicDir == QChar::DirL) { QTest::keyClick(&le, Qt::Key_Right); } else @@ -3961,10 +3962,12 @@ void tst_QLineEdit::bidiLogicalMovement() i++; } while (moved); + QCOMPARE(i, positionList.size()); + do { i--; oldPos = newPos; - QVERIFY(oldPos == i); + QCOMPARE(oldPos, i); if (basicDir == QChar::DirL) { QTest::keyClick(&le, Qt::Key_Left); } else diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 1eccdd768b..1030f0cfbd 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -633,7 +633,7 @@ void tst_QPushButton::sizeHint() tabWidget->addTab(tab2, "2"); QVBoxLayout *mainLayout = new QVBoxLayout(dialog); mainLayout->addWidget(tabWidget); - dialog->show(); + dialog->showNormal(); tabWidget->setCurrentWidget(tab2); tabWidget->setCurrentWidget(tab1); QTest::qWait(100); diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 0dac7d85e4..345b8d82ad 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -316,12 +316,17 @@ void tst_QTabBar::sizeHints() tabBar.setUsesScrollButtons(false); tabBar.setElideMode(Qt::ElideRight); // qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint(); - QVERIFY(tabBar.minimumSizeHint().width() < 500); - QVERIFY(tabBar.sizeHint().width() > 700); // unchanged + + // The sizeHint is very much dependent on the screen DPI value + // so we can not really predict it. + int tabBarMinSizeHintWidth = tabBar.minimumSizeHint().width(); + int tabBarSizeHintWidth = tabBar.sizeHint().width(); + QVERIFY(tabBarMinSizeHintWidth < tabBarSizeHintWidth); + QVERIFY(tabBarSizeHintWidth > 700); // unchanged tabBar.addTab("This is tab10 with a very long title"); - QVERIFY(tabBar.minimumSizeHint().width() < 600); - QVERIFY(tabBar.sizeHint().width() > 700); // unchanged + QVERIFY(tabBar.minimumSizeHint().width() > tabBarMinSizeHintWidth); + QVERIFY(tabBar.sizeHint().width() > tabBarSizeHintWidth); } void tst_QTabBar::setUsesScrollButtons_data() diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 53c76a0da6..fbd8b46466 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2018,6 +2018,7 @@ void tst_QTextEdit::fullWidthSelection2() QPalette myPalette; myPalette.setColor(QPalette::All, QPalette::HighlightedText, QColor(0,0,0,0)); myPalette.setColor(QPalette::All, QPalette::Highlight, QColor(239,221,85)); + myPalette.setColor(QPalette::All, QPalette::Base, QColor(255,255,255)); QTextEdit widget; widget.setPalette(myPalette); @@ -2218,7 +2219,7 @@ void tst_QTextEdit::twoSameInputMethodEvents() QInputMethodEvent event("PreEditText", attributes); QApplication::sendEvent(ed, &event); - QCOMPARE(ed->document()->firstBlock().layout()->lineCount(), 1); + QTRY_COMPARE(ed->document()->firstBlock().layout()->lineCount(), 1); QApplication::sendEvent(ed, &event); QCOMPARE(ed->document()->firstBlock().layout()->lineCount(), 1); } @@ -2303,7 +2304,7 @@ void tst_QTextEdit::bidiVisualMovement() do { oldPos = newPos; - QVERIFY(oldPos == positionList[i]); + QCOMPARE(oldPos, positionList[i]); if (basicDir == QChar::DirL) { ed->moveCursor(QTextCursor::Right); } else @@ -2315,12 +2316,12 @@ void tst_QTextEdit::bidiVisualMovement() i++; } while (moved); - QVERIFY(i == positionList.size()); + QCOMPARE(i, positionList.size()); do { i--; oldPos = newPos; - QVERIFY(oldPos == positionList[i]); + QCOMPARE(oldPos, positionList[i]); if (basicDir == QChar::DirL) { ed->moveCursor(QTextCursor::Left); } else @@ -2341,6 +2342,7 @@ void tst_QTextEdit::bidiLogicalMovement() { QFETCH(QString, logical); QFETCH(int, basicDir); + QFETCH(QList<int>, positionList); ed->setText(logical); @@ -2357,7 +2359,7 @@ void tst_QTextEdit::bidiLogicalMovement() do { oldPos = newPos; - QVERIFY(oldPos == i); + QCOMPARE(oldPos, i); if (basicDir == QChar::DirL) { ed->moveCursor(QTextCursor::Right); } else @@ -2369,10 +2371,12 @@ void tst_QTextEdit::bidiLogicalMovement() i++; } while (moved); + QCOMPARE(i, positionList.size()); + do { i--; oldPos = newPos; - QVERIFY(oldPos == i); + QCOMPARE(oldPos, i); if (basicDir == QChar::DirL) { ed->moveCursor(QTextCursor::Left); } else |