From de9588fc640676208d121027789d37d5ca9930bf Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 16 Mar 2021 12:19:53 +0100 Subject: [PATCH] Better organize bookmarks runner tests --- runners/bookmarks/CMakeLists.txt | 2 +- runners/bookmarks/autotests/CMakeLists.txt | 7 +++++++ .../chrome-config-home/.config/chromium/Local State | 0 .../chrome-config-home/Chrome-Bookmarks-Sample.json | 0 .../Chrome-Bookmarks-SecondProfile.json | 0 .../chrome}/testchromebookmarks.cpp | 11 ++++++----- .../{tests => autotests/chrome}/testchromebookmarks.h | 1 + runners/bookmarks/tests/CMakeLists.txt | 8 -------- 8 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 runners/bookmarks/autotests/CMakeLists.txt rename runners/bookmarks/{tests => autotests/chrome}/chrome-config-home/.config/chromium/Local State (100%) rename runners/bookmarks/{tests => autotests/chrome}/chrome-config-home/Chrome-Bookmarks-Sample.json (100%) rename runners/bookmarks/{tests => autotests/chrome}/chrome-config-home/Chrome-Bookmarks-SecondProfile.json (100%) rename runners/bookmarks/{tests => autotests/chrome}/testchromebookmarks.cpp (89%) rename runners/bookmarks/{tests => autotests/chrome}/testchromebookmarks.h (98%) delete mode 100644 runners/bookmarks/tests/CMakeLists.txt diff --git a/runners/bookmarks/CMakeLists.txt b/runners/bookmarks/CMakeLists.txt index 81e978137..02efb5f49 100644 --- a/runners/bookmarks/CMakeLists.txt +++ b/runners/bookmarks/CMakeLists.txt @@ -62,5 +62,5 @@ install(TARGETS krunner_bookmarksrunner DESTINATION "${KDE_INSTALL_PLUGINDIR}/kf # Currently tests include only chrome, so no need to get include them if json is not found if(BUILD_TESTING) - add_subdirectory(tests) + add_subdirectory(autotests) endif() diff --git a/runners/bookmarks/autotests/CMakeLists.txt b/runners/bookmarks/autotests/CMakeLists.txt new file mode 100644 index 000000000..1d62ce9a5 --- /dev/null +++ b/runners/bookmarks/autotests/CMakeLists.txt @@ -0,0 +1,7 @@ + +include(ECMAddTests) + +ecm_add_test(chrome/testchromebookmarks.cpp TEST_NAME testChromeBookmarks + LINK_LIBRARIES Qt::Test krunner_bookmarks_test +) +file(COPY chrome/chrome-config-home DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/chrome/) diff --git a/runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State b/runners/bookmarks/autotests/chrome/chrome-config-home/.config/chromium/Local State similarity index 100% rename from runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State rename to runners/bookmarks/autotests/chrome/chrome-config-home/.config/chromium/Local State diff --git a/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json b/runners/bookmarks/autotests/chrome/chrome-config-home/Chrome-Bookmarks-Sample.json similarity index 100% rename from runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json rename to runners/bookmarks/autotests/chrome/chrome-config-home/Chrome-Bookmarks-Sample.json diff --git a/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json b/runners/bookmarks/autotests/chrome/chrome-config-home/Chrome-Bookmarks-SecondProfile.json similarity index 100% rename from runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json rename to runners/bookmarks/autotests/chrome/chrome-config-home/Chrome-Bookmarks-SecondProfile.json diff --git a/runners/bookmarks/tests/testchromebookmarks.cpp b/runners/bookmarks/autotests/chrome/testchromebookmarks.cpp similarity index 89% rename from runners/bookmarks/tests/testchromebookmarks.cpp rename to runners/bookmarks/autotests/chrome/testchromebookmarks.cpp index 80171ae4d..b19bc7849 100644 --- a/runners/bookmarks/tests/testchromebookmarks.cpp +++ b/runners/bookmarks/autotests/chrome/testchromebookmarks.cpp @@ -29,14 +29,15 @@ using namespace Plasma; void TestChromeBookmarks::initTestCase() { + m_configHome = QFINDTESTDATA("chrome-config-home"); m_findBookmarksInCurrentDirectory.reset( - new FakeFindProfile(QList({Profile("chrome-config-home/Chrome-Bookmarks-Sample.json", "Sample", new FallbackFavicon())}))); + new FakeFindProfile(QList({Profile(m_configHome + "/Chrome-Bookmarks-Sample.json", "Sample", new FallbackFavicon())}))); } void TestChromeBookmarks::bookmarkFinderShouldFindEachProfileDirectory() { - FindChromeProfile findChrome("chromium", "./chrome-config-home"); - QString profileTemplate = QStringLiteral("./chrome-config-home/.config/%1/%2/Bookmarks"); + FindChromeProfile findChrome("chromium", m_configHome); + QString profileTemplate = m_configHome + "/.config/%1/%2/Bookmarks"; QList profiles = findChrome.find(); QCOMPARE(profiles.size(), 2); @@ -107,8 +108,8 @@ void TestChromeBookmarks::itShouldClearResultAfterCallingTeardown() void TestChromeBookmarks::itShouldFindBookmarksFromAllProfiles() { FakeFindProfile findBookmarksFromAllProfiles( - QList() << Profile("chrome-config-home/Chrome-Bookmarks-Sample.json", "Sample", new FallbackFavicon(this)) - << Profile("chrome-config-home/Chrome-Bookmarks-SecondProfile.json", "SecondProfile", new FallbackFavicon(this))); + QList() << Profile(m_configHome + "/Chrome-Bookmarks-Sample.json", "Sample", new FallbackFavicon(this)) + << Profile(m_configHome + "/Chrome-Bookmarks-SecondProfile.json", "SecondProfile", new FallbackFavicon(this))); Chrome *chrome = new Chrome(&findBookmarksFromAllProfiles, this); chrome->prepare(); QList matches = chrome->match("any", true); diff --git a/runners/bookmarks/tests/testchromebookmarks.h b/runners/bookmarks/autotests/chrome/testchromebookmarks.h similarity index 98% rename from runners/bookmarks/tests/testchromebookmarks.h rename to runners/bookmarks/autotests/chrome/testchromebookmarks.h index d07d03d25..05798a193 100644 --- a/runners/bookmarks/tests/testchromebookmarks.h +++ b/runners/bookmarks/autotests/chrome/testchromebookmarks.h @@ -61,6 +61,7 @@ private Q_SLOTS: private: QScopedPointer m_findBookmarksInCurrentDirectory; + QString m_configHome; }; #endif // TESTCHROMEBOOKMARKS_H diff --git a/runners/bookmarks/tests/CMakeLists.txt b/runners/bookmarks/tests/CMakeLists.txt deleted file mode 100644 index 02bda3651..000000000 --- a/runners/bookmarks/tests/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ - -include(ECMAddTests) - -ecm_add_test(testchromebookmarks.cpp TEST_NAME testChromeBookmarks - LINK_LIBRARIES Qt::Test krunner_bookmarks_test -) - -file(COPY chrome-config-home DESTINATION ${CMAKE_CURRENT_BINARY_DIR})