1 files changed, 66 insertions, 2 deletions

diff --git a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
index b7ea4fbc5..2da0870c7 100644
--- a/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
+++ b/tests/auto/installer/settingsoperation/tst_settingsoperation.cpp
@@ -90,7 +90,7 @@ private slots:
             UpdateOperation::InvalidArguments);
         compareString = "Current method argument calling \"Settings\" with arguments \"path=first; "
             "method=second; key=third; value=fourth\" is not supported. Please use set, remove, "
-            "add_array_value or remove_array_value.";
+            "add_array_value, or remove_array_value.";
         QCOMPARE(wrongMethodArgumentOperation.errorString(), compareString);
 
         // same for undo
@@ -177,6 +177,7 @@ private slots:
 
         QFile testFile(testFilePath);
         QVERIFY2(testFile.open(QIODevice::WriteOnly | QIODevice::Text), contentFile.errorString().toLatin1());
+        m_cleanupFilePaths << testFilePath;
 
         QTextStream out(&testFile);
 
@@ -244,6 +245,7 @@ private slots:
         QFile testFile(testFilePath);
         QVERIFY2(testFile.open(QIODevice::WriteOnly | QIODevice::Text), contentFile.errorString()
             .toLatin1());
+        m_cleanupFilePaths << testFilePath;
 
         QTextStream out(&testFile);
 
@@ -293,7 +295,7 @@ private slots:
         QCOMPARE(testSettings.value("testcategory/categoryarrayvalue1").toStringList(),
                  QStringList() << "value1" << "value2" << "value3");
 
-        core->installDefaultComponentsSilently();
+        core->installSelectedComponentsSilently(QStringList() << "A");
 
         QCOMPARE(testSettings.value("testcategory/categoryarrayvalue1").toStringList(),
                  QStringList() << "value1" << "value2" << "value3" << "valueFromScript");
@@ -309,6 +311,68 @@ private slots:
         core->deleteLater();
     }
 
+    void testPerformingFromCLIWithPlaceholders()
+    {
+        QString installDir = QInstaller::generateTemporaryFileName();
+        QVERIFY(QDir().mkpath(installDir));
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+            (installDir, ":///data/repository");
+
+        core->installSelectedComponentsSilently(QStringList() << "B");
+        // Path is set in component constructor in install script
+        const QString  settingsFile = core->value("SettingsPathFromVariable");
+        QSettings testSettings(QDir(m_testSettingsDirPath).filePath(settingsFile),
+                               QSettings::IniFormat);
+
+        QCOMPARE(testSettings.value("testcategory/categoryarrayvalue1").toStringList(),
+                 QStringList() << "ValueFromPlaceholder");
+
+        core->commitSessionOperations();
+        core->setPackageManager();
+        core->uninstallComponentsSilently(QStringList() << "B");
+
+        // Settings file is removed as it is empty
+        QVERIFY(!QFile::exists(settingsFile));
+        QDir dir(installDir);
+        QVERIFY(dir.removeRecursively());
+        core->deleteLater();
+    }
+
+    void testPerformingFromCLIWithSettingsFileMoved()
+    {
+        QString installDir = QInstaller::generateTemporaryFileName();
+        QVERIFY(QDir().mkpath(installDir));
+        PackageManagerCore *core = PackageManager::getPackageManagerWithInit
+            (installDir, ":///data/repository");
+
+
+        core->installSelectedComponentsSilently(QStringList() << "C");
+
+        const QString settingsFileName = qApp->applicationDirPath() + "/oldTestSettings.ini";
+        QSettings testSettings(QDir(m_testSettingsDirPath).filePath(settingsFileName),
+                               QSettings::IniFormat);
+
+        QCOMPARE(testSettings.value("testcategory/categoryarrayvalue1").toStringList(),
+                 QStringList() << "valueFromScript");
+
+        QFile settingsFile(settingsFileName);
+        // Move the settings path to new location. Script has set values
+        // ComponentCSettingsPath (@InstallerDirPath@/newTestSettings.ini) and
+        // ComponentCSettingsPath_OLD (@InstallerDirPath@/oldTestSettings.ini) so
+        // UNDO operation should delete the moved newTestSettings.ini file instead.
+        QVERIFY2(settingsFile.rename(qApp->applicationDirPath() + "/newTestSettings.ini"), "Could not move settings file.");
+        core->commitSessionOperations();
+        core->setPackageManager();
+        core->uninstallComponentsSilently(QStringList() << "C");
+
+        // Settings file is removed in uninstall as it is empty
+        QVERIFY2(!QFile::exists(qApp->applicationDirPath() + "/newTestSettings.ini"), "Settings file not deleted correctly");
+
+        QDir dir(installDir);
+        QVERIFY(dir.removeRecursively());
+        core->deleteLater();
+    }
+
     // called after all tests
     void cleanupTestCase()
     {