diff options
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/tests/kfileitemmodeltest.cpp | 24 | ||||
| -rw-r--r-- | src/tests/placesitemmodeltest.cpp | 53 |
3 files changed, 71 insertions, 20 deletions
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 07e4257a0..8ef20cb83 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -3,6 +3,18 @@ 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.") + +if(BUILD_COVERAGE) + find_gem(simplecov) + set_package_properties(Gem:simplecov PROPERTIES + DESCRIPTION "Ruby gem 'simplecov' used for coverage statistics.") +endif() + # KItemSetTest ecm_add_test(kitemsettest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test) @@ -69,3 +81,5 @@ ecm_add_test(placesitemmodeltest.cpp TEST_NAME placesitemmodeltest LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) +add_test(NAME servicemenutest + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb) diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp index 2f258d17d..c53979970 100644 --- a/src/tests/kfileitemmodeltest.cpp +++ b/src/tests/kfileitemmodeltest.cpp @@ -1553,22 +1553,22 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering() KIO::UDSEntry entry[3]; - entry[0].insert(KIO::UDSEntry::UDS_NAME, "a.txt"); - entry[0].insert(KIO::UDSEntry::UDS_USER, "user-b"); + entry[0].fastInsert(KIO::UDSEntry::UDS_NAME, "a.txt"); + entry[0].fastInsert(KIO::UDSEntry::UDS_USER, "user-b"); - entry[1].insert(KIO::UDSEntry::UDS_NAME, "b.txt"); - entry[1].insert(KIO::UDSEntry::UDS_USER, "user-c"); + entry[1].fastInsert(KIO::UDSEntry::UDS_NAME, "b.txt"); + entry[1].fastInsert(KIO::UDSEntry::UDS_USER, "user-c"); - entry[2].insert(KIO::UDSEntry::UDS_NAME, "c.txt"); - entry[2].insert(KIO::UDSEntry::UDS_USER, "user-a"); + entry[2].fastInsert(KIO::UDSEntry::UDS_NAME, "c.txt"); + entry[2].fastInsert(KIO::UDSEntry::UDS_USER, "user-a"); for (int i = 0; i < 3; ++i) { - entry[i].insert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000); // S_IFREG might not be defined on non-Unix platforms. - entry[i].insert(KIO::UDSEntry::UDS_ACCESS, 07777); - entry[i].insert(KIO::UDSEntry::UDS_SIZE, 0); - entry[i].insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0); - entry[i].insert(KIO::UDSEntry::UDS_GROUP, "group"); - entry[i].insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0); + entry[i].fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000); // S_IFREG might not be defined on non-Unix platforms. + entry[i].fastInsert(KIO::UDSEntry::UDS_ACCESS, 07777); + entry[i].fastInsert(KIO::UDSEntry::UDS_SIZE, 0); + entry[i].fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0); + entry[i].fastInsert(KIO::UDSEntry::UDS_GROUP, "group"); + entry[i].fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, 0); items.append(KFileItem(entry[i], m_testDir->url(), false, true)); } diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp index 7f0d498a7..af466908c 100644 --- a/src/tests/placesitemmodeltest.cpp +++ b/src/tests/placesitemmodeltest.cpp @@ -88,6 +88,7 @@ private: QMap<QString, QDBusInterface *> m_interfacesMap; int m_expectedModelCount = 15; bool m_hasDesktopFolder = false; + bool m_hasDocumentsFolder = false; bool m_hasDownloadsFolder = false; void setBalooEnabled(bool enabled); @@ -171,6 +172,10 @@ QStringList PlacesItemModelTest::initialUrls() const urls << QDir::homePath() + QStringLiteral("/Desktop"); } + if (m_hasDocumentsFolder) { + urls << QDir::homePath() + QStringLiteral("/Documents"); + } + if (m_hasDownloadsFolder) { urls << QDir::homePath() + QStringLiteral("/Downloads"); } @@ -269,6 +274,11 @@ void PlacesItemModelTest::initTestCase() m_expectedModelCount++; } + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).exists()) { + m_hasDocumentsFolder = true; + m_expectedModelCount++; + } + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)).exists()) { m_hasDownloadsFolder = true; m_expectedModelCount++; @@ -292,12 +302,15 @@ void PlacesItemModelTest::testModelSort() void PlacesItemModelTest::testGroups() { const auto groups = m_model->groups(); - int expectedGroupSize = 3; + int expectedRemoteIndex = 3; if (m_hasDesktopFolder) { - expectedGroupSize++; + expectedRemoteIndex++; + } + if (m_hasDocumentsFolder) { + expectedRemoteIndex++; } if (m_hasDownloadsFolder) { - expectedGroupSize++; + expectedRemoteIndex++; } QCOMPARE(groups.size(), 6); @@ -305,19 +318,19 @@ void PlacesItemModelTest::testGroups() QCOMPARE(groups.at(0).first, 0); QCOMPARE(groups.at(0).second.toString(), QStringLiteral("Places")); - QCOMPARE(groups.at(1).first, expectedGroupSize); + QCOMPARE(groups.at(1).first, expectedRemoteIndex); QCOMPARE(groups.at(1).second.toString(), QStringLiteral("Remote")); - QCOMPARE(groups.at(2).first, expectedGroupSize + 2); + QCOMPARE(groups.at(2).first, expectedRemoteIndex + 2); QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recently Saved")); - QCOMPARE(groups.at(3).first, expectedGroupSize + 4); + QCOMPARE(groups.at(3).first, expectedRemoteIndex + 4); QCOMPARE(groups.at(3).second.toString(), QStringLiteral("Search For")); - QCOMPARE(groups.at(4).first, expectedGroupSize + 8); + QCOMPARE(groups.at(4).first, expectedRemoteIndex + 8); QCOMPARE(groups.at(4).second.toString(), QStringLiteral("Devices")); - QCOMPARE(groups.at(5).first, expectedGroupSize + 9); + QCOMPARE(groups.at(5).first, expectedRemoteIndex + 9); QCOMPARE(groups.at(5).second.toString(), QStringLiteral("Removable Devices")); } @@ -372,6 +385,9 @@ void PlacesItemModelTest::testDeletePlace() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -545,6 +561,9 @@ void PlacesItemModelTest::testSystemItems() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -593,6 +612,9 @@ void PlacesItemModelTest::testEditBookmark() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -631,6 +653,9 @@ void PlacesItemModelTest::testEditAfterCreation() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -668,6 +693,9 @@ void PlacesItemModelTest::testEditMetadata() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -707,6 +735,9 @@ void PlacesItemModelTest::testRefresh() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -778,6 +809,9 @@ void PlacesItemModelTest::testDragAndDrop() if (m_hasDesktopFolder) { lastIndex++; } + if (m_hasDocumentsFolder) { + lastIndex++; + } if (m_hasDownloadsFolder) { lastIndex++; } @@ -897,6 +931,9 @@ void PlacesItemModelTest::renameAfterCreation() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } |