MCL/sf/mw/qt: comparison tests/auto/qlistview/tst

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 void shiftSelectionWithNonUniformItemSizes();
 void clickOnViewportClearsSelection();
 void task262152_setModelColumnNavigate();
 void taskQTBUG_2233_scrollHiddenItems_data();
 void taskQTBUG_2233_scrollHiddenItems();
+void taskQTBUG_633_changeModelData();
+void taskQTBUG_435_deselectOnViewportClick();
+void taskQTBUG_2678_spacingAndWrappedText();
+void taskQTBUG_5877_skippingItemInPageDownUp();
 };
 // Testing get/set functions
 void tst_QListView::getSetCheck()
 {
 QCoreApplication::processEvents();
 QModelIndex idx = vu.moveCursor(QMoveCursorListView::MoveHome, Qt::NoModifier);
 QCOMPARE(idx, model.index(0,0));
 idx = vu.moveCursor(QMoveCursorListView::MoveDown, Qt::NoModifier);
-QModelIndex p = model.index(8,0);
 QCOMPARE(idx, model.index(8,0));
 }
 void tst_QListView::moveCursor3()
 {
 //this tests is for task 159792
 QCOMPARE(index.row(), 1);
 index = view.indexAt(QPoint(20,2 * sz.height()));
 QVERIFY(!index.isValid());
+// Check when peeking out of the viewport bounds
+index = view.indexAt(QPoint(view.viewport()->rect().width(), 0));
+QVERIFY(!index.isValid());
+index = view.indexAt(QPoint(-1, 0));
+QVERIFY(!index.isValid());
+index = view.indexAt(QPoint(20, view.viewport()->rect().height()));
+QVERIFY(!index.isValid());
+index = view.indexAt(QPoint(20, -1));
+QVERIFY(!index.isValid());
 model.rCount = 30;
 QListViewShowEventListener view2;
 // Set the height to a small enough value so that it wraps to a new section.
 view2.resize(300,100);
 QTest::qWait(500);
 }
 QVERIFY(view2.m_index.isValid());
 QVERIFY(view2.m_index.row() != 0);
 }
 void tst_QListView::clicked()
 {
 QtTestModel model;
 model.setData(model.index(r, c), QString("%1,%2").arg(r).arg(c));
 QListView view;
 view.setModel(&model);
 //
 // Set and get with a valid model
 //
 QCOMPARE(idx.column(), c);
 }
 QCOMPARE(startrow, 2);
 }
 }
 void tst_QListView::hideFirstRow()
 {
 QStringList items;
 for (int i=0; i <100; ++i)
 if (idx.row() >= ba.size())
 ba.resize(idx.row() + 1);
 ba.setBit(idx.row(), true);
 }
 QCOMPARE(ba.size(), 3);
 }
 void tst_QListView::setCurrentIndex()
 {
 QStringList items;
 #else
 v.resize(525,525);
 #endif
 v.show();
+QTest::qWaitForWindowShown(&v);
 QApplication::processEvents();
 v.setSelection(selectionRect, QItemSelectionModel::ClearAndSelect);
 QModelIndexList selected = v.selectionModel()->selectedIndexes();
 QCOMPARE(selected.count(), expectedItems.count());
 for (int i = 0; i < selected.count(); ++i) {
 QVERIFY(expectedItems.contains(selected.at(i).row()));
 }
 }
 void tst_QListView::scrollTo()
 {
 QListView lv;
 list << "Short item";
 model.setStringList(list);
 lv.setModel(&model);
 lv.setFixedSize(100, 200);
 lv.show();
+QTest::qWaitForWindowShown(&lv);
 //by default, the list view scrolls per item and has no wrapping
 QModelIndex index = model.index(6,0);
 //we save the size of the item for later comparisons
 QTest::keyClick(lv.viewport(), Qt::Key_Down, Qt::NoModifier);
 QVERIFY(lv.visualRect(index).y()<0);
 QTest::keyClick(lv.viewport(), Qt::Key_Up, Qt::NoModifier);
 QCOMPARE(lv.visualRect(index).y(), 0);
 }
 void tst_QListView::scrollBarRanges()
 {
 QVERIFY(view.selectionModel()->isSelected(index));
 QTest::mouseRelease(view.viewport(), Qt::LeftButton, 0, point);
 //now the selection should be cleared
 QVERIFY(!view.selectionModel()->hasSelection());
 }
 void tst_QListView::task262152_setModelColumnNavigate()
 {
 QListView view;
 view.setModel(&model);
 view.setModelColumn(1);
 view.show();
-QTest::qWait(100);
+QApplication::setActiveWindow(&view);
+QTest::qWaitForWindowShown(&view);
+QTest::qWait(30);
+QTRY_COMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow());
 QTest::keyClick(&view, Qt::Key_Down);
