diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
5 files changed, 19 insertions, 17 deletions
diff --git a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro index 7acbe016d5..4980b45389 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro +++ b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro @@ -3,6 +3,6 @@ CONFIG += parallel_test QT += widgets widgets-private QT += gui-private core-private testlib -SOURCES += tst_qcolumnview.cpp +SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp index 85ee7144c9..6ef0988f31 100644 --- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp +++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp @@ -362,8 +362,10 @@ void tst_QDataWidgetMapper::comboBox() mapper.addMapping(&readWriteBox, 1, "currentText"); mapper.toFirst(); + // setCurrentIndex caused the value at index 0 to be displayed QCOMPARE(readOnlyBox.currentText(), QString("read only item 0")); - QCOMPARE(readWriteBox.currentText(), QString("read write item 0")); + // setCurrentText set the value in the line edit since the combobox is editable + QCOMPARE(readWriteBox.currentText(), QString("item 0 1")); // set some new values on the boxes readOnlyBox.setCurrentIndex(1); @@ -380,7 +382,6 @@ void tst_QDataWidgetMapper::comboBox() model->setData(model->index(0, 1), QString("read write item z"), Qt::EditRole); QCOMPARE(readOnlyBox.currentIndex(), 2); - QEXPECT_FAIL("", "See task 125493 and QTBUG-428", Abort); QCOMPARE(readWriteBox.currentText(), QString("read write item z")); } diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 8458ca78fb..8b8f7e8949 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -115,7 +115,9 @@ private slots: void scrollBarAsNeeded(); void moveItems(); void wordWrap(); +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500 void setCurrentIndexAfterAppendRowCrash(); +#endif void emptyItemSize(); void task203585_selectAll(); void task228566_infiniteRelayout(); @@ -1510,15 +1512,14 @@ private: }; #endif +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500 +// This test only makes sense on windows 2000 and higher. void tst_QListView::setCurrentIndexAfterAppendRowCrash() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500 SetCurrentIndexAfterAppendRowCrashDialog w; w.exec(); -#else - QSKIP("This test only makes sense on windows 2000 and higher."); -#endif } +#endif void tst_QListView::emptyItemSize() { diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 2bccb03845..80d77aa652 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -4065,9 +4065,9 @@ void tst_QTableView::taskQTBUG_8777_scrollToSpans() } void tst_QTableView::taskQTBUG_10169_sizeHintForRow() -{ - QtTestTableView tableView; - QStandardItemModel model(1, 3); +{ + QtTestTableView tableView; + QStandardItemModel model(1, 3); model.setData(model.index(0, 0), "Word wrapping text goes here."); tableView.setModel(&model); tableView.verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index 2c93492fe9..e141ec294d 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -130,7 +130,7 @@ void tst_QTableWidget::getSetCheck() // QCOMPARE(INT_MAX, obj1.rowCount()); obj1.setRowCount(100); QCOMPARE(100, obj1.rowCount()); - + // int QTableWidget::columnCount() // void QTableWidget::setColumnCount(int) @@ -584,7 +584,7 @@ void tst_QTableWidget::selectedItems() } if (hidden) continue; - + for (int column = 0; column<testWidget->columnCount(); ++column) { foreach (int hiddenColumn, hiddenColumns){ if(hiddenColumn == column){ @@ -594,7 +594,7 @@ void tst_QTableWidget::selectedItems() } if (hidden) continue; - + QTableWidgetItem *item = testWidget->item(row, column); if (item && testWidget->isItemSelected(item)) QVERIFY(selectedItems.contains(item)); @@ -1321,7 +1321,7 @@ void tst_QTableWidget::setItemWithSorting() QAbstractItemModel *model = w.model(); QList<QPersistentModelIndex> persistent; - + int ti = 0; for (int r = 0; r < rowCount; ++r) { for (int c = 0; c < columnCount; ++c) { @@ -1330,10 +1330,10 @@ void tst_QTableWidget::setItemWithSorting() } persistent << model->index(r, sortColumn); } - + w.sortItems(sortColumn, static_cast<Qt::SortOrder>(sortOrder)); w.setSortingEnabled(true); - + QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex))); QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged())); @@ -1354,7 +1354,7 @@ void tst_QTableWidget::setItemWithSorting() QCOMPARE(w.item(r, c)->text(), str); } } - + for (int k = 0; k < persistent.count(); ++k) { QCOMPARE(persistent.at(k).row(), expectedRows.at(k)); int i = (persistent.at(k).row() * columnCount) + sortColumn; |