remove slotCurrentPageChanged and call it directly

 - also renamed it to better name: executeControlScript

Change-Id: Id2bb7cada2386561c2b25b158c6aa101382e5cc4
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 283d7bdad..b626d5a2e 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -26,9 +26,9 @@ public:
 
     virtual void init() {}
 
-    void callProtectedDelayedControlScriptExecution(int id)
+    void callProtectedDelayedExecuteControlScript(int id)
     {
-        delayedControlScriptExecution(id);
+        executeControlScript(id);
     }
 };
 
@@ -218,18 +218,16 @@ private slots:
             testGui.loadControlScript(":///data/auto-install.qs");
             QCOMPARE(m_core.value("GuiTestValue"), QString("hello"));
 
-            testGui.show();
             // show event calls automatically the first callback which does not exist
             setExpectedScriptOutput("Control script callback \"IntroductionPageCallback\" does not exist. ");
-            // give some time to the event triggering mechanism
-            qApp->processEvents();
+            testGui.show();
 
             // inside the auto-install script we are clicking the next button, with a not existing button
             QTest::ignoreMessage(QtWarningMsg, "Button with type:  \"unknown button\" not found! ");
-            testGui.callProtectedDelayedControlScriptExecution(PackageManagerCore::ComponentSelection);
+            testGui.callProtectedDelayedExecuteControlScript(PackageManagerCore::ComponentSelection);
 
             setExpectedScriptOutput("FinishedPageCallback - OK");
-            testGui.callProtectedDelayedControlScriptExecution(PackageManagerCore::InstallationFinished);
+            testGui.callProtectedDelayedExecuteControlScript(PackageManagerCore::InstallationFinished);
         } catch (const Error &error) {
             QFAIL(qPrintable(error.message()));
         }