-QTest::qWait(100);
+QTest::qWait(30);
-QCOMPARE(view.currentIndex(), model.index(1,1));
+QTRY_COMPARE(view.currentIndex(), model.index(1,1));
 QTest::keyClick(&view, Qt::Key_Down);
-QTest::qWait(100);
+QTest::qWait(30);
-QCOMPARE(view.currentIndex(), model.index(2,1));
+QTRY_COMPARE(view.currentIndex(), model.index(2,1));
 }
 void tst_QListView::taskQTBUG_2233_scrollHiddenItems_data()
 {
 QTest::addColumn<int>("flow");
 QVERIFY(index.isValid());
 QCOMPARE(index.row(), 2 * i + 1);
 }
 }
+void tst_QListView::taskQTBUG_633_changeModelData()
+{
+QListView view;
+view.setFlow(QListView::LeftToRight);
+QStandardItemModel model(5,1);
+for (int i = 0; i < model.rowCount(); ++i) {
+model.setData( model.index(i, 0), QString::number(i));
+}
+view.setModel(&model);
+view.show();
+QTest::qWaitForWindowShown(&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));
+QRect rect2 = view.visualRect(model.index(2,0));
+QVERIFY( ! rectLongText.intersects(rect2) );
+}
+void tst_QListView::taskQTBUG_435_deselectOnViewportClick()
+{
+QListView view;
+QStringListModel model( QStringList() << "1" << "2" << "3" << "4");
+view.setModel(&model);
+view.setSelectionMode(QAbstractItemView::ExtendedSelection);
+view.selectAll();
+QCOMPARE(view.selectionModel()->selectedIndexes().count(), model.rowCount());
+QPoint p = view.visualRect(model.index(model.rowCount() - 1)).center() + QPoint(0, 20);
+//first the left button
+QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, p);
+QVERIFY(!view.selectionModel()->hasSelection());
+view.selectAll();
+QCOMPARE(view.selectionModel()->selectedIndexes().count(), model.rowCount());
+//and now the right button
+QTest::mouseClick(view.viewport(), Qt::RightButton, 0, p);
+QVERIFY(!view.selectionModel()->hasSelection());
+}
+void tst_QListView::taskQTBUG_2678_spacingAndWrappedText()
+{
+static const QString lorem("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+QStringListModel model(QStringList() << lorem << lorem << "foo" << lorem << "bar" << lorem << lorem);
+QListView w;
+w.setModel(&model);
+w.setViewMode(QListView::ListMode);
+w.setWordWrap(true);
+w.setSpacing(10);
+w.show();
+QTest::qWaitForWindowShown(&w);
+QCOMPARE(w.horizontalScrollBar()->minimum(), w.horizontalScrollBar()->maximum());
+}
+void tst_QListView::taskQTBUG_5877_skippingItemInPageDownUp()
+{
+QList<int> currentItemIndexes;
+QtTestModel model(0);
+model.colCount = 1;
+model.rCount = 100;
+currentItemIndexes << 0 << 6 << 16 << 25 << 34 << 42 << 57 << 68 << 77
+<< 83 << 91 << 94;
+QMoveCursorListView vu;
+vu.setModel(&model);
+vu.show();
+QTest::qWaitForWindowShown(&vu);
+int itemHeight = vu.visualRect(model.index(0, 0)).height();
+int visibleRowCount = vu.viewport()->height() / itemHeight;
+int scrolledRowCount = visibleRowCount - 1;
+for (int i = 0; i < currentItemIndexes.size(); ++i) {
+vu.selectionModel()->setCurrentIndex(model.index(currentItemIndexes[i], 0),
+QItemSelectionModel::SelectCurrent);
+QModelIndex idx = vu.moveCursor(QMoveCursorListView::MovePageDown, Qt::NoModifier);
+int newCurrent = qMin(currentItemIndexes[i] + scrolledRowCount, 99);
+QCOMPARE(idx, model.index(newCurrent, 0));
+idx = vu.moveCursor(QMoveCursorListView::MovePageUp, Qt::NoModifier);
+newCurrent = qMax(currentItemIndexes[i] - scrolledRowCount, 0);
+QCOMPARE(idx, model.index(newCurrent, 0));
+}
+}
 QTEST_MAIN(tst_QListView)
 #include "tst_qlistview.moc"

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7