1 files changed, 50 insertions, 0 deletions
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index 5eded52..eea3ff0 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -161,6 +161,10 @@ private slots:
 
     void testUndoCommandAdded();
 
+    void testUndoBlocks();
+
+    void receiveCursorPositionChangedAfterContentsChange();
+
 private:
     void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
 
@@ -2435,5 +2439,51 @@ void tst_QTextDocument::testUndoCommandAdded()
     QCOMPARE(spy.count(), 1);
 }
 
+void tst_QTextDocument::testUndoBlocks()
+{
+    QVERIFY(doc);
+    cursor.insertText("Hello World");
+    cursor.insertText("period");
+    doc->undo();
+    QCOMPARE(doc->toPlainText(), QString(""));
+    cursor.insertText("Hello World");
+    cursor.insertText("One\nTwo\nThree");
+    QCOMPARE(doc->toPlainText(), QString("Hello WorldOne\nTwo\nThree"));
+    doc->undo();
+    QCOMPARE(doc->toPlainText(), QString("Hello World"));
+    doc->undo();
+    QCOMPARE(doc->toPlainText(), QString(""));
+}
+
+class Receiver : public QObject
+{
+    Q_OBJECT
+ public:
+    QString first;
+ public slots:
+    void cursorPositionChanged() {
+        if (first.isEmpty())
+            first = QLatin1String("cursorPositionChanged");
+    }
+
+    void contentsChange() {
+        if (first.isEmpty())
+            first = QLatin1String("contentsChanged");
+    }
+};
+
+void tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange()
+{
+    QVERIFY(doc);
+    doc->setDocumentLayout(new MyAbstractTextDocumentLayout(doc));
+    Receiver rec;
+    connect(doc, SIGNAL(cursorPositionChanged(QTextCursor)),
+            &rec, SLOT(cursorPositionChanged()));
+    connect(doc, SIGNAL(contentsChange(int,int,int)),
+            &rec, SLOT(contentsChange()));
+    cursor.insertText("Hello World");
+    QCOMPARE(rec.first, QString("contentsChanged"));
+}
+
 QTEST_MAIN(tst_QTextDocument)
 #include "tst_qtextdocument.moc"