diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
7 files changed, 54 insertions, 57 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 70b8be8dc8..6f4faf8c1f 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1040,13 +1040,12 @@ void tst_QAbstractItemView::setItemDelegate() } } v.show(); - QVERIFY(QTest::qWaitForWindowExposed(&v)); #ifdef Q_WS_X11 QCursor::setPos(v.geometry().center()); QApplication::syncX(); #endif - QTest::qWait(20); QApplication::setActiveWindow(&v); + QVERIFY(QTest::qWaitForWindowActive(&v)); QModelIndex index = model.index(cellToEdit.y(), cellToEdit.x()); v.edit(index); @@ -1453,8 +1452,8 @@ void tst_QAbstractItemView::QTBUG6407_extendedSelection() view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow()); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow()); view.verticalScrollBar()->setValue(view.verticalScrollBar()->maximum()); QTest::qWait(20); @@ -1492,7 +1491,7 @@ void tst_QAbstractItemView::QTBUG6753_selectOnSelection() table.show(); table.setSelectionMode(QAbstractItemView::ExtendedSelection); table.selectAll(); - QTest::qWaitForWindowShown(&table); + QVERIFY(QTest::qWaitForWindowExposed(&table)); QModelIndex item = table.model()->index(1,1); QRect itemRect = table.visualRect(item); QTest::mouseMove(table.viewport(), itemRect.center()); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index f61e38c432..758c6e0b19 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1492,9 +1492,9 @@ void tst_QHeaderView::focusPolicy() widget.show(); widget.setFocus(Qt::OtherFocusReason); QApplication::setActiveWindow(&widget); - QTest::qWaitForWindowShown(&widget); widget.activateWindow(); - QTRY_VERIFY(widget.hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(&widget)); + QVERIFY(widget.hasFocus()); QVERIFY(!widget.header()->hasFocus()); widget.setFocusPolicy(Qt::NoFocus); @@ -2158,7 +2158,7 @@ void tst_QHeaderView::QTBUG12268_hiddenMovedSectionSorting() view.horizontalHeader()->moveSection(0,2); view.setColumnHidden(1, true); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(view.horizontalHeader()->hiddenSectionCount(), 1); QTest::mouseClick(view.horizontalHeader()->viewport(), Qt::LeftButton); QCOMPARE(view.horizontalHeader()->hiddenSectionCount(), 1); @@ -2239,7 +2239,7 @@ void tst_QHeaderView::initialSortOrderRole() view.setSortingEnabled(true); view.sortByColumn(0, Qt::AscendingOrder); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); const int column1Pos = view.horizontalHeader()->sectionViewportPosition(1) + 5; // +5 not to be on the handle QTest::mouseClick(view.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier, QPoint(column1Pos, 0)); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index b3afdb949e..2e126f49eb 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -1312,7 +1312,7 @@ void tst_QItemDelegate::QTBUG4435_keepSelectionOnCheck() view.setItemDelegate(new TestItemDelegate); view.show(); view.selectAll(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QStyleOptionViewItem option; option.rect = view.visualRect(model.index(0, 0)); // mimic QStyledItemDelegate::initStyleOption logic diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 6ed83a3b97..a9169b0cbc 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -617,7 +617,7 @@ void tst_QListView::indexAt() view2.setWrapping(true); // We really want to make sure it is shown, because the layout won't be known until it is shown view2.show(); - QTest::qWaitForWindowShown(&view2); + QVERIFY(QTest::qWaitForWindowExposed(&view2)); QTRY_VERIFY(view2.m_shown); QVERIFY(view2.m_index.isValid()); @@ -770,7 +770,7 @@ void tst_QListView::hideFirstRow() view.setUniformItemSizes(true); view.setRowHidden(0,true); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(10); } @@ -789,7 +789,7 @@ void tst_QListView::batchedMode() view.setBatchSize(2); view.resize(200,400); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(100); #if defined(Q_OS_WINCE) @@ -1150,8 +1150,7 @@ void tst_QListView::selection() #endif topLevel.show(); - QTest::qWaitForWindowShown(&v); - QApplication::processEvents(); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); v.setSelection(selectionRect, QItemSelectionModel::ClearAndSelect); @@ -1203,7 +1202,7 @@ void tst_QListView::scrollTo() lv.setModel(&model); lv.setFixedSize(100, 200); topLevel.show(); - QTest::qWaitForWindowShown(&topLevel); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); //by default, the list view scrolls per item and has no wrapping QModelIndex index = model.index(6,0); @@ -1571,7 +1570,7 @@ void tst_QListView::task248430_crashWith0SizedItem() QStringListModel model(QStringList() << QLatin1String("item1") << QString()); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(20); } @@ -1584,7 +1583,7 @@ void tst_QListView::task250446_scrollChanged() QVERIFY(index.isValid()); view.setCurrentIndex(index); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); const int scrollValue = view.verticalScrollBar()->maximum(); view.verticalScrollBar()->setValue(scrollValue); QCOMPARE(view.verticalScrollBar()->value(), scrollValue); @@ -1641,8 +1640,9 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates() list.setModel(&model); list.setViewMode(QListView::IconMode); list.show(); - QTest::qWaitForWindowShown(&list); list.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&list)); + class MyItemDelegate : public QStyledItemDelegate { @@ -1717,7 +1717,7 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes() view.setViewMode(QListView::IconMode); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Verfify that item sizes are non-uniform QVERIFY(view.sizeHintForIndex(model.index(0, 0)).height() > view.sizeHintForIndex(model.index(1, 0)).height()); @@ -1747,7 +1747,7 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes() view.setViewMode(QListView::IconMode); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Verfify that item sizes are non-uniform QVERIFY(view.sizeHintForIndex(model.index(0, 0)).width() > view.sizeHintForIndex(model.index(1, 0)).width()); @@ -1806,8 +1806,8 @@ void tst_QListView::task262152_setModelColumnNavigate() view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow()); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow()); QTest::keyClick(&view, Qt::Key_Down); QTest::qWait(30); QTRY_COMPARE(view.currentIndex(), model.index(1,1)); @@ -1856,7 +1856,7 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems() //QTBUG-7929 should not crash topLevel.show(); - QTest::qWaitForWindowShown(&topLevel); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); QScrollBar *bar = view.flow() == QListView::TopToBottom ? view.verticalScrollBar() : view.horizontalScrollBar(); @@ -1884,7 +1884,7 @@ void tst_QListView::taskQTBUG_633_changeModelData() view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); model.setData( model.index(1, 0), QLatin1String("long long text")); QTest::qWait(100); //leave time for relayouting the items QRect rectLongText = view.visualRect(model.index(1,0)); @@ -1926,7 +1926,7 @@ void tst_QListView::taskQTBUG_2678_spacingAndWrappedText() w.setWordWrap(true); w.setSpacing(10); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QCOMPARE(w.horizontalScrollBar()->minimum(), w.horizontalScrollBar()->maximum()); } @@ -1943,7 +1943,7 @@ void tst_QListView::taskQTBUG_5877_skippingItemInPageDownUp() vu.setModel(&model); vu.show(); - QTest::qWaitForWindowShown(&vu); + QVERIFY(QTest::qWaitForWindowExposed(&vu)); int itemHeight = vu.visualRect(model.index(0, 0)).height(); int visibleRowCount = vu.viewport()->height() / itemHeight; @@ -1988,7 +1988,7 @@ void tst_QListView::taskQTBUG_9455_wrongScrollbarRanges() const int spacing = 40; w.setSpacing(spacing); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QCOMPARE(w.verticalScrollBar()->maximum(), w.contentsSize().height() - w.viewport()->geometry().height()); } @@ -2034,7 +2034,7 @@ void tst_QListView::taskQTBUG_12308_artihmeticException() item->setHidden(true); } lw.show(); - QTest::qWaitForWindowShown(&lw); + QVERIFY(QTest::qWaitForWindowExposed(&lw)); // No crash, it's all right. } @@ -2067,7 +2067,7 @@ void tst_QListView::taskQTBUG_12308_wrongFlowLayout() item->setHidden(true); } lw.show(); - QTest::qWaitForWindowShown(&lw); + QVERIFY(QTest::qWaitForWindowExposed(&lw)); } void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems_data() @@ -2092,7 +2092,7 @@ void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems() model.setStringList(list); lv.setModel(&model); lv.show(); - QTest::qWaitForWindowShown(&lv); + QVERIFY(QTest::qWaitForWindowExposed(&lv)); // Save first item rect for reference QRect firstItemRect = lv.visualRect(model.index(0, 0)); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 31cc87b843..212f2d4c6d 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1628,7 +1628,7 @@ void tst_QListWidget::QTBUG8086_currentItemChangedOnClick() QSignalSpy spy(&list, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*))); - QTest::qWaitForWindowShown(&win); + QVERIFY(QTest::qWaitForWindowExposed(&win)); QCOMPARE(spy.count(), 0); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index a2806190f1..6f3737f707 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -690,8 +690,8 @@ void tst_QTableView::keyboardNavigation() view.setCurrentIndex(index); view.show(); - QTest::qWaitForWindowShown(&view); qApp->setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); int row = rowCount - 1; int column = columnCount - 1; @@ -2591,8 +2591,7 @@ void tst_QTableView::scrollTo() // resizing to this size will ensure that there can ONLY_BE_ONE_CELL inside the view. QSize forcedSize(columnWidth * 2, rowHeight * 2); view.resize(forcedSize); - QTest::qWaitForWindowShown(&view); - QTest::qWait(50); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); QTRY_COMPARE(view.size(), forcedSize); view.setModel(&model); @@ -2746,7 +2745,7 @@ void tst_QTableView::indexAt() QtTestTableView view(&toplevel); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); //some styles change the scroll mode in their polish view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem); @@ -3350,13 +3349,12 @@ void tst_QTableView::tabFocus() window.show(); QApplication::setActiveWindow(&window); - QTest::qWaitForWindowShown(&window); window.setFocus(); - QTest::qWait(100); window.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&window)); // window - QTRY_VERIFY(window.hasFocus()); + QVERIFY(window.hasFocus()); QVERIFY(!view->hasFocus()); QVERIFY(!edit->hasFocus()); @@ -3482,7 +3480,7 @@ void tst_QTableView::selectionSignal() view.setModel(&model); view.resize(200, 200); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.visualRect(model.index(2, 0)).center()); } @@ -3536,7 +3534,7 @@ void tst_QTableView::task173773_updateVerticalHeader() view.setModel(&proxyModel); view.setSortingEnabled(true); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.sortByColumn(0, Qt::AscendingOrder); QTest::qWait(100); @@ -3601,7 +3599,7 @@ void tst_QTableView::task240266_veryBigColumn() table.setColumnWidth(1, 100); //normal column table.setColumnWidth(2, 9000); //very big column table.show(); - QTest::qWaitForWindowShown(&table); + QVERIFY(QTest::qWaitForWindowExposed(&table)); //some styles change the scroll mode in their polish table.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem); @@ -3682,7 +3680,7 @@ void tst_QTableView::mouseWheel() view.setColumnWidth(c, 100); topLevel.show(); - QTest::qWaitForWindowShown(&topLevel); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); view.setModel(&model); @@ -3743,7 +3741,7 @@ void tst_QTableView::task259308_scrollVerticalHeaderSwappedSections() tv.verticalHeader()->swapSections(0, model.rowCount() - 1); tv.setCurrentIndex(model.index(model.rowCount() - 1, 0)); - QTest::qWaitForWindowShown(&tv); + QVERIFY(QTest::qWaitForWindowExposed(&tv)); QTest::keyClick(&tv, Qt::Key_PageUp); // PageUp won't scroll when at top QTRY_COMPARE(tv.rowAt(0), tv.verticalHeader()->logicalIndex(0)); @@ -3949,7 +3947,7 @@ void tst_QTableView::changeHeaderData() QStandardItemModel model(5,5); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QString text = "long long long text"; const int textWidth = view.verticalHeader()->fontMetrics().width(text); @@ -3967,7 +3965,7 @@ void tst_QTableView::taskQTBUG_5237_wheelEventOnHeader() QStandardItemModel model(500,5); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); int sbValueBefore = view.verticalScrollBar()->value(); QHeaderView *header = view.verticalHeader(); @@ -4013,7 +4011,7 @@ void tst_QTableView::taskQTBUG_8585_crashForNoGoodReason() w.setModel(&model); connect(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &w, SLOT(onDataChanged())); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); for (int i = 0; i < 10; i++) { QTest::mouseMove(w.viewport(), QPoint(50, 20)); @@ -4038,7 +4036,7 @@ void tst_QTableView::taskQTBUG_7774_RtoLVisualRegionForSelection() view.setModel(&model); view.setLayoutDirection(Qt::RightToLeft); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QItemSelectionRange range(model.index(2, 0), model.index(2, model.columnCount() - 1)); QItemSelection selection; diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index f61b776106..8f53a86b70 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -916,7 +916,7 @@ void tst_QTreeView::iconSize() view.show(); view.update(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_VERIFY(view.repainted); QCOMPARE(view.iconSize(), QSize()); @@ -3302,7 +3302,7 @@ void tst_QTreeView::task216717_updateChildren() bool refreshed; } tree; tree.show(); - QTest::qWaitForWindowShown(&tree); + QVERIFY(QTest::qWaitForWindowExposed(&tree)); tree.refreshed = false; QTreeWidgetItem *parent = new QTreeWidgetItem(QStringList() << "parent"); tree.addTopLevelItem(parent); @@ -3591,7 +3591,7 @@ void tst_QTreeView::task246536_scrollbarsNotWorking() QStandardItemModel model; tree.setModel(&model); tree.show(); - QTest::qWaitForWindowShown(&tree); + QVERIFY(QTest::qWaitForWindowExposed(&tree)); QList<QStandardItem *> items; for(int i=0; i<100; ++i){ items << new QStandardItem(QString::fromLatin1("item %1").arg(i)); @@ -3646,7 +3646,7 @@ void tst_QTreeView::task239271_addRowsWithFirstColumnHidden() view.hideColumn(0); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); delegate.paintedIndexes.clear(); QStandardItem sub1("sub1"), sub11("sub11"); root0.appendRow(QList<QStandardItem*>() << &sub1 << &sub11); @@ -3748,8 +3748,8 @@ void tst_QTreeView::doubleClickedWithSpans() view.setFirstColumnSpanned(0, QModelIndex(), true); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_VERIFY(view.isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(view.isActiveWindow()); QPoint p(10, 10); QCOMPARE(view.indexAt(p), model.index(0, 0)); @@ -3820,7 +3820,7 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint() view.painted = 0; view.doCompare = false; view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_VERIFY(view.painted > 0); QTest::qWait(100); // This one is needed to make the test fail before the patch. @@ -3980,7 +3980,7 @@ void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression() model.bindView(&treeView); treeView.expandAll(); treeView.show(); - QTest::qWaitForWindowShown(&treeView); + QVERIFY(QTest::qWaitForWindowExposed(&treeView)); QTest::keyPress(treeView.viewport(), Qt::Key_Down); QTest::qWait(10); @@ -3995,7 +3995,7 @@ void tst_QTreeView::taskQTBUG_13567_removeLastItemRegression() view.setSelectionMode(QAbstractItemView::ExtendedSelection); view.setModel(&model); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.scrollToBottom(); QTest::qWait(10); |