Fix JSON.stringify with sequence types

Stringify::JA takes an ArrayObject* but it merely gets the length
property and does indexed get calls. Those work also on array-like
objects such as our sequence wrappers.

Task-number: QTBUG-45018
Change-Id: I4ec4f89a2e09c918fbc2ff1d48ae5915e67ce280
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 21 insertions, 6 deletions

diff --git a/tests/auto/qml/qqmlecmascript/data/sequenceConversion.array.qml b/tests/auto/qml/qqmlecmascript/data/sequenceConversion.array.qml
index 5103168fd3..99c49ebf62 100644
--- a/tests/auto/qml/qqmlecmascript/data/sequenceConversion.array.qml
+++ b/tests/auto/qml/qqmlecmascript/data/sequenceConversion.array.qml
@@ -10,6 +10,11 @@ Item {
         objectName: "msco"
     }
 
+    Component {
+        id: mscoComponent
+        MySequenceConversionObject { }
+    }
+
     property bool success: false
 
     property variant intList
@@ -252,4 +257,13 @@ Item {
         if (testSequence.valueOf() == prevValueOf) referenceDeletion = false;
         if (testSequence.length == prevLength) referenceDeletion = false;
     }
+
+    function jsonConversion() {
+        success = true
+        var msco = mscoComponent.createObject()
+        if (JSON.stringify(msco.intListProperty) != "[1,2,3,4]") success = false;
+        if (JSON.stringify(msco.qrealListProperty) != "[1.1,2.2,3.3,4.4]") success = false;
+        if (JSON.stringify(msco.boolListProperty) != "[true,false,true,false]") success = false;
+        if (JSON.stringify(msco.stringListProperty) != "[\"first\",\"second\",\"third\",\"fourth\"]") success = false;
+    }
 }
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index e0b8127dfb..c0cf123243 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -5562,17 +5562,18 @@ void tst_qqmlecmascript::sequenceConversionArray()
     // ensure that in JS the returned sequences act just like normal JS Arrays.
     QUrl qmlFile = testFileUrl("sequenceConversion.array.qml");
     QQmlComponent component(&engine, qmlFile);
-    QObject *object = component.create();
+    QScopedPointer<QObject> object(component.create());
     QVERIFY(object != nullptr);
-    QMetaObject::invokeMethod(object, "indexedAccess");
+    QMetaObject::invokeMethod(object.data(), "indexedAccess");
     QVERIFY(object->property("success").toBool());
-    QMetaObject::invokeMethod(object, "arrayOperations");
+    QMetaObject::invokeMethod(object.data(), "arrayOperations");
     QVERIFY(object->property("success").toBool());
-    QMetaObject::invokeMethod(object, "testEqualitySemantics");
+    QMetaObject::invokeMethod(object.data(), "testEqualitySemantics");
     QVERIFY(object->property("success").toBool());
-    QMetaObject::invokeMethod(object, "testReferenceDeletion");
+    QMetaObject::invokeMethod(object.data(), "testReferenceDeletion");
     QCOMPARE(object->property("referenceDeletion").toBool(), true);
-    delete object;
+    QMetaObject::invokeMethod(object.data(), "jsonConversion");
+    QVERIFY(object->property("success").toBool());
 }