Separate tests from the app

Fixes #3274

Author: hluk

.github/workflows/build-linux.yml

@@ -154,14 +154,21 @@ jobs:
         run: mkdir -p ~/.gnupg && chmod go-rwx ~/.gnupg
 
       - name: Test on Wayland
-        working-directory: '${{runner.workspace}}/install/copyq/${{ matrix.cmake_preset }}/bin'
+        working-directory: >-
+          ${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }}
         if: matrix.test_wayland
         run: '${{github.workspace}}/utils/github/test-linux-wayland.sh'
+        env:
+          COPYQ_TESTS_EXECUTABLE: >-
+            ${{runner.workspace}}/install/copyq/${{ matrix.cmake_preset }}/bin/copyq
 
       - name: Test on X11
-        working-directory: '${{runner.workspace}}/install/copyq/${{ matrix.cmake_preset }}/bin'
+        working-directory: >-
+          ${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }}
         run: '${{github.workspace}}/utils/github/test-linux.sh'
         env:
+          COPYQ_TESTS_EXECUTABLE: >-
+            ${{runner.workspace}}/install/copyq/${{ matrix.cmake_preset }}/bin/copyq
           COPYQ_TESTS_SKIP_DRAG_AND_DROP: >-
             ${{ matrix.with_qt6 && '0' || '1' }}
 

CMakeLists.txt

@@ -18,7 +18,6 @@ endif()
 OPTION(PEDANTIC "Enable all compiler warnings" OFF)
 
 # Options (cmake -LH)
-OPTION(WITH_TESTS "Run test cases from command line" ${COPYQ_DEBUG})
 OPTION(WITH_PLUGINS "Compile plugins" ON)
 
 add_definitions( -DQT_USE_STRINGBUILDER  )
@@ -130,15 +129,6 @@ if (PEDANTIC)
         )
 endif()
 
-if(WITH_TESTS)
-    message(STATUS "Building with tests.")
-
-    add_definitions( -DHAS_TESTS )
-
-    find_package(${copyq_qt}Test REQUIRED)
-    list(APPEND copyq_LIBRARIES ${copyq_qt}::Test)
-endif()
-
 include(src/version.cmake)
 message(STATUS "Building CopyQ version ${copyq_version}.")
 
@@ -198,3 +188,9 @@ if (WITH_PLUGINS)
 endif()
 
 add_subdirectory(src)
+
+# Compile with tests?
+OPTION(WITH_TESTS "Run test cases from command line" OFF)
+if(WITH_TESTS)
+    include(tests/tests.cmake)
+endif()

plugins/CMakeLists.txt

@@ -14,10 +14,6 @@ macro (copyq_add_plugin copyq_pkg)
         ${copyq_plugin_${copyq_pkg}_SOURCES} PROPERTIES
         COMPILE_OPTIONS "${copyq_pedantic_flags}")
 
