tst_qqmllanguage: Fix singleton tests

The JavaScript pragma test expected the dynamic signal test to run
before. Therefore, it would fail when run in isolation. Move the two
tests into one function.

Change-Id: I0edb1f091c6a845110c3f741cbb48e846c423005
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 28 insertions, 27 deletions

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 12ed50137b..ad96b1438f 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -243,12 +243,11 @@ private slots:
     void compositeSingletonModuleQualified();
     void compositeSingletonInstantiateError();
     void compositeSingletonDynamicPropertyError();
-    void compositeSingletonDynamicSignal();
+    void compositeSingletonDynamicSignalAndJavaScriptPragma();
     void compositeSingletonQmlRegisterTypeError();
     void compositeSingletonQmldirNoPragmaError();
     void compositeSingletonQmlDirError();
     void compositeSingletonRemote();
-    void compositeSingletonJavaScriptPragma();
     void compositeSingletonSelectors();
     void compositeSingletonRegistered();
     void compositeSingletonCircular();
@@ -4277,16 +4276,35 @@ void tst_qqmllanguage::compositeSingletonDynamicPropertyError()
     VERIFY_ERRORS(0);
 }
 
-// Having a composite singleton type as dynamic signal parameter succeeds
-// (like C++ singleton)
-void tst_qqmllanguage::compositeSingletonDynamicSignal()
+void tst_qqmllanguage::compositeSingletonDynamicSignalAndJavaScriptPragma()
 {
-    QQmlComponent component(&engine, testFileUrl("singletonTest11.qml"));
-    VERIFY_ERRORS(0);
-    QScopedPointer<QObject> o(component.create());
-    QVERIFY(o != nullptr);
+    {
+        // Having a composite singleton type as dynamic signal parameter succeeds
+        // (like C++ singleton)
+
+        QQmlComponent component(&engine, testFileUrl("singletonTest11.qml"));
+        VERIFY_ERRORS(0);
+        QScopedPointer<QObject> o(component.create());
+        QVERIFY(o != nullptr);
+
+        verifyCompositeSingletonPropertyValues(o.data(), "value1", 99, "value2", -55);
+    }
+    {
+        // Load a composite singleton type and a javascript file that has .pragma library
+        // in it. This will make sure that the javascript .pragma does not get mixed with
+        // the pragma Singleton changes.
 
-    verifyCompositeSingletonPropertyValues(o.data(), "value1", 99, "value2", -55);
+        QQmlComponent component(&engine, testFileUrl("singletonTest16.qml"));
+        VERIFY_ERRORS(0);
+        QScopedPointer<QObject> o(component.create());
+        QVERIFY(o != nullptr);
+
+        // The value1 that is read from the SingletonType was changed from 125 to 99
+        // above. As the type is a singleton and
+        // the engine has not been destroyed, we just retrieve the old instance and
+        // the value is still 99.
+        verifyCompositeSingletonPropertyValues(o.data(), "value1", 99, "value2", 333);
+    }
 }
 
 // Use qmlRegisterType to register a qml composite type with pragma Singleton defined in it.
@@ -4338,23 +4356,6 @@ void tst_qqmllanguage::compositeSingletonRemote()
     verifyCompositeSingletonPropertyValues(o.data(), "value1", 525, "value2", 355);
 }
 
-// Load a composite singleton type and a javascript file that has .pragma library
-// in it. This will make sure that the javascript .pragma does not get mixed with
-// the pragma Singleton changes.
-void tst_qqmllanguage::compositeSingletonJavaScriptPragma()
-{
-    QQmlComponent component(&engine, testFileUrl("singletonTest16.qml"));
-    VERIFY_ERRORS(0);
-    QScopedPointer<QObject> o(component.create());
-    QVERIFY(o != nullptr);
-
-    // The value1 that is read from the SingletonType was changed from 125 to 99
-    // in compositeSingletonDynamicSignal() above. As the type is a singleton and
-    // the engine has not been destroyed, we just retrieve the old instance and
-    // the value is still 99.
-    verifyCompositeSingletonPropertyValues(o.data(), "value1", 99, "value2", 333);
-}
-
 // Reads values from a Singleton accessed through selectors.
 void tst_qqmllanguage::compositeSingletonSelectors()
 {