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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 **
 ****************************************************************************/
 #include <QtGui/QtGui>
+#include <private/qtablewidget_p.h>
 #include <QtTest/QtTest>
 #include "../../shared/util.h"
 #include "private/qapplication_p.h"
 //TESTED_CLASS=
 for (int i = 0; i < 2000 && expr != expected; i+=step) { \
 QTest::qWait(step); \
 } \
 } while(0)
+#ifdef QT_BUILD_INTERNAL
+#define VERIFY_SPANS_CONSISTENCY(TEST_VIEW_) \
+QVERIFY(static_cast<QTableViewPrivate*>(QObjectPrivate::get(TEST_VIEW_))->spans.checkConsistency())
+#else
+#define VERIFY_SPANS_CONSISTENCY(TEST_VIEW_) (void)false
+#endif
 typedef QList<int> IntList;
 Q_DECLARE_METATYPE(IntList)
 typedef QList<bool> BoolList;
 Q_DECLARE_METATYPE(BoolList)
 void task227953_setRootIndex();
 void task240266_veryBigColumn();
 void task248688_autoScrollNavigation();
 void task259308_scrollVerticalHeaderSwappedSections();
 void task191545_dragSelectRows();
+void taskQTBUG_5062_spansInconsistency();
+void taskQTBUG_4516_clickOnRichTextLabel();
+void taskQTBUG_5237_wheelEventOnHeader();
 void mouseWheel_data();
 void mouseWheel();
 void addColumnWhileEditing();
 void task234926_setHeaderSorting();
+void changeHeaderData();
 };
 // Testing get/set functions
 void tst_QTableView::getSetCheck()
 {
 QSignalSpy resizedSpy(view.verticalHeader(), SIGNAL(sectionResized(int, int, int)));
 view.resizeRowsToContents();
 QCOMPARE(resizedSpy.count(), model.rowCount());
-for (int r = 0; r < model.rowCount(); ++r)
+for (int r = 0; r < model.rowCount(); ++r) {
 QCOMPARE(view.rowHeight(r), rowHeight);
+}
 }
 void tst_QTableView::resizeColumnsToContents_data()
 {
 QTest::addColumn<int>("rowCount");
 }
 view.clearSpans();
 QCOMPARE(view.rowSpan(row, column), 1);
 QCOMPARE(view.columnSpan(row, column), 1);
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 typedef QVector<QRect> SpanList;
 Q_DECLARE_METATYPE(SpanList)
 << (SpanList() << QRect(0, 0, 2, 2) << QRect(2, 0, 1, 2))
 << true //we hide the last row of the first span
 << QPoint(2, 0)
 << 1
 << 2;
