X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c623522ecb82c546fc1dd27b77da7a064e5913f9..47f1287472044d67a1cd40ec013979ab2eda9b3f:/src/tests/dolphinquerytest.cpp diff --git a/src/tests/dolphinquerytest.cpp b/src/tests/dolphinquerytest.cpp index 2b025eed7..b6feab686 100644 --- a/src/tests/dolphinquerytest.cpp +++ b/src/tests/dolphinquerytest.cpp @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include #include @@ -28,11 +28,9 @@ private Q_SLOTS: /** * Helper function to compose the baloo query URL used for searching */ -QUrl balooQueryUrl(const QString& searchString) +QUrl balooQueryUrl(const QString &searchString) { - const QJsonObject jsonObject { - {"searchString", searchString} - }; + const QJsonObject jsonObject{{"searchString", searchString}}; const QJsonDocument doc(jsonObject); const QString queryString = QString::fromUtf8(doc.toJson(QJsonDocument::Compact)); @@ -57,7 +55,6 @@ void DolphinQueryTest::initTestCase() */ void DolphinQueryTest::testBalooSearchParsing_data() { - QTest::addColumn("searchUrl"); QTest::addColumn("expectedText"); QTest::addColumn("expectedTerms"); @@ -78,81 +75,76 @@ void DolphinQueryTest::testBalooSearchParsing_data() const QString modified = QStringLiteral("modified>=2019-08-07"); const QString tag = QStringLiteral("tag:tagA"); - const QString tagS = QStringLiteral("tag:\"tagB with spaces\""); // in search url - const QString tagR = QStringLiteral("tag:tagB with spaces"); // in result term + const QString tagS = QStringLiteral("tag:\"tagB with spaces\""); // in search url + const QString tagR = QStringLiteral("tag:tagB with spaces"); // in result term // Test for "Content" - QTest::newRow("content") << balooQueryUrl(text) << text << QStringList() << true << false; - QTest::newRow("content/space") << balooQueryUrl(textS) << textS << QStringList() << true << false; - QTest::newRow("content/quoted") << balooQueryUrl(textQ) << textS << QStringList() << true << false; - QTest::newRow("content/empty") << balooQueryUrl("") << "" << QStringList() << false << false; - QTest::newRow("content/single_quote") << balooQueryUrl("\"") << "\"" << QStringList() << true << false; - QTest::newRow("content/double_quote") << balooQueryUrl("\"\"") << "" << QStringList() << false << false; + QTest::newRow("content") << balooQueryUrl(text) << text << QStringList() << true << false; + QTest::newRow("content/space") << balooQueryUrl(textS) << textS << QStringList() << true << false; + QTest::newRow("content/quoted") << balooQueryUrl(textQ) << textS << QStringList() << true << false; + QTest::newRow("content/empty") << balooQueryUrl("") << "" << QStringList() << false << false; + QTest::newRow("content/single_quote") << balooQueryUrl("\"") << "\"" << QStringList() << true << false; + QTest::newRow("content/double_quote") << balooQueryUrl("\"\"") << "" << QStringList() << false << false; // Test for "FileName" - QTest::newRow("filename") << balooQueryUrl(filename) << text << QStringList() << false << true; - QTest::newRow("filename/space") << balooQueryUrl(filenameS) << textS << QStringList() << false << true; - QTest::newRow("filename/quoted") << balooQueryUrl(filenameQ) << textQ << QStringList() << false << true; - QTest::newRow("filename/mixed") << balooQueryUrl(filenameM) << textM << QStringList() << false << true; - QTest::newRow("filename/empty") << balooQueryUrl("filename:") << "" << QStringList() << false << false; - QTest::newRow("filename/single_quote") << balooQueryUrl("filename:\"") << "\"" << QStringList() << false << true; - QTest::newRow("filename/double_quote") << balooQueryUrl("filename:\"\"") << "" << QStringList() << false << false; + QTest::newRow("filename") << balooQueryUrl(filename) << text << QStringList() << false << true; + QTest::newRow("filename/space") << balooQueryUrl(filenameS) << textS << QStringList() << false << true; + QTest::newRow("filename/quoted") << balooQueryUrl(filenameQ) << textQ << QStringList() << false << true; + QTest::newRow("filename/mixed") << balooQueryUrl(filenameM) << textM << QStringList() << false << true; + QTest::newRow("filename/empty") << balooQueryUrl("filename:") << "" << QStringList() << false << false; + QTest::newRow("filename/single_quote") << balooQueryUrl("filename:\"") << "\"" << QStringList() << false << true; + QTest::newRow("filename/double_quote") << balooQueryUrl("filename:\"\"") << "" << QStringList() << false << false; // Combined content and filename search - QTest::newRow("content+filename") - << balooQueryUrl(text + " " + filename) - << text + " " + filename << QStringList() << true << true; + QTest::newRow("content+filename") << balooQueryUrl(text + " " + filename) << text + " " + filename << QStringList() << true << true; - QTest::newRow("content+filename/quoted") - << balooQueryUrl(textQ + " " + filenameQ) - << textS + " " + filenameQ << QStringList() << true << true; + QTest::newRow("content+filename/quoted") << balooQueryUrl(textQ + " " + filenameQ) << textS + " " + filenameQ << QStringList() << true << true; // Test for rating - QTest::newRow("rating") << balooQueryUrl(rating) << "" << QStringList({rating}) << false << false; - QTest::newRow("rating+content") << balooQueryUrl(rating + " " + text) << text << QStringList({rating}) << true << false; + QTest::newRow("rating") << balooQueryUrl(rating) << "" << QStringList({rating}) << false << false; + QTest::newRow("rating+content") << balooQueryUrl(rating + " " + text) << text << QStringList({rating}) << true << false; QTest::newRow("rating+filename") << balooQueryUrl(rating + " " + filename) << text << QStringList({rating}) << false << true; // Test for modified date - QTest::newRow("modified") << balooQueryUrl(modified) << "" << QStringList({modified}) << false << false; - QTest::newRow("modified+content") << balooQueryUrl(modified + " " + text) << text << QStringList({modified}) << true << false; + QTest::newRow("modified") << balooQueryUrl(modified) << "" << QStringList({modified}) << false << false; + QTest::newRow("modified+content") << balooQueryUrl(modified + " " + text) << text << QStringList({modified}) << true << false; QTest::newRow("modified+filename") << balooQueryUrl(modified + " " + filename) << text << QStringList({modified}) << false << true; // Test for tags - QTest::newRow("tag") << balooQueryUrl(tag) << "" << QStringList({tag}) << false << false; - QTest::newRow("tag/space" ) << balooQueryUrl(tagS) << "" << QStringList({tagR}) << false << false; - QTest::newRow("tag/double") << balooQueryUrl(tag + " " + tagS) << "" << QStringList({tag, tagR}) << false << false; - QTest::newRow("tag+content") << balooQueryUrl(tag + " " + text) << text << QStringList({tag}) << true << false; - QTest::newRow("tag+filename") << balooQueryUrl(tag + " " + filename) << text << QStringList({tag}) << false << true; + QTest::newRow("tag") << balooQueryUrl(tag) << "" << QStringList({tag}) << false << false; + QTest::newRow("tag/space") << balooQueryUrl(tagS) << "" << QStringList({tagR}) << false << false; + QTest::newRow("tag/double") << balooQueryUrl(tag + " " + tagS) << "" << QStringList({tag, tagR}) << false << false; + QTest::newRow("tag+content") << balooQueryUrl(tag + " " + text) << text << QStringList({tag}) << true << false; + QTest::newRow("tag+filename") << balooQueryUrl(tag + " " + filename) << text << QStringList({tag}) << false << true; // Combined search terms - QTest::newRow("searchTerms") - << balooQueryUrl(rating + " AND " + modified + " AND " + tag + " AND " + tagS) - << "" << QStringList({modified, rating, tag, tagR}) << false << false; + QTest::newRow("searchTerms") << balooQueryUrl(rating + " AND " + modified + " AND " + tag + " AND " + tagS) << "" + << QStringList({modified, rating, tag, tagR}) << false << false; - QTest::newRow("searchTerms+content") - << balooQueryUrl(rating + " AND " + modified + " " + text + " " + tag + " AND " + tagS) - << text << QStringList({modified, rating, tag, tagR}) << true << false; + QTest::newRow("searchTerms+content") << balooQueryUrl(rating + " AND " + modified + " " + text + " " + tag + " AND " + tagS) << text + << QStringList({modified, rating, tag, tagR}) << true << false; - QTest::newRow("searchTerms+filename") - << balooQueryUrl(rating + " AND " + modified + " " + filename + " " + tag + " AND " + tagS) - << text << QStringList({modified, rating, tag, tagR}) << false << true; + QTest::newRow("searchTerms+filename") << balooQueryUrl(rating + " AND " + modified + " " + filename + " " + tag + " AND " + tagS) << text + << QStringList({modified, rating, tag, tagR}) << false << true; - QTest::newRow("allTerms") - << balooQueryUrl(text + " " + filename + " " + rating + " AND " + modified + " AND " + tag) - << text + " " + filename << QStringList({modified, rating, tag}) << true << true; + QTest::newRow("allTerms") << balooQueryUrl(text + " " + filename + " " + rating + " AND " + modified + " AND " + tag) << text + " " + filename + << QStringList({modified, rating, tag}) << true << true; - QTest::newRow("allTerms/space") - << balooQueryUrl(textS + " " + filenameS + " " + rating + " AND " + modified + " AND " + tagS) - << textS + " " + filenameS << QStringList({modified, rating, tagR}) << true << true; + QTest::newRow("allTerms/space") << balooQueryUrl(textS + " " + filenameS + " " + rating + " AND " + modified + " AND " + tagS) << textS + " " + filenameS + << QStringList({modified, rating, tagR}) << true << true; // Test tags:/ URL scheme - const auto tagUrl = [](const QString &tag) { return QUrl(QStringLiteral("tags:/%1/").arg(tag)); }; - const auto tagTerms = [](const QString &tag) { return QStringList{QStringLiteral("tag:%1").arg(tag)}; }; + const auto tagUrl = [](const QString &tag) { + return QUrl(QStringLiteral("tags:/%1/").arg(tag)); + }; + const auto tagTerms = [](const QString &tag) { + return QStringList{QStringLiteral("tag:%1").arg(tag)}; + }; - QTest::newRow("tagsUrl") << tagUrl("tagA") << "" << tagTerms("tagA") << false << false; + QTest::newRow("tagsUrl") << tagUrl("tagA") << "" << tagTerms("tagA") << false << false; QTest::newRow("tagsUrl/space") << tagUrl("tagB with spaces") << "" << tagTerms("tagB with spaces") << false << false; - QTest::newRow("tagsUrl/hash") << tagUrl("tagC#hash") << "" << tagTerms("tagC#hash") << false << false; - QTest::newRow("tagsUrl/slash") << tagUrl("tagD/with/slash") << "" << tagTerms("tagD/with/slash") << false << false; + QTest::newRow("tagsUrl/hash") << tagUrl("tagC#hash") << "" << tagTerms("tagC#hash") << false << false; + QTest::newRow("tagsUrl/slash") << tagUrl("tagD/with/slash") << "" << tagTerms("tagD/with/slash") << false << false; } /**