diff options
author | David Faure <faure@kde.org> | 2011-09-29 13:31:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 15:22:07 +0200 |
commit | b863df7de926448cf0057272c16da04b7cfb11ee (patch) | |
tree | 378b951c3ad748bcb6250d8d33d9be55494933e2 /tests/auto/gui/text | |
parent | 7fb90066b3aa7e602466a61e0ffaadbf9002525c (diff) |
Rename Qt::escape to QString::toHtmlEscaped, add compat method
Merge-request: 56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: I46bbb2df10968e88b5eb5ef8dae182a651b622b8
Reviewed-on: http://codereview.qt-project.org/5793
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'tests/auto/gui/text')
-rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index c98a703acc..ea8878e9f1 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -177,8 +177,6 @@ private slots: void testUndoBlocks(); void receiveCursorPositionChangedAfterContentsChange(); - void escape_data(); - void escape(); void copiedFontSize(); @@ -2718,26 +2716,6 @@ void tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() QCOMPARE(rec.first, QString("contentsChanged")); } -void tst_QTextDocument::escape_data() -{ - QTest::addColumn<QString>("original"); - QTest::addColumn<QString>("expected"); - - QTest::newRow("1") << "Hello World\n" << "Hello World\n"; - QTest::newRow("2") << "#include <QtCore>" << "#include <QtCore>"; - QTest::newRow("3") << "<p class=\"cool\"><a href=\"http://example.com/?foo=bar&bar=foo\">plop --> </a></p>" - << "<p class="cool"><a href="http://example.com/?foo=bar&amp;bar=foo">plop --&gt; </a></p>"; - QTest::newRow("4") << QString::fromUtf8("<\320\222\321\201>") << QString::fromUtf8("<\320\222\321\201>"); -} - -void tst_QTextDocument::escape() -{ - QFETCH(QString, original); - QFETCH(QString, expected); - - QCOMPARE(Qt::escape(original), expected); -} - void tst_QTextDocument::copiedFontSize() { QTextDocument documentInput; |