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/installiconsoperation/tst_installiconsoperation.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/installiconsoperation/tst_installiconsoperation.cpp')
-rw-r--r-- | tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp b/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp index 1c68f25ab..cb95e49da 100644 --- a/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp +++ b/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp @@ -26,20 +26,15 @@ ** **************************************************************************/ -#include "../shared/commonfunctions.h" +#include "../shared/packagemanager.h" +#include "../shared/verifyinstaller.h" #include <installiconsoperation.h> #include <packagemanagercore.h> -#include <binarycontent.h> -#include <settings.h> -#include <fileutils.h> -#include <init.h> #include <component.h> -#include <QObject> #include <QTest> -#include <QFile> using namespace KDUpdater; using namespace QInstaller; @@ -84,17 +79,10 @@ 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(); QVERIFY(QDir().mkpath(installDir)); - core->setValue(scTargetDir, installDir); + PackageManagerCore *core = PackageManager::getPackageManagerWithInit + (installDir, ":///data/repository"); core->installDefaultComponentsSilently(); InstallIconsOperation *installIconsOp = nullptr; |