From 5a569ea4677d35c81f1e381cacd0395a8ef1dbce Mon Sep 17 00:00:00 2001 From: noavarice Date: Fri, 25 Aug 2017 23:38:02 +0300 Subject: [PATCH] test: re-made test for URL highlighting Also one test was removed. Answering sudden6's question, this test will not pass after merging current pull request (if it will) --- test/chatlog/textformatter_test.cpp | 89 ++++++++++++++++------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/test/chatlog/textformatter_test.cpp b/test/chatlog/textformatter_test.cpp index b8beb0ec5..239831560 100644 --- a/test/chatlog/textformatter_test.cpp +++ b/test/chatlog/textformatter_test.cpp @@ -153,46 +153,31 @@ static const QVector MIXED_FORMATTING_SPECIAL_CASES { PAIR_FORMAT("aaa *aaa /aaa* aaa/", "aaa *aaa aaa* aaa"), }; -static const StringToString urlCases{ - {QStringLiteral("https://github.com/qTox/qTox/issues/4233"), - QStringLiteral("" - "https://github.com/qTox/qTox/issues/4233")}, - {QStringLiteral("No conflicts with /italic https://github.com/qTox/qTox/issues/4233 font/"), - QStringLiteral("No conflicts with italic " - "" - "https://github.com/qTox/qTox/issues/4233 font")}, - {QStringLiteral("www.youtube.com"), - QStringLiteral("www.youtube.com")}, - {QStringLiteral("https://url.com/some*url/some*more*url/"), - QStringLiteral("" - "https://url.com/some*url/some*more*url/")}, - {QStringLiteral("https://url.com/some_url/some_more_url/"), - QStringLiteral("" - "https://url.com/some_url/some_more_url/")}, - {QStringLiteral("https://url.com/some~url/some~more~url/"), - QStringLiteral("" - "https://url.com/some~url/some~more~url/")}, - {QStringLiteral("https://url.com/some`url/some`more`url/"), - QStringLiteral("" - "https://url.com/some`url/some`more`url/")}, +#define MAKE_LINK(url) "" url "" + +static const QVector> URL_CASES { + PAIR_FORMAT("https://github.com/qTox/qTox/issues/4233", + MAKE_LINK("https://github.com/qTox/qTox/issues/4233")), + PAIR_FORMAT("www.youtube.com", MAKE_LINK("www.youtube.com")), + PAIR_FORMAT("https://url.com/some*url/some*more*url/", + MAKE_LINK("https://url.com/some*url/some*more*url/")), + PAIR_FORMAT("https://url.com/some_url/some_more_url/", + MAKE_LINK("https://url.com/some_url/some_more_url/")), + PAIR_FORMAT("https://url.com/some~url/some~more~url/", + MAKE_LINK("https://url.com/some~url/some~more~url/")), // Test case from issue #4275 - {QStringLiteral("http://www.metacritic.com/game/pc/mass-effect-andromeda\n" - "http://www.metacritic.com/game/playstation-4/mass-effect-andromeda\n" - "http://www.metacritic.com/game/xbox-one/mass-effect-andromeda"), - QStringLiteral("" - "http://www.metacritic.com/game/pc/mass-effect-andromeda\n" - "http://www.metacritic.com/game/playstation-4/mass-effect-andromeda\n" - "" - "http://www.metacritic.com/game/xbox-one/mass-effect-andromeda")}, - {QStringLiteral("http://site.com/part1/part2 " - "http://site.com/part3 " - "and one more time " - "www.site.com/part1/part2"), - QStringLiteral("http://site.com/part1/part2 " - "http://site.com/part3 " - "and one more time " - "www.site.com/part1/part2")}, + PAIR_FORMAT("http://www.metacritic.com/game/pc/mass-effect-andromeda\n" + "http://www.metacritic.com/game/playstation-4/mass-effect-andromeda\n" + "http://www.metacritic.com/game/xbox-one/mass-effect-andromeda", + MAKE_LINK("http://www.metacritic.com/game/pc/mass-effect-andromeda") "\n" + MAKE_LINK("http://www.metacritic.com/game/playstation-4/mass-effect-andromeda") "\n" + MAKE_LINK("http://www.metacritic.com/game/xbox-one/mass-effect-andromeda")), + PAIR_FORMAT("http://site.com/part1/part2 " + "http://site.com/part3 and one more time " + "www.site.com/part1/part2", + MAKE_LINK("http://site.com/part1/part2") " " + MAKE_LINK("http://site.com/part3") " and one more time " + MAKE_LINK("www.site.com/part1/part2")), }; #undef PAIR_FORMAT @@ -276,6 +261,23 @@ static void specialCasesTest(MarkdownFunction applyMarkdown, } } +using UrlHighlightFunction = QString(*)(const QString&); + +/** + * @brief Function for testing URL highlighting + * @param data Test data - map of "URL - HTML-wrapped URL" + */ +static void urlHighlightTest(UrlHighlightFunction function, const QVector>& data) +{ + for (const QPair& p : data) { + qDebug() << "Input:" << p.first; + qDebug() << "Output:" << p.second; + QString result = function(p.first); + qDebug() << "Observed output:" << result; + QVERIFY(p.second == result); + } +} + class TestTextFormatter : public QObject { Q_OBJECT @@ -293,8 +295,10 @@ private slots: void singleAndDoubleMarkdownExceptionsShowSymbols(); void singleAndDoubleMarkdownExceptionsHideSymbols(); void mixedFormattingSpecialCases(); + void urlTest(); private: - MarkdownFunction markdownFunction; + const MarkdownFunction markdownFunction = applyMarkdown; + UrlHighlightFunction urlHighlightFunction = highlightURL; }; static QString commonWorkCasesProcessInput(const QString& str, const MarkdownToTags& mtt) @@ -443,6 +447,11 @@ void TestTextFormatter::mixedFormattingSpecialCases() specialCasesTest(markdownFunction, MIXED_FORMATTING_SPECIAL_CASES); } +void TestTextFormatter::urlTest() +{ + urlHighlightTest(urlHighlightFunction, URL_CASES); +} + QTEST_GUILESS_MAIN(TestTextFormatter) #include "textformatter_test.moc"