Fix an Assert in QTextTable

The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.

Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
(cherry picked from commit d3a6f124dde7732311ad9312ebf41997712fc6bb)

1 files changed, 55 insertions, 0 deletions

diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/qtexttable/tst_qtexttable.cpp
index 43d3d1b699..f2c9309d88 100644
--- a/tests/auto/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/qtexttable/tst_qtexttable.cpp
@@ -48,9 +48,14 @@
 #include <qtexttable.h>
 #include <qdebug.h>
 #include <qtextcursor.h>
+#include <qtextdocument.h>
+#include <qtextedit.h>
 
 //TESTED_FILES=
 
+typedef QList<int> IntList;
+Q_DECLARE_METATYPE(IntList)
+
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
 class tst_QTextTable : public QObject
@@ -78,6 +83,7 @@ private slots:
     void insertRows();
     void deleteInTable();
     void mergeCells();
+    void mergeAndInsert();
     void splitCells();
     void blocksForTableShouldHaveEmptyFormat();
     void removeTableByRemoveRows();
@@ -93,6 +99,8 @@ private slots:
     void removeColumns3();
     void removeColumns4();
     void removeColumns5();
+    void QTBUG11282_insertBeforeMergedEnding_data();
+    void QTBUG11282_insertBeforeMergedEnding();
 
 private:
     QTextTable *create2x2Table();
@@ -586,6 +594,16 @@ void tst_QTextTable::mergeCells()
     QVERIFY(table->cellAt(0, 1) == table->cellAt(1, 1));
 }
 
+void tst_QTextTable::mergeAndInsert()
+{
+    QTextTable *table = cursor.insertTable(4,3);
+    table->mergeCells(0,1,3,2);
+    table->mergeCells(3,0,1,3);
+    //Don't crash !
+    table->insertColumns(1,2);
+    QCOMPARE(table->columns(), 5);
+}
+
 void tst_QTextTable::splitCells()
 {
     QTextTable *table = create4x4Table();
@@ -931,5 +949,42 @@ void tst_QTextTable::removeColumns5()
     QCOMPARE(table->cellAt(3, 2).firstPosition(), 11);
 }
 
+void tst_QTextTable::QTBUG11282_insertBeforeMergedEnding_data()
+{
+    QTest::addColumn<int>("rows");
+    QTest::addColumn<int>("columns");
+    QTest::addColumn<QList<int> >("merge");
+    QTest::addColumn<QList<int> >("insert");
+
+    QTest::newRow("2x3, merge two, insert one") << 2 << 3 << (QList<int>() << 1 << 2 << 2)
+            << (QList<int>() << 1 << 1) ;
+    QTest::newRow("3x4, merge three, insert one") << 3 << 4 << (QList<int>() << 1 << 3 << 3)
+            << (QList<int>() << 1 << 1) ;
+    QTest::newRow("4x3, merge two, insert two") << 4 << 3 << (QList<int>() << 1 << 4 << 2)
+            << (QList<int>() << 1 << 2) ;
+    QTest::newRow("4x4, merge middle two, insert one") << 4 << 4 << (QList<int>() << 1 << 4 << 2)
+            << (QList<int>() << 1 << 1) ;
+}
+
+void tst_QTextTable::QTBUG11282_insertBeforeMergedEnding()
+{
+    QFETCH(int, rows);
+    QFETCH(int, columns);
+    QFETCH(QList<int>, merge);
+    QFETCH(QList<int>, insert);
+    QTextTable *table = cursor.insertTable(rows, columns);
+    QTextEdit *textEdit = new QTextEdit;
+    textEdit->setDocument(doc);
+    textEdit->show();
+    QTest::qWaitForWindowShown(textEdit);
+    table->mergeCells(0,merge.at(0), merge.at(1), merge.at(2));
+    //Don't crash !
+    table->insertColumns(insert.at(0), insert.at(1));
+    //Check that the final size is what we expected
+    QCOMPARE(table->rows(), rows);
+    QCOMPARE(table->columns(), columns + insert.at(1));
+    delete textEdit;
+}
+
 QTEST_MAIN(tst_QTextTable)
 #include "tst_qtexttable.moc"