Add possibility to post load install scripts

This change adds attribute, postLoad, to existing <Script> -element.
Using <Script postLoad="True"> will call the script loading and
evaluation only to those components which are selected for install or
update right before the components installation start.

Task-number: QTIFW-2820
Change-Id: Ic1967d329cbb5de6a0216ff3f76cc2ede178db80
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

7 files changed, 71 insertions, 12 deletions

diff --git a/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp b/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp
index 43bd15288..b52e0e9f6 100644
--- a/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp
+++ b/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -125,7 +125,7 @@ private slots:
         const QString debugMessage =  QString("Exception while loading the component script");
         const QRegularExpression re(debugMessage);
         QTest::ignoreMessage(QtWarningMsg, re);
-        invalidScriptComponent->loadComponentScript(":///data/broken_script.qs");
+        invalidScriptComponent->evaluateComponentScript(":///data/broken_script.qs");
 
         model->reset(components);
         testModelState(model, m_checkedComponentsWithBrokenScript, m_partiallyCheckedComponentsWithBrokenScript, m_uncheckedComponentsWithBrokenScript);
diff --git a/tests/auto/installer/commandlineinstall/data/installPackagesRepository/Updates.xml b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/Updates.xml
index 81831ed5b..3b5e22cc0 100644
--- a/tests/auto/installer/commandlineinstall/data/installPackagesRepository/Updates.xml
+++ b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/Updates.xml
@@ -170,4 +170,14 @@
   <DownloadableArchives>content.7z</DownloadableArchives>
   <Virtual>true</Virtual>
  </PackageUpdate>
+  <PackageUpdate>
+  <Name>componentJ</Name>
+  <DisplayName>component J</DisplayName>
+  <Description>This component has post install script.</Description>
+  <Version>1.0.0</Version>
+  <ReleaseDate>2014-08-25</ReleaseDate>
+  <SortingPriority>50</SortingPriority>
+  <DownloadableArchives>content.7z</DownloadableArchives>
+  <Script postLoad="True">postLoadscript.js</Script>
+ </PackageUpdate>
 </Updates>
diff --git a/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0content.7z b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0content.7z
new file mode 100644
index 000000000..58ff52baa
--- /dev/null
+++ b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0content.7z
diff --git a/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0meta.7z b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0meta.7z
new file mode 100644
index 000000000..be99410a8
--- /dev/null
+++ b/tests/auto/installer/commandlineinstall/data/installPackagesRepository/componentJ/1.0.0meta.7z
diff --git a/tests/auto/installer/commandlineinstall/settings.qrc b/tests/auto/installer/commandlineinstall/settings.qrc
index 824517e1e..992dbfd58 100644
--- a/tests/auto/installer/commandlineinstall/settings.qrc
+++ b/tests/auto/installer/commandlineinstall/settings.qrc
@@ -14,6 +14,8 @@
         <file>data/installPackagesRepository/componentG/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentH/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentI/1.0.0content.7z</file>
+        <file>data/installPackagesRepository/componentJ/1.0.0content.7z</file>
+        <file>data/installPackagesRepository/componentJ/1.0.0meta.7z</file>
         <file>data/installPackagesRepository/componentG/1.0.0meta.7z</file>
         <file>data/installPackagesRepository/componentF.subcomponent1/1.0.0content.7z</file>
         <file>data/installPackagesRepository/componentF.subcomponent2/1.0.0content.7z</file>
diff --git a/tests/auto/installer/commandlineinstall/tst_commandlineinstall.cpp b/tests/auto/installer/commandlineinstall/tst_commandlineinstall.cpp
index c0ac7f399..a986234c8 100644
--- a/tests/auto/installer/commandlineinstall/tst_commandlineinstall.cpp
+++ b/tests/auto/installer/commandlineinstall/tst_commandlineinstall.cpp
@@ -729,6 +729,21 @@ private slots:
         QVERIFY(file.remove());
     }
 
