┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/CMakeLists.txt28
-rw-r--r--src/tests/dolphinquerytest.cpp125
-rw-r--r--src/tests/kfileitemmodeltest.cpp5
3 files changed, 82 insertions, 76 deletions
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8d4498675..a6fbf7845 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -3,11 +3,7 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
find_package(Qt5Test CONFIG REQUIRED)
include(ECMAddTests)
-include(FindGem)
-
-find_gem(test-unit REQUIRED)
-set_package_properties(Gem:test-unit PROPERTIES
- DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
+include(FindGem) # For servicemenutest, see bottom of this file
# KItemSetTest
ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test)
@@ -44,16 +40,16 @@ ecm_add_test(kitemlistkeyboardsearchmanagertest.cpp LINK_LIBRARIES dolphinprivat
# DolphinSearchBox
if (KF5Baloo_FOUND)
- ecm_add_test(dolphinsearchboxtest.cpp
- TEST_NAME dolphinsearchboxtest
- LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+ ecm_add_test(dolphinsearchboxtest.cpp
+ TEST_NAME dolphinsearchboxtest
+ LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
endif()
# DolphinQuery
if (KF5Baloo_FOUND)
- ecm_add_test(dolphinquerytest.cpp
- TEST_NAME dolphinquerytest
- LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
+ ecm_add_test(dolphinquerytest.cpp
+ TEST_NAME dolphinquerytest
+ LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
endif()
# KStandardItemModelTest
@@ -84,5 +80,11 @@ if (KF5_VERSION VERSION_GREATER_EQUAL 5.63.0)
LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test)
endif()
-add_test(NAME servicemenutest
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb)
+find_gem(test-unit)
+set_package_properties(Gem:test-unit PROPERTIES
+ TYPE RECOMMENDED
+ DESCRIPTION "Ruby gem 'test-unit' required for testing of servicemenu helpers.")
+if (Gem:test-unit_FOUND)
+ add_test(NAME servicemenutest
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb)
+endif()
diff --git a/src/tests/dolphinquerytest.cpp b/src/tests/dolphinquerytest.cpp
index b65ee037f..a0774e88c 100644
--- a/src/tests/dolphinquerytest.cpp
+++ b/src/tests/dolphinquerytest.cpp
@@ -37,10 +37,39 @@ private slots:
};
/**
+ * Helper function to compose the baloo query URL used for searching
+ */
+QUrl balooQueryUrl(const QString& searchString)
+{
+ const QJsonObject jsonObject {
+ {"searchString", searchString}
+ };
+
+ const QJsonDocument doc(jsonObject);
+ const QString queryString = QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
+
+ QUrlQuery urlQuery;
+ urlQuery.addQueryItem(QStringLiteral("json"), queryString);
+
+ QUrl searchUrl;
+ searchUrl.setScheme(QLatin1String("baloosearch"));
+ searchUrl.setQuery(urlQuery);
+
+ return searchUrl;
+}
+
+/**
* Defines the parameters for the test cases in testBalooSearchParsing()
*/
void DolphinSearchBoxTest::testBalooSearchParsing_data()
{
+
+ QTest::addColumn<QUrl>("searchUrl");
+ QTest::addColumn<QString>("expectedText");
+ QTest::addColumn<QStringList>("expectedTerms");
+ QTest::addColumn<bool>("hasContent");
+ QTest::addColumn<bool>("hasFileName");
+
const QString text = QStringLiteral("abc");
const QString textS = QStringLiteral("abc xyz");
const QString filename = QStringLiteral("filename:\"%1\"").arg(text);
@@ -53,115 +82,89 @@ void DolphinSearchBoxTest::testBalooSearchParsing_data()
const QString tagS = QStringLiteral("tag:\"tagB with spaces\""); // in search url
const QString tagR = QStringLiteral("tag:tagB with spaces"); // in result term
- QTest::addColumn<QString>("searchString");
- QTest::addColumn<QString>("expectedText");
- QTest::addColumn<QStringList>("expectedTerms");
- QTest::addColumn<bool>("hasContent");
- QTest::addColumn<bool>("hasFileName");
-
// Test for "Content"
- QTest::newRow("content") << text << text << QStringList() << true << false;
- QTest::newRow("content/space") << textS << textS << QStringList() << true << false;
- QTest::newRow("content/empty") << "" << "" << QStringList() << false << false;
- QTest::newRow("content/single_quote") << "\"" << "\"" << QStringList() << true << false;
- QTest::newRow("content/double_quote") << "\"\"" << "" << 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/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") << filename << text << QStringList() << false << true;
- QTest::newRow("filename/space") << filenameS << textS << QStringList() << false << true;
- QTest::newRow("filename/empty") << "filename:" << "" << QStringList() << false << false;
- QTest::newRow("filename/single_quote") << "filename:\"" << "\"" << QStringList() << false << true;
- QTest::newRow("filename/double_quote") << "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/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")
- << text + " " + filename
+ << balooQueryUrl(text + " " + filename)
<< text + " " + filename << QStringList() << true << true;
// Test for rating
- QTest::newRow("rating") << rating << "" << QStringList({rating}) << false << false;
- QTest::newRow("rating+content") << rating + " " + text << text << QStringList({rating}) << true << false;
- QTest::newRow("rating+filename") << rating + " " + filename << text << QStringList({rating}) << false << true;
+ 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") << modified << "" << QStringList({modified}) << false << false;
- QTest::newRow("modified+content") << modified + " " + text << text << QStringList({modified}) << true << false;
- QTest::newRow("modified+filename") << modified + " " + filename << text << QStringList({modified}) << false << true;
+ 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") << tag << "" << QStringList({tag}) << false << false;
- QTest::newRow("tag/space" ) << tagS << "" << QStringList({tagR}) << false << false;
- QTest::newRow("tag/double") << tag + " " + tagS << "" << QStringList({tag, tagR}) << false << false;
- QTest::newRow("tag+content") << tag + " " + text << text << QStringList({tag}) << true << false;
- QTest::newRow("tag+filename") << 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")
- << rating + " AND " + modified + " AND " + tag + " AND " + tagS
+ << balooQueryUrl(rating + " AND " + modified + " AND " + tag + " AND " + tagS)
<< "" << QStringList({modified, rating, tag, tagR}) << false << false;
QTest::newRow("searchTerms+content")
- << rating + " AND " + modified + " " + text + " " + tag + " AND " + tagS
+ << balooQueryUrl(rating + " AND " + modified + " " + text + " " + tag + " AND " + tagS)
<< text << QStringList({modified, rating, tag, tagR}) << true << false;
QTest::newRow("searchTerms+filename")
- << rating + " AND " + modified + " " + filename + " " + tag + " AND " + tagS
+ << balooQueryUrl(rating + " AND " + modified + " " + filename + " " + tag + " AND " + tagS)
<< text << QStringList({modified, rating, tag, tagR}) << false << true;
QTest::newRow("allTerms")
- << text + " " + filename + " " + rating + " AND " + modified + " AND " + tag
+ << balooQueryUrl(text + " " + filename + " " + rating + " AND " + modified + " AND " + tag)
<< text + " " + filename << QStringList({modified, rating, tag}) << true << true;
QTest::newRow("allTerms/space")
- << textS + " " + filenameS + " " + rating + " AND " + modified + " AND " + tagS
+ << balooQueryUrl(textS + " " + filenameS + " " + rating + " AND " + modified + " AND " + tagS)
<< textS + " " + filenameS << QStringList({modified, rating, tagR}) << true << true;
}
/**
- * Helper function to compose the baloo query URL used for searching
- */
-QUrl composeQueryUrl(const QString& searchString)
-{
- const QJsonObject jsonObject {
- {"searchString", searchString}
- };
-
- const QJsonDocument doc(jsonObject);
- const QString queryString = QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
-
- QUrlQuery urlQuery;
- urlQuery.addQueryItem(QStringLiteral("json"), queryString);
-
- QUrl searchUrl;
- searchUrl.setScheme(QLatin1String("baloosearch"));
- searchUrl.setQuery(urlQuery);
-
- return searchUrl;
-}
-
-/**
- * The test verifies whether the different terms of a Baloo search URL ("baloosearch:") are
+ * The test verifies whether the different terms search URL (e.g. "baloosearch:/") are
* properly handled by the searchbox, and only "user" or filename terms are added to the
* text bar of the searchbox.
*/
void DolphinSearchBoxTest::testBalooSearchParsing()
{
- QFETCH(QString, searchString);
+ QFETCH(QUrl, searchUrl);
QFETCH(QString, expectedText);
QFETCH(QStringList, expectedTerms);
QFETCH(bool, hasContent);
QFETCH(bool, hasFileName);
- const QUrl testUrl = composeQueryUrl(searchString);
- const DolphinQuery query = DolphinQuery::fromBalooSearchUrl(testUrl);
+ const DolphinQuery query = DolphinQuery::fromSearchUrl(searchUrl);
- QStringList searchTerms = query.searchTerms();
- searchTerms.sort();
+ // Checkt that the URL is supported
+ QVERIFY(DolphinQuery::supportsScheme(searchUrl.scheme()));
// Check for parsed text (would be displayed on the input search bar)
QCOMPARE(query.text(), expectedText);
// Check for parsed search terms (would be displayed by the facetsWidget)
+ QStringList searchTerms = query.searchTerms();
+ searchTerms.sort();
+
QCOMPARE(searchTerms.count(), expectedTerms.count());
for (int i = 0; i < expectedTerms.count(); i++) {
QCOMPARE(searchTerms.at(i), expectedTerms.at(i));
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index 0c38f02bf..7e949c34f 100644
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
+#include <QRandomGenerator>
#include <QTest>
#include <QSignalSpy>
#include <QTimer>
@@ -450,9 +451,9 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
itemsInsertedSpy.clear();
for (int j = 0; j < 10; ++j) {
- int itemName = qrand();
+ int itemName = QRandomGenerator::global()->generate();
while (insertedItems.contains(itemName)) {
- itemName = qrand();
+ itemName = QRandomGenerator::global()->generate();
}
insertedItems.insert(itemName);
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-03 18:59:46 +0000