From 838f3284963c00dc4407cff5c35ff823b0d3123c Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@theqtcompany.com>
Date: Tue, 27 Jan 2015 10:47:52 +0100
Subject: Fix the invocation order of entering() and page callback

Task-number: QTIFW-620
Change-Id: I1a40aae35dc1c259a96043a1056aa631bf7279b2
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 .../installer/scriptengine/tst_scriptengine.cpp    | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'tests/auto/installer/scriptengine/tst_scriptengine.cpp')

diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 12915e30a..09785850e 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -96,6 +96,55 @@ private:
     QWidget *m_widget;
 };
 
+class EnteringPage : public PackageManagerPage
+{
+    Q_OBJECT
+    Q_PROPERTY(QStringList invocationOrder READ invocationOrder)
+public:
+    explicit EnteringPage(PackageManagerCore *core)
+        : PackageManagerPage(core)
+    {
+        setObjectName(QLatin1String("EnteringPage"));
+    }
+    QStringList invocationOrder() const {
+        return m_invocationOrder;
+    }
+public slots:
+    Q_INVOKABLE void enteringInvoked() {
+        m_invocationOrder << QLatin1String("Entering");
+    }
+    Q_INVOKABLE void callbackInvoked() {
+        m_invocationOrder << QLatin1String("Callback");
+    }
+
+protected:
+    void entering() {
+        enteringInvoked();
+    }
+private:
+    QStringList m_invocationOrder;
+};
+
+class EnteringGui : public PackageManagerGui
+{
+    Q_OBJECT
+public:
+    explicit EnteringGui(PackageManagerCore *core)
+        : PackageManagerGui(core)
+    {}
+
+    EnteringPage *enteringPage() const {
+        return m_enteringPage;
+    }
+
+    void init() {
+        m_enteringPage = new EnteringPage(packageManagerCore());
+        setPage(0, m_enteringPage);
+    }
+private:
+    EnteringPage *m_enteringPage;
+};
+
 class EmitSignalObject : public QObject
 {
     Q_OBJECT
@@ -377,6 +426,21 @@ private slots:
         QCOMPARE(gui.widget()->property("complete").toString(), QString("true"));
     }
 
+    void checkEnteringCalledBeforePageCallback()
+    {
+        EnteringGui gui(&m_core);
+        gui.init();
+        setExpectedScriptOutput("Loaded control script \":///data/enteringpage.qs\" ");
+        gui.loadControlScript(":///data/enteringpage.qs");
+        gui.show();
+
+        EnteringPage *enteringPage = gui.enteringPage();
+
+        QStringList expectedOrder;
+        expectedOrder << QLatin1String("Entering") << QLatin1String("Callback");
+        QCOMPARE(enteringPage->invocationOrder(), expectedOrder);
+    }
+
 private:
     void setExpectedScriptOutput(const char *message)
     {
-- 
cgit v1.2.3