-    if (WITH_TESTS)
-        file(GLOB copyq_plugin_SOURCES ${copyq_plugin_SOURCES} tests/*.cpp)
-    endif (WITH_TESTS)
-
     include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../src)
 
     include_directories(${${copyq_qt}Widgets_INCLUDES})

plugins/itemencrypted/itemencrypted.cpp

@@ -15,10 +15,6 @@
 #include "gui/fromiconid.h"
 #include "item/serialize.h"
 
-#ifdef HAS_TESTS
-#   include "tests/itemencryptedtests.h"
-#endif
-
 #include <QAbstractItemModel>
 #include <QDebug>
 #include <QDir>
@@ -406,7 +402,7 @@ bool ItemEncryptedScriptable::isEncrypted()
         bool ok;
         const int row = arg.toInt(&ok);
         if (ok) {
-            const auto result = call("read", QVariantList() << "?" << row);
+            const auto result = call("read", {QStringLiteral("?"), row});
             if ( result.toByteArray().contains(mimeEncryptedData.data()) )
                 return true;
         }
@@ -432,43 +428,43 @@ QByteArray ItemEncryptedScriptable::decrypt()
 void ItemEncryptedScriptable::encryptItem()
 {
     QVariantMap dataMap;
-    const auto formats = call("dataFormats").toList();
+    const auto formats = call("dataFormats", {}).toList();
     for (const auto &formatValue : formats) {
         const auto format = formatValue.toString();
         if ( !format.startsWith(COPYQ_MIME_PREFIX) ) {
-            const auto data = call("data", QVariantList() << format).toByteArray();
+            const auto data = call("data", {format}).toByteArray();
             dataMap.insert(format, data);
         }
     }
 
-    const auto bytes = call("pack", QVariantList() << dataMap).toByteArray();
+    const auto bytes = call("pack", {dataMap}).toByteArray();
     const auto encryptedBytes = encrypt(bytes);
     if (encryptedBytes.isEmpty())
         return;
 
-    call("setData", QVariantList() << mimeEncryptedData << encryptedBytes);
+    call("setData", {mimeEncryptedData, encryptedBytes});
 
     for (auto it = dataMap.constBegin(); it != dataMap.constEnd(); ++it)
-        call("removeData", QVariantList() << it.key());
+        call("removeData", {it.key()});
 }
 
 void ItemEncryptedScriptable::decryptItem()
 {
-    const auto encryptedBytes = call("data", QVariantList() << mimeEncryptedData).toByteArray();
+    const auto encryptedBytes = call("data", {mimeEncryptedData}).toByteArray();
     const auto itemData = decrypt(encryptedBytes);
     if (itemData.isEmpty())
         return;
 
-    const auto dataMap = call("unpack", QVariantList() << itemData).toMap();
+    const auto dataMap = call("unpack", {itemData}).toMap();
     for (auto it = dataMap.constBegin(); it != dataMap.constEnd(); ++it) {
         const auto &format = it.key();
-        call("setData", QVariantList() << format << dataMap[format]);
+        call("setData", {format, dataMap[format]});
     }
 }
 
 void ItemEncryptedScriptable::encryptItems()
 {
-    const auto dataValueList = call("selectedItemsData").toList();
+    const auto dataValueList = call("selectedItemsData", {}).toList();
 
     QVariantList dataList;
     for (const auto &itemDataValue : dataValueList) {
@@ -483,7 +479,7 @@ void ItemEncryptedScriptable::encryptItems()
             }
         }
 
-        const auto bytes = call("pack", QVariantList() << itemDataToEncrypt).toByteArray();
+        const auto bytes = call("pack", {itemDataToEncrypt}).toByteArray();
         const auto encryptedBytes = encrypt(bytes);
         if (encryptedBytes.isEmpty())
             return;
@@ -492,12 +488,12 @@ void ItemEncryptedScriptable::encryptItems()
         dataList.append(itemData);
     }
 
-    call( "setSelectedItemsData", QVariantList() << QVariant(dataList) );
+    call( "setSelectedItemsData", {QVariant(dataList)} );
 }
 
 void ItemEncryptedScriptable::decryptItems()
 {
-    const auto dataValueList = call("selectedItemsData").toList();
+    const auto dataValueList = call("selectedItemsData", {}).toList();
 
     QVariantList dataList;
     for (const auto &itemDataValue : dataValueList) {
@@ -511,20 +507,20 @@ void ItemEncryptedScriptable::decryptItems()
             if (decryptedBytes.isEmpty())
                 return;
 
-            const auto decryptedItemData = call("unpack", QVariantList() << decryptedBytes).toMap();
+            const auto decryptedItemData = call("unpack", {decryptedBytes}).toMap();
             for (auto it = decryptedItemData.constBegin(); it != decryptedItemData.constEnd(); ++it)
                 itemData.insert(it.key(), it.value());
         }
 
         dataList.append(itemData);
     }
 
-    call( "setSelectedItemsData", QVariantList() << QVariant(dataList) );
+    call( "setSelectedItemsData", {QVariant(dataList)} );
 }
 
 void ItemEncryptedScriptable::copyEncryptedItems()
 {
-    const auto dataValueList = call("selectedItemsData").toList();
+    const auto dataValueList = call("selectedItemsData", {}).toList();
     QString text;
     for (const auto &dataValue : dataValueList) {
         if ( !text.isEmpty() )
@@ -540,15 +536,13 @@ void ItemEncryptedScriptable::copyEncryptedItems()
                 const auto itemData = decrypt(encryptedBytes);
                 if (itemData.isEmpty())
                     return;
-                const auto dataMap = call("unpack", QVariantList() << itemData).toMap();
+                const auto dataMap = call("unpack", {itemData}).toMap();
                 text.append( getTextData(dataMap) );
             }
         }
     }
 
-    const auto args = QVariantList()
-            << mimeText << text
-            << mimeHidden << "1";
+    const QVariantList args{mimeText, text, mimeHidden, "1"};
     call("copy", args);
     call("copySelection", args);
 }
@@ -567,7 +561,7 @@ void ItemEncryptedScriptable::pasteEncryptedItems()
         copy('');
         copySelection('');
         )";
-    call("eval", QVariantList() << script);
+    call("eval", {script});
 }
 
 QString ItemEncryptedScriptable::generateTestKeys()
@@ -829,17 +823,6 @@ ItemSaverPtr ItemEncryptedLoader::initializeTab(const QString &, QAbstractItemMo
     return createSaver();
 }
 
-QObject *ItemEncryptedLoader::tests(const TestInterfacePtr &test) const
-{
-#ifdef HAS_TESTS
-    QObject *tests = new ItemEncryptedTests(test);
-    return tests;
-#else
-    Q_UNUSED(test)
-    return nullptr;
-#endif
-}
-
 ItemScriptable *ItemEncryptedLoader::scriptableObject()
 {
     return new ItemEncryptedScriptable();

plugins/itemencrypted/itemencrypted.h

@@ -100,8 +100,6 @@ class ItemEncryptedLoader final : public QObject, public ItemLoaderInterface
 
     ItemSaverPtr initializeTab(const QString &, QAbstractItemModel *model, int maxItems) override;
 
-    QObject *tests(const TestInterfacePtr &test) const override;
-
     const QObject *signaler() const override { return this; }
 
     ItemScriptable *scriptableObject() override;

plugins/itemfakevim/itemfakevim.cpp

@@ -3,9 +3,6 @@
 #include "itemfakevim.h"
 #include "ui_itemfakevimsettings.h"
 
-#include "tests/itemfakevimtests.h"
-#include "common/contenttype.h"
-
 #include "fakevim/fakevimhandler.h"
 
 using namespace FakeVim::Internal;
@@ -784,21 +781,6 @@ QWidget *ItemFakeVimLoader::createSettingsWidget(QWidget *parent)
     return w;
 }
 
-QObject *ItemFakeVimLoader::tests(const TestInterfacePtr &test) const
-{
-#ifdef HAS_TESTS
-    QVariantMap settings;
-    settings["really_enable"] = true;
-    settings["source_file"] = QString(ItemFakeVimTests::fileNameToSource());
-    QObject *tests = new ItemFakeVimTests(test);
-    tests->setProperty("CopyQ_test_settings", settings);
-    return tests;
-#else
-    Q_UNUSED(test)
-    return nullptr;
-#endif
-}
-
 bool ItemFakeVimLoader::eventFilter(QObject *watched, QEvent *event)
 {
     if (event->type() == QEvent::Show)

plugins/itemfakevim/itemfakevim.h

@@ -37,8 +37,6 @@ class ItemFakeVimLoader final : public QObject, public ItemLoaderInterface
 
     QWidget *createSettingsWidget(QWidget *parent) override;
 
-    QObject *tests(const TestInterfacePtr &test) const override;
-
     bool eventFilter(QObject *watched, QEvent *event) override;
 
 signals:

plugins/itemimage/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(copyq_plugin_itemimage_SOURCES
     ../../src/common/action.cpp
     ../../src/common/mimetypes.cpp
+    ../../src/common/process.cpp
     ../../src/common/temporaryfile.cpp
     ../../src/item/itemeditor.cpp
     ../../src/item/serialize.cpp

plugins/itemimage/itemimage.cpp

@@ -7,10 +7,6 @@
 #include "item/itemeditor.h"
 #include "gui/pixelratio.h"
 
-#ifdef HAS_TESTS
-#   include "tests/itemimagetests.h"
-#endif
-
 #include <QBuffer>
 #include <QHBoxLayout>
 #include <QModelIndex>
@@ -231,17 +227,6 @@ QStringList ItemImageLoader::formatsToSave() const
     };
 }
 
-QObject *ItemImageLoader::tests(const TestInterfacePtr &test) const
-{
-#ifdef HAS_TESTS
-    QObject *tests = new ItemImageTests(test);
-    return tests;
-#else
-    Q_UNUSED(test)
-    return nullptr;
-#endif
-}
-
 void ItemImageLoader::applySettings(QSettings &settings)
 {
     settings.setValue(configMaxImageWidth, ui->spinBoxImageWidth->value());

plugins/itemimage/itemimage.h

@@ -69,8 +69,6 @@ class ItemImageLoader final : public QObject, public ItemLoaderInterface
 
     QStringList formatsToSave() const override;
 
-    QObject *tests(const TestInterfacePtr &test) const override;
-
     void applySettings(QSettings &settings) override;
 
     void loadSettings(const QSettings &settings) override;