UnitTests: Cleanup code

Move recurred code to common functions, remove unnecessary includes

Change-Id: Idfe3a0c952d1154470ecb229ff3c1e428beaa3ac
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

1 files changed, 5 insertions, 14 deletions

diff --git a/tests/auto/installer/environmentvariableoperation/tst_environmentvariableoperation.cpp b/tests/auto/installer/environmentvariableoperation/tst_environmentvariableoperation.cpp
index 32cc77043..6cddad2e5 100644
--- a/tests/auto/installer/environmentvariableoperation/tst_environmentvariableoperation.cpp
+++ b/tests/auto/installer/environmentvariableoperation/tst_environmentvariableoperation.cpp
@@ -26,13 +26,11 @@
 **
 **************************************************************************/
 
+#include "../shared/packagemanager.h"
+
 #include <environmentvariablesoperation.h>
-#include <init.h>
 #include <environment.h>
 #include <packagemanagercore.h>
-#include <fileutils.h>
-#include <settings.h>
-#include <binarycontent.h>
 
 #include <QSettings>
 #include <QTest>
@@ -139,17 +137,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");
         core->installDefaultComponentsSilently();
 
         QVERIFY(m_settings->value("IFW_UNIT_TEST_LOCAL").toString().isEmpty());