summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextpiecetable
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-08 11:51:23 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-09-08 11:51:23 (GMT)
commitc88f8d6337a2273f8dc5fb44830823c8d17354a3 (patch)
treea27787bceabf8a75cc2cc5ecbaa998553bd5cc68 /tests/auto/qtextpiecetable
parentbeea786c9d1362b1fb12fdff209b842e21ef9cf8 (diff)
parent0399ace27c7441b4454911da3aaa4ea17b931b99 (diff)
downloadQt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.zip
Qt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.tar.gz
Qt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qtextpiecetable')
-rw-r--r--tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
index 6f8dd2b..61f4456 100644
--- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -772,7 +772,9 @@ void tst_QTextPieceTable::blockRemoval1()
QVERIFY(table->blocksFind(6).position() == 5);
QVERIFY(table->blocksFind(11).position() == 10);
+ table->beginEditBlock();
table->remove(5, 5);
+ table->endEditBlock();
QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
QVERIFY(table->blocksFind(5).blockFormat() == fmt2);
QVERIFY(table->blocksFind(4).position() == 0);
@@ -864,7 +866,10 @@ void tst_QTextPieceTable::blockRemoval3()
QVERIFY(table->blocksFind(6).position() == 5);
QVERIFY(table->blocksFind(11).position() == 10);
+ table->beginEditBlock();
table->remove(3, 4);
+ table->endEditBlock();
+
QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
QVERIFY(table->blocksFind(1).position() == 0);
@@ -958,7 +963,10 @@ void tst_QTextPieceTable::blockRemoval5()
QVERIFY(table->blocksFind(6).position() == 5);
QVERIFY(table->blocksFind(11).position() == 10);
+ table->beginEditBlock();
table->remove(3, 8);
+ table->endEditBlock();
+
QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
QVERIFY(table->blocksFind(1).position() == 0);