diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-05-07 13:34:16 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-05-15 13:27:09 +0300 |
commit | 7f3cca72453373e7a9785daeb1c1d7189605d56d (patch) | |
tree | 1dd8a2c8490f27baa378ee69285df9509c53387e /tests/auto/installer/deleteoperation/tst_deleteoperation.cpp | |
parent | 20f1400a11837005f0904f2c7cdb40dcd4d5b669 (diff) |
UnitTests: Cleanup code
Move recurred code to common functions, remove unnecessary includes
Change-Id: Idfe3a0c952d1154470ecb229ff3c1e428beaa3ac
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'tests/auto/installer/deleteoperation/tst_deleteoperation.cpp')
-rw-r--r-- | tests/auto/installer/deleteoperation/tst_deleteoperation.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/auto/installer/deleteoperation/tst_deleteoperation.cpp b/tests/auto/installer/deleteoperation/tst_deleteoperation.cpp index 93db333fe..72509f074 100644 --- a/tests/auto/installer/deleteoperation/tst_deleteoperation.cpp +++ b/tests/auto/installer/deleteoperation/tst_deleteoperation.cpp @@ -26,17 +26,13 @@ ** **************************************************************************/ -#include <updateoperations.h> +#include "../shared/packagemanager.h" +#include <updateoperations.h> #include <packagemanagercore.h> -#include <binarycontent.h> #include <settings.h> -#include <fileutils.h> #include <utils.h> -#include <init.h> -#include <QObject> -#include <QFile> #include <QTest> using namespace KDUpdater; @@ -108,23 +104,15 @@ private slots: void testPerformingFromCLI() { - QInstaller::init(); //This will eat debug output - PackageManagerCore *core = new PackageManagerCore(BinaryContent::MagicInstallerMarker, QList<OperationBlob> ()); - core->setAllowedRunningProcesses(QStringList() << QCoreApplication::applicationFilePath()); - QSet<Repository> repoList; - Repository repo = Repository::fromUserInput(":///data/repository"); - repoList.insert(repo); - core->settings().setDefaultRepositories(repoList); - QString installDir = QInstaller::generateTemporaryFileName(); - QDir().mkpath(installDir); + QVERIFY(QDir().mkpath(installDir)); + PackageManagerCore *core = PackageManager::getPackageManagerWithInit(installDir, ":///data/repository"); // Matches filename in component install script QFile file(installDir + QDir::toNativeSeparators("/test")); QVERIFY(file.open(QIODevice::ReadWrite)); file.close(); - core->setValue(scTargetDir, installDir); core->installDefaultComponentsSilently(); QVERIFY(!file.exists()); |