+    void testPostScript()
+    {
+        QScopedPointer<PackageManagerCore> core(PackageManager::getPackageManagerWithInit
+                                                (m_installDir, ":///data/installPackagesRepository"));
+        QCOMPARE(PackageManagerCore::Success, core->installSelectedComponentsSilently(QStringList() << QLatin1String("componentJ")));
+        VerifyInstaller::verifyInstallerResources(m_installDir, "componentJ", "1.0.0content.txt"); //Selected
+        VerifyInstaller::verifyInstallerResources(m_installDir, "componentA", "1.0.0content.txt"); //Dependency for componentG
+        VerifyInstaller::verifyInstallerResources(m_installDir, "componentE", "1.0.0content.txt"); //ForcedInstall
+        VerifyInstaller::verifyInstallerResources(m_installDir, "componentG", "1.0.0content.txt"); //Default
+
+        //componentJ is extracted to "extractToAnotherPath" -folder in post install script
+        bool fileExists = QFileInfo::exists(m_installDir + QDir::separator() + "extractToAnotherPath" + QDir::separator() + "installcontentJ.txt");
+        QVERIFY2(fileExists, QString("File \"%1\" does not exist.").arg("installcontentJ.txt").toLatin1());
+    }
+
     void init()
     {
         m_installDir = QInstaller::generateTemporaryFileName();
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 105bcf5d7..6c55fe205 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -388,13 +388,24 @@ private slots:
         QCOMPARE(result.isError(), false);
     }
 
+    void loadSimpleComponentScript_data()
+    {
+        QTest::addColumn<QString>("path");
+        QTest::addColumn<bool>("postLoad");
+        QTest::newRow("Pre component script") << ":///data/component1.qs" << false;
+        QTest::newRow("Post component script") << ":///data/component1.qs" << true;
+    }
+
     void loadSimpleComponentScript()
     {
-       try {
-            // ignore retranslateUi which is called by loadComponentScript
+        QFETCH(QString, path);
+        QFETCH(bool, postLoad);
+
+        try {
+            // ignore retranslateUi which is called by evaluateComponentScript
             setExpectedScriptOutput("Component constructor - OK");
             setExpectedScriptOutput("retranslateUi - OK");
-            m_component->loadComponentScript(":///data/component1.qs");
+            m_component->evaluateComponentScript(path, postLoad);
 
             setExpectedScriptOutput("retranslateUi - OK");
             m_component->languageChanged();
@@ -422,8 +433,19 @@ private slots:
         }
     }
 
+    void loadBrokenComponentScript_data()
+    {
+        QTest::addColumn<QString>("path");
+        QTest::addColumn<bool>("postLoad");
+        QTest::newRow("Pre component script") << ":///data/component2.qs" << false;
+        QTest::newRow("Post component script") << ":///data/component2.qs" << true;
+    }
+
     void loadBrokenComponentScript()
     {
+        QFETCH(QString, path);
+        QFETCH(bool, postLoad);
+
         Component *testComponent = new Component(&m_core);
         testComponent->setValue(scName, "broken.component");
 
@@ -433,21 +455,31 @@ private slots:
         try {
             // ignore Output from script
             setExpectedScriptOutput("script function: Component");
-            testComponent->loadComponentScript(":///data/component2.qs");
+            testComponent->evaluateComponentScript(path, postLoad);
         } catch (const Error &error) {
             const QString debugMessage(
-                QString("create Error-Exception: \"Exception while loading the component script \"%1\": "
-                "ReferenceError: broken is not defined\"").arg(QDir::toNativeSeparators(":///data/component2.qs")));
+                QString("Exception while loading the component script \"%1\": "
+                "ReferenceError: broken is not defined on line number: 33").arg(QDir::toNativeSeparators(":///data/component2.qs")));
             QVERIFY2(debugMessage.contains(error.message()), "(ReferenceError: broken is not defined)");
         }
     }
 
+    void loadComponentUserInterfaces_data()
+    {
+        QTest::addColumn<QString>("path");
+        QTest::addColumn<bool>("postLoad");
+        QTest::newRow("Pre component script") << ":///data/userinterface.qs" << false;
+        QTest::newRow("Post component script") << ":///data/userinterface.qs" << true;
+    }
+
     void loadComponentUserInterfaces()
     {
-       try {
+        QFETCH(QString, path);
+        QFETCH(bool, postLoad);
+        try {
             setExpectedScriptOutput("checked: false");
             m_component->loadUserInterfaces(QDir(":///data"), QStringList() << QLatin1String("form.ui"));
-            m_component->loadComponentScript(":///data/userinterface.qs");
+            m_component->evaluateComponentScript(path, postLoad);
         } catch (const Error &error) {
             QFAIL(qPrintable(error.message()));
         }
@@ -591,7 +623,7 @@ private slots:
         try {
             m_core.setPackageManager();
             Component *component = m_core.componentByName("component.test.addOperation");
-            component->loadComponentScript(":///data/addOperation.qs");
+            component->evaluateComponentScript(":///data/addOperation.qs");
 
             setExpectedScriptOutput("Component::createOperations()");
             component->createOperations();