Add new option --auto-answer

With this change user can individually answer to message queries if
message id is known. The syntax is --auto-answer
message.id=QMessageBox::Ok,message.id2=QMessageBox::Cancel

Task-number: QTIFW-1740
Change-Id: I86d08df77cf5f3d665901b599586d8c52b7dcdf6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

5 files changed, 42 insertions, 3 deletions

diff --git a/tests/auto/installer/messageboxhandler/data/messagebox/A/1.0.2-1meta.7z b/tests/auto/installer/messageboxhandler/data/messagebox/A/1.0.2-1meta.7z
new file mode 100644
index 000000000..3c2832174
--- /dev/null
+++ b/tests/auto/installer/messageboxhandler/data/messagebox/A/1.0.2-1meta.7z
diff --git a/tests/auto/installer/messageboxhandler/data/messagebox/Updates.xml b/tests/auto/installer/messageboxhandler/data/messagebox/Updates.xml
new file mode 100644
index 000000000..77b5a9956
--- /dev/null
+++ b/tests/auto/installer/messageboxhandler/data/messagebox/Updates.xml
@@ -0,0 +1,13 @@
+<Updates>
+ <ApplicationName>{AnyApplication}</ApplicationName>
+ <ApplicationVersion>1.0.0</ApplicationVersion>
+ <PackageUpdate>
+  <Name>A</Name>
+  <DisplayName>A</DisplayName>
+  <Description>Example component A</Description>
+  <Version>1.0.2-1</Version>
+  <ReleaseDate>2015-01-01</ReleaseDate>
+  <Default>true</Default>
+  <Script>script.qs</Script>
+ </PackageUpdate>
+</Updates>
diff --git a/tests/auto/installer/messageboxhandler/messageboxhandler.pro b/tests/auto/installer/messageboxhandler/messageboxhandler.pro
index 3bb0f7b64..fd87ba92e 100644
--- a/tests/auto/installer/messageboxhandler/messageboxhandler.pro
+++ b/tests/auto/installer/messageboxhandler/messageboxhandler.pro
@@ -1,7 +1,5 @@
 include(../../qttest.pri)
 
-QT += qml widgets
-
 SOURCES += tst_messageboxhandler.cpp
 
 RESOURCES += \
diff --git a/tests/auto/installer/messageboxhandler/settings.qrc b/tests/auto/installer/messageboxhandler/settings.qrc
index 51e4bba19..2e0d88a2b 100644
--- a/tests/auto/installer/messageboxhandler/settings.qrc
+++ b/tests/auto/installer/messageboxhandler/settings.qrc
@@ -7,5 +7,7 @@
         <file>data/invalidoperation/A/1.0.2-1meta.7z</file>
         <file>data/missingarchive/Updates.xml</file>
         <file>data/missingarchive/C/1.0.0content.7z.sha1</file>
+        <file>data/messagebox/Updates.xml</file>
+        <file>data/messagebox/A/1.0.2-1meta.7z</file>
     </qresource>
 </RCC>
diff --git a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
index 1c819fa7c..a6d100603 100644
--- a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
+++ b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
@@ -197,6 +197,32 @@ private slots:
         QCOMPARE(PackageManagerCore::Canceled, core->status());
     }
 
+    void messageBoxFromScriptDefaultAnswer()
+    {
+        setRepository(":///data/messagebox");
+        // Resets in autoAcceptMessageBoxes set in previous function
+        MessageBoxHandler::instance()->setDefaultAction(MessageBoxHandler::AskUser);
+        core->installSelectedComponentsSilently(QStringList () << "A");
+
+        // These values are written in script based on default
+        // messagebox query results.
+        QCOMPARE(core->value("test.question.default.ok"), QLatin1String("Ok"));
+        QCOMPARE(core->value("test.question.default.cancel"), QLatin1String("Cancel"));
+    }
+
+    void messageBoxFromScriptAutoAnswer()
+    {
+        setRepository(":///data/messagebox");
+        core->setMessageBoxAutomaticAnswer("test.question.default.ok", QMessageBox::Cancel);
+        core->setMessageBoxAutomaticAnswer("test.question.default.cancel", QMessageBox::Ok);
+        core->installSelectedComponentsSilently(QStringList () << "A");
+
+        // These values are written in script based on
+        // messagebox query results.
+        QCOMPARE(core->value("test.question.default.ok"), QLatin1String("Cancel"));
+        QCOMPARE(core->value("test.question.default.cancel"), QLatin1String("Ok"));
+    }
+
     void cleanupTestCase()
     {
         core->deleteLater();
@@ -211,6 +237,6 @@ private:
     QString m_installDir;
 };
 
-QTEST_MAIN(tst_MessageBoxHandler)
+QTEST_GUILESS_MAIN(tst_MessageBoxHandler)
 
 #include "tst_messageboxhandler.moc"