diff options
author | jkobus <jaroslaw.kobus@theqtcompany.com> | 2015-01-27 10:47:52 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-27 13:52:14 +0000 |
commit | 838f3284963c00dc4407cff5c35ff823b0d3123c (patch) | |
tree | 9863a857daf3d65304c5023442cb3d30e297b922 /tests/auto/installer/scriptengine/tst_scriptengine.cpp | |
parent | 4a74d31c63dde5cd6be9518cc4636f42919df071 (diff) |
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>
Diffstat (limited to 'tests/auto/installer/scriptengine/tst_scriptengine.cpp')
-rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 64 |
1 files changed, 64 insertions, 0 deletions
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) { |