diff --git a/autotest/snorebenchmark.cpp b/autotest/snorebenchmark.cpp index 768de13..0fd9efa 100644 --- a/autotest/snorebenchmark.cpp +++ b/autotest/snorebenchmark.cpp @@ -25,41 +25,32 @@ public: "Bold
" "Underline
" "Font
" - "<&>" + "<&>
" "Website
"); private slots: void benchmarkUtilsToHtml(); void benchmarkUtilsToHtmlAllMarkup(); void benchmarkUtilsToPlain(); -private: - -/** - * old toPlaintext function from Utils. - * @param string A string to decode if needed. - * @return if the string was rhichtext or html encoded a decoded string, else the original string. - */ -static inline QString toPlainText(const QString &string) -{ - if (Qt::mightBeRichText(string)) { - return QTextDocumentFragment::fromHtml(string).toPlainText(); - } else { - return string; - } -} }; void SnoreBenchmark::benchmarkUtilsToHtml(){ - QCOMPARE(Utils::normaliseMarkup(htmlTestString, Utils::NO_MARKUP), toPlainText(htmlTestString)); + QCOMPARE(Utils::normaliseMarkup(htmlTestString, Utils::NO_MARKUP), QString("Italic A\n" + "Italic B\n" + "Bold\n" + "Underline\n" + "Font\n" + "<&>\n" + "Website\n")); QCOMPARE(Utils::normaliseMarkup(htmlTestString, Utils::HREF), QString("Italic A\n" "Italic B\n" "Bold\n" "Underline\n" "Font\n" - "<&>" + "<&>\n" "Website\n")); QCOMPARE(Utils::normaliseMarkup(htmlTestString, Utils::HREF | Utils::BOLD | Utils::BREAK | Utils::UNDERLINE | Utils::FONT | Utils::ITALIC), htmlTestString);