+QTest::newRow("QTBUG-6004: No failing Q_ASSERT, then it passes.")
+<< 5 << 5
+<< (SpanList() << QRect(0, 0, 2, 2) << QRect(0, 0, 1, 1))
+<< false
+<< QPoint(0, 0)
+<< 1
+<< 1;
 }
 void tst_QTableView::spans()
 {
 QFETCH(int, rows);
 QVERIFY(first.intersected(next).isEmpty());
 }
 QCOMPARE(view.columnSpan(pos.x(), pos.y()), expectedColumnSpan);
 QCOMPARE(view.rowSpan(pos.x(), pos.y()), expectedRowSpan);
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 void tst_QTableView::spansAfterRowInsertion()
 {
 QtTestTableModel model(10, 10);
 // Insertion after the span does nothing to it.
 view.model()->insertRows(12, 2);
 QCOMPARE(view.rowSpan(7, 3), 5);
 QCOMPARE(view.columnSpan(7, 3), 3);
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 void tst_QTableView::spansAfterColumnInsertion()
 {
 QtTestTableModel model(10, 10);
 // Insertion after the span does nothing to it.
 view.model()->insertColumns(12, 2);
 QCOMPARE(view.rowSpan(3, 7), 3);
 QCOMPARE(view.columnSpan(3, 7), 5);
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 void tst_QTableView::spansAfterRowRemoval()
 {
 QtTestTableModel model(10, 10);
 << QRect(6, 4, 1, 3);
 foreach (QRect span, expectedSpans) {
 QCOMPARE(view.columnSpan(span.top(), span.left()), span.width());
 QCOMPARE(view.rowSpan(span.top(), span.left()), span.height());
 }
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 void tst_QTableView::spansAfterColumnRemoval()
 {
 QtTestTableModel model(10, 10);
 << QRect(6, 4, 1, 3);
 foreach (QRect span, expectedSpans) {
 QCOMPARE(view.columnSpan(span.left(), span.top()), span.height());
 QCOMPARE(view.rowSpan(span.left(), span.top()), span.width());
 }
+VERIFY_SPANS_CONSISTENCY(&view);
 }
 class Model : public QAbstractTableModel {
 Q_OBJECT
 table3.resizeColumnsToContents();
 table3.resizeRowsToContents();
 //now let's check the row/col sizes
 for(int i = 0;i<table.columnCount();i++) {
-QVERIFY( table.columnWidth(i) == table2.columnWidth(i));
+QCOMPARE( table.columnWidth(i), table2.columnWidth(i));
-QVERIFY( table2.columnWidth(i) == table3.columnWidth(i));
+QCOMPARE( table2.columnWidth(i), table3.columnWidth(i));
 }
 for(int i = 0;i<table.rowCount();i++) {
-QVERIFY( table.rowHeight(i) == table2.rowHeight(i));
+QCOMPARE( table.rowHeight(i), table2.rowHeight(i));
-QVERIFY( table2.rowHeight(i) == table3.rowHeight(i));
+QCOMPARE( table2.rowHeight(i), table3.rowHeight(i));
 }
 }
 QT_BEGIN_NAMESPACE
 << int(QAbstractItemView::ScrollPerItem) << 120
 << 10 - qApp->wheelScrollLines() << 10 - qApp->wheelScrollLines();
 QTest::newRow("scroll down per item")
 << int(QAbstractItemView::ScrollPerItem) << -120
 << 10 + qApp->wheelScrollLines() << 10 + qApp->wheelScrollLines();
-#ifdef Q_WS_MAC
-// On Mac, we always scroll one pixel per 120 delta (rather than multiplying with
-// singleStep) since wheel events are accelerated by the OS.
-QTest::newRow("scroll down per pixel")
-<< int(QAbstractItemView::ScrollPerPixel) << -120
-<< 10 + qApp->wheelScrollLines() << 10 + qApp->wheelScrollLines();
-#else
 QTest::newRow("scroll down per pixel")
 << int(QAbstractItemView::ScrollPerPixel) << -120
 << 10 + qApp->wheelScrollLines() * 89 << 10 + qApp->wheelScrollLines() * 28;
-#endif
 }
 void tst_QTableView::mouseWheel()
 {
 #ifdef Q_OS_WINCE
 h->setSortIndicator(0, Qt::DescendingOrder);
 QApplication::processEvents();
 QCOMPARE(model.stringList() , sortedDataD);
 }
+void tst_QTableView::taskQTBUG_5062_spansInconsistency()
+{
+const int nRows = 5;
+const int nColumns = 5;
+QtTestTableModel model(nRows, nColumns);
+QtTestTableView view;
+view.setModel(&model);
+for (int i = 0; i < nRows; ++i)
+view.setSpan(i, 0, 1, nColumns);
+view.setSpan(2, 0, 1, 1);
+view.setSpan(3, 0, 1, 1);
+VERIFY_SPANS_CONSISTENCY(&view);
+}
+void tst_QTableView::taskQTBUG_4516_clickOnRichTextLabel()
+{
+QTableView view;
+QStandardItemModel model(5,5);
+view.setModel(&model);
+QLabel label("rich text");
+label.setTextFormat(Qt::RichText);
+view.setIndexWidget(model.index(1,1), &label);
+view.setCurrentIndex(model.index(0,0));
+QCOMPARE(view.currentIndex(), model.index(0,0));
+QTest::mouseClick(&label, Qt::LeftButton);
+QCOMPARE(view.currentIndex(), model.index(1,1));
+}
+void tst_QTableView::changeHeaderData()
+{
+QTableView view;
+QStandardItemModel model(5,5);
+view.setModel(&model);
+view.show();
+QTest::qWaitForWindowShown(&view);
+QString text = "long long long text";
+const int textWidth = view.verticalHeader()->fontMetrics().width(text);
+QVERIFY(view.verticalHeader()->width() < textWidth);
+model.setHeaderData(2, Qt::Vertical, text);
+QTest::qWait(100); //leave time for layout
+QVERIFY(view.verticalHeader()->width() > textWidth);
+}
+void tst_QTableView::taskQTBUG_5237_wheelEventOnHeader()
+{
+QTableView view;
+QStandardItemModel model(500,5);
+view.setModel(&model);
+view.show();
+QTest::qWaitForWindowShown(&view);
+int sbValueBefore = view.verticalScrollBar()->value();
+QHeaderView *header = view.verticalHeader();
+QTest::mouseMove(header);
+QWheelEvent wheelEvent(header->geometry().center(), -720, 0, 0);
+QApplication::sendEvent(header->viewport(), &wheelEvent);
+int sbValueAfter = view.verticalScrollBar()->value();
+QVERIFY(sbValueBefore != sbValueAfter);
+}
 QTEST_MAIN(tst_QTableView)
 #include "tst_qtableview.moc"

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