warn if QScriptValue::setScriptClass() is called on incompatible object

1 files changed, 23 insertions, 6 deletions

diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index b125965fa5..f9ce79f27b 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2220,13 +2220,30 @@ void tst_QScriptValue::getSetScriptClass()
     QCOMPARE(inv.scriptClass(), (QScriptClass*)0);
     QScriptValue num(123);
     QCOMPARE(num.scriptClass(), (QScriptClass*)0);
-    QScriptValue obj = eng.newObject();
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+
     TestScriptClass testClass(&eng);
-    obj.setScriptClass(&testClass);
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
-    obj.setScriptClass(0);
-    QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    // object created in C++ (newObject())
+    {
+        QScriptValue obj = eng.newObject();
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+        obj.setScriptClass(&testClass);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
+        obj.setScriptClass(0);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    }
+    // object created in JS
+    {
+        QScriptValue obj = eng.evaluate("new Object");
+        QVERIFY(!eng.hasUncaughtException());
+        QVERIFY(obj.isObject());
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+        QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setScriptClass() failed: cannot change class of non-QScriptObject");
+        obj.setScriptClass(&testClass);
+        QEXPECT_FAIL("", "With JSC back-end, the class of a plain object created in JS can't be changed", Continue);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
+        obj.setScriptClass(0);
+        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
+    }
 }
 
 static QScriptValue getArg(QScriptContext *ctx, QScriptEngine *)