From e5c04205903b7c413fe09be321fc4becf60a3c51 Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Tue, 17 Apr 2012 14:24:06 +1000 Subject: Improve StyledText tests Extra tests for anchors and invalid input. Task-number: QTBUG-25134 Change-Id: Ib465e0aba2fc5671c7f044d1bb655247d562d1f1 Reviewed-by: Alan Alpert --- .../qquickstyledtext/tst_qquickstyledtext.cpp | 70 +++++++++++++++++++++- 1 file changed, 67 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qquickstyledtext') diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp index 35ce724a64..d6e5370711 100644 --- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp +++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp @@ -56,7 +56,8 @@ public: enum Type { Bold = 0x01, Underline = 0x02, - Italic = 0x04 + Italic = 0x04, + Anchor = 0x08 }; Format(int t, int s, int l) : type(t), start(s), length(l) {} @@ -73,6 +74,9 @@ public: private slots: void textOutput(); void textOutput_data(); + void anchors(); + void anchors_data(); + void longString(); }; Q_DECLARE_METATYPE(tst_qquickstyledtext::FormatList); @@ -90,7 +94,13 @@ void tst_qquickstyledtext::textOutput_data() QTest::addColumn("formats"); QTest::addColumn("modifiesFontSize"); + QTest::newRow("empty") << "" << "" << FormatList() << false; + QTest::newRow("empty tag") << "<>test" << "test" << FormatList() << false; + QTest::newRow("nest opening") << ">test" << ">test" << FormatList() << false; + QTest::newRow("nest closing") << "test</b>" << "test/b>" << (FormatList() << Format(Format::Bold, 0, 7)) << false; QTest::newRow("bold") << "bold" << "bold" << (FormatList() << Format(Format::Bold, 0, 4)) << false; + QTest::newRow("bold 2") << ">>>>bold" << ">>>>bold" << (FormatList() << Format(Format::Bold, 0, 8)) << false; + QTest::newRow("bold 3") << "bold<>/b>" << "bold/b>" << (FormatList() << Format(Format::Bold, 0, 7)) << false; QTest::newRow("italic") << "italic" << "italic" << (FormatList() << Format(Format::Italic, 0, 6)) << false; QTest::newRow("underline") << "underline" << "underline" << (FormatList() << Format(Format::Underline, 0, 9)) << false; QTest::newRow("strong") << "strong" << "strong" << (FormatList() << Format(Format::Bold, 0, 6)) << false; @@ -111,11 +121,10 @@ void tst_qquickstyledtext::textOutput_data() QTest::newRow("extra space") << "text" << "text" << (FormatList() << Format(Format::Bold, 0, 4)) << false; QTest::newRow("entities") << "<b>this & that</b>" << "this & that" << FormatList() << false; QTest::newRow("newline") << "text
more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; + QTest::newRow("self-closing newline") << "text
more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; QTest::newRow("paragraph") << "text

more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; QTest::newRow("paragraph closed") << "text

more text

more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; QTest::newRow("paragraph closed bold") << "text

more text

more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << (FormatList() << Format(Format::Bold, 0, 24)) << false; - QTest::newRow("self-closing newline") << "text
more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; - QTest::newRow("empty") << "" << "" << FormatList() << false; QTest::newRow("unknown tag") << "underline not" << "underline not" << (FormatList() << Format(Format::Underline, 0, 9)) << false; QTest::newRow("ordered list") << "
  1. one
  2. two" << QChar(QChar::LineSeparator) + QString(6, QChar::Nbsp) + QLatin1String("1.") + QString(2, QChar::Nbsp) + QLatin1String("one") + QChar(QChar::LineSeparator) + QString(6, QChar::Nbsp) + QLatin1String("2.") + QString(2, QChar::Nbsp) + QLatin1String("two") << FormatList() << false; QTest::newRow("ordered list closed") << "
    1. one
    2. two
    " << QChar(QChar::LineSeparator) + QString(6, QChar::Nbsp) + QLatin1String("1.") + QString(2, QChar::Nbsp) + QLatin1String("one") + QChar(QChar::LineSeparator) + QString(6, QChar::Nbsp) + QLatin1String("2.") + QString(2, QChar::Nbsp) + QLatin1String("two") + QChar(QChar::LineSeparator) << FormatList() << false; @@ -151,6 +160,7 @@ void tst_qquickstyledtext::textOutput_data() QTest::newRow("space leading bold") << "this is bold" << "this is bold" << (FormatList() << Format(Format::Bold, 7, 5)) << false; QTest::newRow("space trailing bold") << "this is bold " << "this is bold " << (FormatList() << Format(Format::Bold, 8, 5)) << false; QTest::newRow("img") << "ab" << "a b" << FormatList() << false; + QTest::newRow("tag mix") << "dsgfhghjdfgdfg    ewrqjklhj" << "dsgfhghjdfgdfgewrqjklhj" << (FormatList() << Format(Format::Bold, 2, 3)) << false; } void tst_qquickstyledtext::textOutput() @@ -183,6 +193,60 @@ void tst_qquickstyledtext::textOutput() QCOMPARE(fontSizeModified, modifiesFontSize); } +void tst_qquickstyledtext::anchors() +{ + QFETCH(QString, input); + QFETCH(QString, output); + QFETCH(FormatList, formats); + + QTextLayout layout; + QList imgTags; + bool fontSizeModified = false; + QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified); + + QCOMPARE(layout.text(), output); + + QList layoutFormats = layout.additionalFormats(); + + QCOMPARE(layoutFormats.count(), formats.count()); + for (int i = 0; i < formats.count(); ++i) { + QCOMPARE(layoutFormats.at(i).start, formats.at(i).start); + QCOMPARE(layoutFormats.at(i).length, formats.at(i).length); + QVERIFY(layoutFormats.at(i).format.isAnchor() == bool(formats.at(i).type & Format::Anchor)); + } +} + +void tst_qquickstyledtext::anchors_data() +{ + QTest::addColumn("input"); + QTest::addColumn("output"); + QTest::addColumn("formats"); + + QTest::newRow("empty 1") << "Test string with url." << "Test string with url." << FormatList(); + QTest::newRow("empty 2") << "Test string with url." << "Test string with url." << FormatList(); + QTest::newRow("unknown attr") << "Test string with @ok-hostname\">url." << "Test string with url." << FormatList(); + QTest::newRow("close") << "Test string with @ok-hostname\"/>url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 4)); + QTest::newRow("username") << "Test string with @ok-hostname\">url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 3)); + QTest::newRow("query") << "Test string with url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 3)); + QTest::newRow("ipv6") << "Test string with url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 3)); + QTest::newRow("uni") << "Test string with url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 3)); + QTest::newRow("utf8") << "Test string with url." << "Test string with url." << (FormatList() << Format(Format::Anchor, 17, 3)); +} + +void tst_qquickstyledtext::longString() +{ + QTextLayout layout; + QList imgTags; + bool fontSizeModified = false; + + QString input(9999999, QChar('.')); + QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified); + QCOMPARE(layout.text(), input); + + input = QString(9999999, QChar('\t')); // whitespace + QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified); + QCOMPARE(layout.text(), QString("")); +} QTEST_MAIN(tst_qquickstyledtext) -- cgit v1.2.3