aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-12-18 16:16:52 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-12-19 19:53:52 +0100
commit56934da44deb9ea1c2e2ad44b05285ce88592f33 (patch)
tree5481b1c9bf2e53c1d4aa7f38bd4eee14c1b66033 /tests
parentbf89ec173492abc679ce71f41d9e8d49a68743f3 (diff)
QJSValue: Add a toPrimitive() method
We need a way to easily get a primitive from a QJSValue. Change-Id: I91a55d92ffa4ba6139b1e3f2e9308800b7047563 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.cpp46
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.h2
2 files changed, 48 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
index e2f83a78ba..fd2eb40717 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
@@ -1149,6 +1149,52 @@ void tst_QJSValue::toVariant()
}
}
+void tst_QJSValue::toPrimitive_data()
+{
+ newEngine();
+ QTest::addColumn<QJSValue>("value");
+ QTest::addColumn<QJSPrimitiveValue>("result");
+ QTest::addColumn<bool>("causesError");
+
+ QTest::newRow("undefined") << QJSValue(QJSValue::UndefinedValue)
+ << QJSPrimitiveValue(QJSPrimitiveUndefined()) << false;
+ QTest::newRow("null") << QJSValue(QJSValue::NullValue)
+ << QJSPrimitiveValue(QJSPrimitiveNull()) << false;
+ QTest::newRow("bool(true)") << QJSValue(true) << QJSPrimitiveValue(true) << false;
+ QTest::newRow("bool(false)") << QJSValue(false) << QJSPrimitiveValue(false) << false;
+ QTest::newRow("int") << QJSValue(123) << QJSPrimitiveValue(123) << false;
+ QTest::newRow("double") << QJSValue(10.2) << QJSPrimitiveValue(10.2) << false;
+ QTest::newRow("string") << QJSValue(QStringLiteral("boo"))
+ << QJSPrimitiveValue(QStringLiteral("boo")) << false;
+ QTest::newRow("string(managed)") << engine->toScriptValue(QStringLiteral("mmmm"))
+ << QJSPrimitiveValue(QStringLiteral("mmmm")) << false;
+ QTest::newRow("symbol") << engine->evaluate(QStringLiteral("Symbol('bar')"))
+ << QJSPrimitiveValue(QJSPrimitiveUndefined()) << true;
+ QTest::newRow("throws") << engine->evaluate(QStringLiteral(
+ "var a = {};\n"
+ "a.__proto__.toString = function() {\n"
+ " throw new Error('naeh!');\n"
+ "};\n"
+ "a;"))
+ << QJSPrimitiveValue(QJSPrimitiveUndefined()) << true;
+}
+
+void tst_QJSValue::toPrimitive()
+{
+ QFETCH(QJSValue, value);
+ QFETCH(QJSPrimitiveValue, result);
+ QFETCH(bool, causesError);
+
+ QCOMPARE(value.toPrimitive(), result);
+ if (causesError) {
+ QVERIFY(engine->hasError());
+ engine->catchError();
+ } else {
+ QJSValue reconstructed(std::move(result));
+ QVERIFY(reconstructed.strictlyEquals(value));
+ }
+}
+
void tst_QJSValue::toQObject_nonQObject_data()
{
newEngine();
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
index a291e156e0..0b35b58c58 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
@@ -69,6 +69,8 @@ private slots:
void toInt();
void toUInt();
void toVariant();
+ void toPrimitive_data();
+ void toPrimitive();
void toQObject_nonQObject_data();
void toQObject_nonQObject();
void toQObject();