diff options
| author | Richard Weickelt <richard@weickelt.de> | 2021-02-13 16:00:25 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2021-02-15 21:38:33 +0000 |
| commit | f8c18f9a4e2906330638f17f612ee62325a88dc0 (patch) | |
| tree | f7810768d3fa17da54c15d77d1db5f469f11bc53 /tests | |
| parent | 91c2a99b81c2c3fc6a22787c3b471a47515abf00 (diff) | |
Test for array-like objects with instanceof Array
Array.isArray() seemed to work for arrays created in scripts as well as
for QStringList and QVariantList created in C++ when using QtScript.
QJSEngine is more strict (see the comments in QTBUG-45018). One way to
work around that problem is to use instanceof Array instead.
Change-Id: I0f1c8757a5ab2f82e26eff19a8b5ecf667bb04b1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/path-probe/BaseApp.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/undefined-target-platform/undefined-target-platform.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs b/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs index acafdb52b..62871698e 100644 --- a/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs +++ b/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs @@ -61,7 +61,7 @@ Product { if (lhs.length !== rhs.length) return false; for (var i = 0; i < lhs.length; ++i) { - if (Array.isArray(lhs[i]) && Array.isArray(rhs[i])) { + if ((lhs[i] instanceof Array) && (rhs[i] instanceof Array)) { if (!compareArrays(lhs[i], rhs[i])) return false; } else if (FileInfo.resolvePath(path, lhs[i]) !== FileInfo.resolvePath(path, rhs[i])) { diff --git a/tests/auto/blackbox/testdata/undefined-target-platform/undefined-target-platform.qbs b/tests/auto/blackbox/testdata/undefined-target-platform/undefined-target-platform.qbs index 2b3724c26..4a738afcc 100644 --- a/tests/auto/blackbox/testdata/undefined-target-platform/undefined-target-platform.qbs +++ b/tests/auto/blackbox/testdata/undefined-target-platform/undefined-target-platform.qbs @@ -6,7 +6,7 @@ Product { qbs.targetPlatform: undefined readonly property bool _validate: { - if (Array.isArray(qbs.targetOS) && qbs.targetOS.length === 0) + if ((qbs.targetOS instanceof Array) && qbs.targetOS.length === 0) return true; throw "Invalid qbs.targetOS value: " + qbs.targetOS; } |