From 7f3cca72453373e7a9785daeb1c1d7189605d56d Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Thu, 7 May 2020 13:34:16 +0300
Subject: UnitTests: Cleanup code

Move recurred code to common functions, remove unnecessary includes

Change-Id: Idfe3a0c952d1154470ecb229ff3c1e428beaa3ac
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
---
 .../replaceoperation/tst_replaceoperation.cpp          | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'tests/auto/installer/replaceoperation/tst_replaceoperation.cpp')

diff --git a/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp b/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
index 88a3350a7..88dc2011b 100644
--- a/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
+++ b/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
@@ -25,16 +25,12 @@
 ** $QT_END_LICENSE$
 **
 **************************************************************************/
+#include "../shared/packagemanager.h"
 
 #include <fileutils.h>
 #include <replaceoperation.h>
-#include <qinstallerglobal.h>
 #include <packagemanagercore.h>
-#include <binarycontent.h>
-#include <settings.h>
-#include <init.h>
 
-#include <QObject>
 #include <QDir>
 #include <QFile>
 #include <QTest>
@@ -180,16 +176,10 @@ private slots:
 
     void testPerformingFromCLI()
     {
-        QInstaller::init(); //This will eat debug output
-        PackageManagerCore *core = new PackageManagerCore(BinaryContent::MagicInstallerMarker,
-                                                          QList<OperationBlob> ());
-        QSet<Repository> repoList;
-        Repository repo = Repository::fromUserInput(":///data/repository");
-        repoList.insert(repo);
-        core->settings().setDefaultRepositories(repoList);
-
         QVERIFY(QDir().mkpath(m_testDirectory));
-        core->setValue(scTargetDir, m_testDirectory);
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+                (m_testDirectory, ":///data/repository");
+
         core->installDefaultComponentsSilently();
 
         QFile file(m_testDirectory + QDir::separator() + "A.txt");
-- 
cgit v1.2.3