1 files changed, 6 insertions, 18 deletions
diff --git a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
index 521880db4..b7ea4fbc5 100644
--- a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
+++ b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -25,19 +25,15 @@
 ** $QT_END_LICENSE$
 **
 **************************************************************************/
+
+#include "../shared/packagemanager.h"
 #include <utils.h>
 #include <settingsoperation.h>
-#include <qinstallerglobal.h>
 #include <packagemanagercore.h>
-#include <binarycontent.h>
 #include <settings.h>
-#include <fileutils.h>
-#include <init.h>
 
-#include <QObject>
 #include <QTest>
 #include <QSettings>
-#include <QDir>
 
 using namespace KDUpdater;
 using namespace QInstaller;
@@ -287,18 +283,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();
-        QDir().mkpath(installDir);
-        core->setValue(scTargetDir, installDir);
+        QVERIFY(QDir().mkpath(installDir));
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+                (installDir, ":///data/repository");
 
         QSettings testSettings(QDir(m_testSettingsDirPath).filePath(m_testSettingsFilename),
             QSettings::IniFormat);