summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtexttable/tst_qtexttable.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-14 03:52:48 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-14 03:52:48 (GMT)
commitb2002d0814e18f7a50bdbf8d17c4bc1662fa70ee (patch)
treec1489ec6b23f7d6e01b3e44676d3018e334056a4 /tests/auto/qtexttable/tst_qtexttable.cpp
parent05971cf88bf03f2cbf563cb194ebee62bb907394 (diff)
downloadQt-b2002d0814e18f7a50bdbf8d17c4bc1662fa70ee.zip
Qt-b2002d0814e18f7a50bdbf8d17c4bc1662fa70ee.tar.gz
Qt-b2002d0814e18f7a50bdbf8d17c4bc1662fa70ee.tar.bz2
Revert "Fix an Assert in QTextTable"
This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3. Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding fails on mac and Linux, reverting for now.
Diffstat (limited to 'tests/auto/qtexttable/tst_qtexttable.cpp')
-rw-r--r--tests/auto/qtexttable/tst_qtexttable.cpp54
1 files changed, 0 insertions, 54 deletions
diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/qtexttable/tst_qtexttable.cpp
index b0cb34d..2e6007e 100644
--- a/tests/auto/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/qtexttable/tst_qtexttable.cpp
@@ -48,14 +48,9 @@
#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
@@ -83,7 +78,6 @@ private slots:
void insertRows();
void deleteInTable();
void mergeCells();
- void mergeAndInsert();
void splitCells();
void blocksForTableShouldHaveEmptyFormat();
void removeTableByRemoveRows();
@@ -99,8 +93,6 @@ private slots:
void removeColumns3();
void removeColumns4();
void removeColumns5();
- void QTBUG11282_insertBeforeMergedEnding_data();
- void QTBUG11282_insertBeforeMergedEnding();
private:
QTextTable *create2x2Table();
@@ -594,16 +586,6 @@ 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();
@@ -949,41 +931,5 @@ 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));
-}
-
QTEST_MAIN(tst_QTextTable)
#include "tst_qtexttable.moc"