1 files changed, 27 insertions, 18 deletions
diff --git a/tests/auto/installer/moveoperation/tst_moveoperation.cpp b/tests/auto/installer/moveoperation/tst_moveoperation.cpp
index f5b7bbcd9..6bc72242a 100644
--- a/tests/auto/installer/moveoperation/tst_moveoperation.cpp
+++ b/tests/auto/installer/moveoperation/tst_moveoperation.cpp
@@ -39,6 +39,27 @@ class tst_moveoperation : public QObject
 {
     Q_OBJECT
 
+private:
+    void installFromCLI(const QString &repository)
+    {
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+                (m_testDirectory, repository);
+        core->installDefaultComponentsSilently();
+
+        QFile movedFile(m_testDirectory + QDir::separator() + "DestinationFolder/testFile.txt");
+        QVERIFY(movedFile.exists());
+        QFile originalFile(m_sourceFile);
+        QVERIFY(!originalFile.exists());
+
+        core->setPackageManager();
+        core->commitSessionOperations();
+
+        core->uninstallComponentsSilently(QStringList() << "A");
+
+        QVERIFY(!movedFile.exists());
+        QVERIFY(originalFile.exists());
+    }
+
 private slots:
     void initTestCase()
     {
@@ -101,26 +122,14 @@ private slots:
         QVERIFY(QFile::exists(m_destinationFile));
     }
 
-    void testPerformingFromCLI()
+    void testMoveOperationFromScript()
     {
-        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
-                (m_testDirectory, ":///data/repository");
-        core->installDefaultComponentsSilently();
-
-        QFile movedFile(m_testDirectory + QDir::separator() + "DestinationFolder/testFile.txt");
-        QVERIFY(movedFile.exists());
-        QFile originalFile(m_sourceFile);
-        QVERIFY(!originalFile.exists());
-
-        core->setPackageManager();
-        core->commitSessionOperations();
-
-        core->uninstallComponentsSilently(QStringList() << "A");
-
-        QVERIFY(!movedFile.exists());
-        QVERIFY(originalFile.exists());
+        installFromCLI(":///data/repository");
+    }
 
-        core->deleteLater();
+    void testMoveOperationFromXML()
+    {
+        installFromCLI(":///data/xmloperationrepository");
     }
 
     void cleanupTestCase()