qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qml/qjsengine/tst_qjsengine.cpp

3891 lines
147 KiB
C++
Raw Normal View History

Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
/****************************************************************************
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
**
** This file is part of the test suite of the Qt Toolkit.
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-20 05:21:40 +00:00
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-01-28 11:55:39 +00:00
** a written agreement between you and The Qt Company. For licensing terms
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-20 05:21:40 +00:00
**
Updated license headers From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 11:23:05 +00:00
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtTest/QtTest>
#include <qjsengine.h>
Enable globalObjectProperties_enumerate test. The test can be enabled because QJSValueIterator is back. Change-Id: I81220ea17470663dab799eb818168480d2df1a54 Reviewed-on: http://codereview.qt.nokia.com/2439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 10:48:34 +00:00
#include <qjsvalueiterator.h>
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
#include <qgraphicsitem.h>
#include <qstandarditemmodel.h>
#include <QtCore/qnumeric.h>
Fix exception thrown in slot without Qml Engine Don't crash when an exception is thrown in a JS slot but we don't have a Qml engine. Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-07 11:23:17 +00:00
#include <qqmlengine.h>
Refine fix for dynamic properties on QObjects wrapped in JavaScript This is an ammendment to commit 60730cbb5e5475b5db6a15641211aa6958a93197 to further restrict the ability to set dynamic properties on JS wrapped QObjects only on those that are associated with a qml context. Only one such association comes with the static property lookup rules of QML and therefore only those should be prohibited from dynamic properties. The previous implementation on using the "compiledData" field to detect QML association or not is not strong and reliable enough. Change-Id: I10c0e6e58a2727c01a6cb56fdf912bf250333e1f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-04-10 10:58:15 +00:00
#include <qqmlcomponent.h>
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
#include <stdlib.h>
alloca() is declared in stdlib.h on BSD systems ... except on Darwin. Bonus change: Updated auto-tests trying to include 'alloca.h'. This is a follow up on 24c43a5748b8502. Change-Id: I299de00bf0dca7842470b158282daea221a10f2d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-02 11:34:00 +00:00
#include <private/qv4alloca_p.h>
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Fix some GC related tests to work with MSVC Using alloca instead of memset we can convince even MSVC to allocate memory on the stack, to overwrite any previous dead V4 pointers. Change-Id: Ic01bebfc6368e9c3ce1f6155a0f0ea206b90764c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-06 09:57:42 +00:00
#ifdef Q_CC_MSVC
#define NO_INLINE __declspec(noinline)
#else
#define NO_INLINE __attribute__((noinline))
#endif
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QObjectList)
class tst_QJSEngine : public QObject
{
Q_OBJECT
public:
tst_QJSEngine();
virtual ~tst_QJSEngine();
private slots:
Fix calls to overloaded slots for QObjects not created by QML If we don't have a property cache, we need to fall back to a slower method of determining the overload methods. We have the code for that in RelatedMethod, once we determine that we're calling overloads, but we never hit that code path because we did not _initially_ determine that the method was an overload. Task-number: QTBUG-37157 Change-Id: I8ff39156e5668236b3797400b4086ed545624398 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:01:53 +00:00
void callQObjectSlot();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void constructWithParent();
void newObject();
void newArray();
void newArray_HooliganTask218092();
void newArray_HooliganTask233836();
void newVariant();
void newVariant_valueOfToString();
Fix handling of enum values encapsulated in QVariant In case a QJSValue contains a QVariant which wrapps an enum value, the valueOf() method will convert the enum to an int32. Change-Id: I0b92207184f343d53f73884245b90552165c34fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-17 12:51:55 +00:00
void newVariant_valueOfEnum();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void newRegExp();
void jsRegExp();
void newDate();
void jsParseDate();
void newQObject();
void newQObject_ownership();
Avoid calling gc in QQmlEngine destructor. GC may be expensive. GC call in QQmlEngine doesn't have much sense because V8 will destroy all objects living in a current context. The only problem is that V8 may decide to not invoke weak callbacks which may cause a memory leak. To avoid that we track all QObjects that have JavaScript ownership set and we delete them explicitly. The change reduce time of destroying QQmlEngine by 75%, which is really visible in qquicklistmodel test. Change-Id: I2a3668fd23630669114baee8c241a7ecc4100e33 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-04-19 12:38:38 +00:00
void newQObject_deletedEngine();
Fix exception thrown in slot without Qml Engine Don't crash when an exception is thrown in a JS slot but we don't have a Qml engine. Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-07 11:23:17 +00:00
void exceptionInSlot();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void globalObjectProperties();
void globalObjectEquals();
void globalObjectProperties_enumerate();
void createGlobalObjectProperty();
void globalObjectWithCustomPrototype();
void builtinFunctionNames_data();
void builtinFunctionNames();
void evaluate_data();
void evaluate();
void errorMessage_QT679();
void valueConversion_basic();
void valueConversion_QVariant();
void valueConversion_basic2();
void valueConversion_dateTime();
void valueConversion_regExp();
void castWithMultipleInheritance();
void collectGarbage();
void gcWithNestedDataStructure();
void stacktrace();
void numberParsing_data();
void numberParsing();
void automaticSemicolonInsertion();
void errorConstructors();
void argumentsProperty_globalContext();
void argumentsProperty_JS();
void jsNumberClass();
void jsForInStatement_simple();
void jsForInStatement_prototypeProperties();
void jsForInStatement_mutateWhileIterating();
void jsForInStatement_arrays();
Fixes to for...in statement Properly convert the argument to an object if it's not null or undefined as mandated by the standard. Add a similar test case for the with statement. Change-Id: Idd8e245e8dae4803eb0e2010e3d43bb912670444 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-18 08:12:42 +00:00
void jsForInStatement_constant();
void with_constant();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void stringObjects();
void jsStringPrototypeReplaceBugs();
void getterSetterThisObject_global();
void getterSetterThisObject_plain();
void getterSetterThisObject_prototypeChain();
void jsContinueInSwitch();
void jsShadowReadOnlyPrototypeProperty();
void jsReservedWords_data();
void jsReservedWords();
void jsFutureReservedWords_data();
void jsFutureReservedWords();
void jsThrowInsideWithStatement();
void reentrancy_globalObjectProperties();
void reentrancy_Array();
void reentrancy_objectCreation();
void jsIncDecNonObjectProperty();
Fix a crash in JSON.parse Properly set members that are actually array indices and don't crash when trying to set those. Task-number: QTBUG-35383 Change-Id: I04d4b65c27e97a2e9db19541ed46ee1bb202f780 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2013-12-04 15:03:59 +00:00
void JSONparse();
Fix crashes when calling Array.sort with imperfect sort functions We can't use std::sort to implement Array.sort. The reason is that std::sort expects a conformant compare function, and can do weird things (esp. crash) when the sort function isn't conformant. Falling back to qSort is not possible, as the method has been deprecated. So add a copy of the qSort implementation here, and use that one instead. Fix the sortint test in tst_qqmlecmascript to have a consistent sort function for strings, as the result of calling sort is otherwise undefined according to the ecma standard. Task-number: QTBUG-39072 Change-Id: I0602b3aa1ffa4de5006da58396f166805cf4a5e2 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-06-12 12:35:53 +00:00
void arraySort();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void qRegExpInport_data();
void qRegExpInport();
void dateRoundtripJSQtJS();
void dateRoundtripQtJSQt();
void dateConversionJSQt();
void dateConversionQtJS();
Don't enumerate Function.prototype.{connect,disconnect} QML/JS adds connect and disconnect methods to the standard Function.prototype object. Follow the convention of ECMA-262: Function properties should be non-enumerable. In particular, we don't want such built-in properties to show up in user code "for-in" statements. Task-number: QTBUG-21120 Change-Id: I416106badf35daddf32e16f757d37b2b09e58310 Reviewed-on: http://codereview.qt.nokia.com/3587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2011-08-25 10:51:03 +00:00
void functionPrototypeExtensions();
Fix that QJSEngine cannot be used from threads other than the gui thread Implicitly allocate & enter an isolate per thread if needed, store it in TLS and exit it upon thread destruction. As the code that represents QObject dependencies in the GC through implicit dependencies uses its own context, its per-thread data is folded into the v8engine TLS to ensure that it is destructed before the isolate is exited. Task-number: QTBUG-23099 Change-Id: I86538b54939b2fe64db843052eac04c7fd31813e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2011-12-13 09:04:40 +00:00
void threadedEngine();
Allow for function declarations inside conditionals This is strictly speaking a regression from 5.1/v8, which allows for that as real world JavaScript appears to require it. Task-number: QTBUG-33064 Change-Id: Iceaca84373f12fb08459ed007afb25b5a705fa31 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-22 07:24:19 +00:00
void functionDeclarationsInConditionals();
[ChangeLog][QtQml] Fix JavaScript Array.pop() not updating the internal array length correctly While the length property was reporting the correct value, the internal array length was out-of-sync. Task-number: QTBUG-35979 Change-Id: I68820a349cf1ce88c6aabc6a2301a8a861018a10 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-01-07 08:59:10 +00:00
void arrayPop_QTBUG_35979();
Fix memory corruption when calling Array.unshift() The dequeue offset won't wrap around when n > offset. [ChangeLog][QtQml] Fix crash with Array.unshift() Task-number: QTBUG-52065 Change-Id: I5e8b89ec964cd6397100442a5239254bca989a3f Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-04-14 10:40:31 +00:00
void array_unshift_QTBUG_52065();
Fix crash on Array.prototype.join.call(0) We (incorrectly) didn't check the return value to make sure we had a valid self. At the same time, rename the self variable to match up with other methods. Task-number: QTBUG-53672 Change-Id: Ia0ae5a553e49c4c3b2834c7fdf649fe6373951a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-27 22:09:05 +00:00
void array_join_QTBUG_53672();
Add support for deprecated RegExp (constructor) properties These were apparently part of ancient EcmaScript specs, aren't even listed anymore in any recent spec (not even as deprecated), but apparently they are part of what the web supports as well as previous versions of Qml. So this patch implements them. Task-number: QTBUG-36244 Change-Id: I1b9ea7ea09fceb6a486f615837a71e41aae12de4 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-01-20 13:32:26 +00:00
void regexpLastMatch();
Fix a crash in the register allocator The base for an indexed access can be a constant. Change-Id: Icc529c02fb0ff2ac30d6f40088781b6ecfba81fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-21 14:48:39 +00:00
void indexedAccesses();
Fix exception thrown in slot without Qml Engine Don't crash when an exception is thrown in a JS slot but we don't have a Qml engine. Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-07 11:23:17 +00:00
Fix marking of prototype objects in chain With a real prototype chain it can happen that an internal class' prototype's class itself has a prototype. Therefore the first transition on the empty class is a PrototypeChange one, but the class the transition leads to may have PrototypeChange transitions itself, which weren't marked. There are multiple solutions to this, but this patch is the minimal fix by recursing fully through the internal class tree. That way it's easier to back-port the fix also into 5.2.x based branches. Task-number: QTBUG-37834 Change-Id: I901b13a2663fbad5844003ca5752f2f304de320c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-07 09:20:03 +00:00
void prototypeChainGc();
Fix marking of prototype objects in internal class pool As per reported bug, we have to protect ourselves against potential loops and can mark the internal classes much simpler by just walking through the memory pool they were allocated in. Task-number: QTBUG-38299 Change-Id: I3ae96e8082e76d06f4321c5aa6d2e9645d2830a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-16 07:36:38 +00:00
void prototypeChainGc_QTBUG38299();
Fix marking of prototype objects in chain With a real prototype chain it can happen that an internal class' prototype's class itself has a prototype. Therefore the first transition on the empty class is a PrototypeChange one, but the class the transition leads to may have PrototypeChange transitions itself, which weren't marked. There are multiple solutions to this, but this patch is the minimal fix by recursing fully through the internal class tree. That way it's easier to back-port the fix also into 5.2.x based branches. Task-number: QTBUG-37834 Change-Id: I901b13a2663fbad5844003ca5752f2f304de320c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-07 09:20:03 +00:00
Add support for dynamic properties for QObjects in JavaScript In QtScript you could add properties to a JS object that wraps a QObject. Depending on the wrap option the property was either stored on the JavaScript side or as dynamic QObject property. In QJSEngine/QJSValue, neither was supported - properties could not be added. For QObjects wrapped in JavaScript that weren't created by QML, we can restore the behavior of storing dynamically added properties as JavaScript properties. This makes porting from QtScript to QJS* much easier. Task-number: QTBUG-37408 Change-Id: I5ef1f379c08c3d84de9bdcac9b6a9397238064de Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-09 10:17:40 +00:00
void dynamicProperties();
Fix QJSEngine::evaluate using the wrong execution context In contrary to what the documentation says, QJSEngine in Qt 5.x executes in the context of the global object (QScriptIsolate always called enter on the QV8Engine's "root" context, thus making it current). The v4 implementation unfortunately did what the documentation said and used the current context, which is wrong in many ways. For example it completely breaks the optimization of stack allocated contexts, because when a C++ callback is called from within a JS function with a stack allocated context and that C++ code calls QJSEngine::evaluate and creates new closures, the stack context would become an outter context and cause crashes during GC. This patch restores the behavior of Qt 5.0/5.1 and fixes the documentation. Task-number: QTBUG-38530 Change-Id: Ie6481f02e676954cc94b188a1c87c88e7c56dafa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-05-05 13:45:54 +00:00
void scopeOfEvaluate();
V4: support calling constants. Consider: function f() { var a; a(); } Here the constant propagation will propagate the value for a (undefined) to the call site. This was not yet handled, resulting in Q_UNIMPLEMENTED warnings when running a debug build. Change-Id: I5f85f681d975b54df7a9e00bd5b50e6f4350139a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-09 11:10:16 +00:00
void callConstants();
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
void installTranslationFunctions();
Add support for translations in pure QJSEngine based environments Re-add the QScriptEngine::addTranslatorFunctions API that brings back qsTr() and friends to pure QJSEngine based environments. The auto-test were also ported where applicable. Change-Id: Ib03e3495ef09eeea9e4c8341061499768caed307 Sanity-Review: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-06-06 10:42:23 +00:00
void translateScript_data();
void translateScript();
void translateScript_crossScript();
void translateScript_trNoOp();
void translateScript_callQsTrFromCpp();
void translateWithInvalidArgs_data();
void translateWithInvalidArgs();
void translationContext_data();
void translationContext();
void translateScriptIdBased();
void translateScriptUnicode_data();
void translateScriptUnicode();
void translateScriptUnicodeIdBased_data();
void translateScriptUnicodeIdBased();
void translateFromBuiltinCallback();
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
void installConsoleFunctions();
void logging();
void tracing();
void asserts();
void exceptions();
void installGarbageCollectionFunctions();
void installAllExtensions();
Exclude private methods and QObject::deleteLater from enumerable properties This is a regression from Qt 5.1/5.0 introduced with 5.2. Private slots/methods such as QObject::_q_reRegisterTimers() as well as QObject::deleteLater() are not suitable for calls from JavaScript. deleteLater() in particular is covered by the destroy() replacement slot. Task-number: QTBUG-39744 Change-Id: I9b25f3c0d4095ba8e2e8e5ee47e37903b5def1f9 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-06-24 10:05:35 +00:00
void privateMethods();
Add ability to retrieve QJSEngine for a given QObject [ChangeLog][QtQml] Added qjsEngine(QObject*) getter similar to qmlEngine(object) that allows retrieving the engine for an exposed object. Change-Id: Id14adec58d45fe58133f65bab773b07d6bc18569 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-01-12 12:07:38 +00:00
void engineForObject();
V4: only optimize out to-int32 conversions when the operands are int32. The operands of bit-ops are not typed as int32 when no type-inference is done, like for the interpreter. Task-number: QTBUG-43309 Change-Id: I67af18e14ddbc0649530ac23601332ee7d7a1f34 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-18 09:24:22 +00:00
void intConversion_QTBUG43309();
V4: fix ToFixed rounding for 0 fraction digits. (12.5).toFixed() should return 13, not 12. Task-number: QTBUG-43885 Task-number: QTBUG-44039 Change-Id: Id2b19641e8c12dd5755d8447508b74567e4a2b9b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-01-28 08:34:10 +00:00
void toFixed();
Add ability to retrieve QJSEngine for a given QObject [ChangeLog][QtQml] Added qjsEngine(QObject*) getter similar to qmlEngine(object) that allows retrieving the engine for an exposed object. Change-Id: Id14adec58d45fe58133f65bab773b07d6bc18569 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-01-12 12:07:38 +00:00
Fix passing of locals as function arguments with side-effects Commit 75c22465cf8fe262edfe6178bb9ca19661fb710e regressed in allowing locals and arguments to be passed directly as further arguments to function calls, but that's incorrect when considering var i = 2; testFunction(i, i += 2) where it is instrumental to place the first argument into a temp (making a copy) instead of passing it directly. Change-Id: Iffcf6c6eda92a8fb665982cda1db0b96359cd092 Task-number: QTBUG-45879 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-04-30 11:20:43 +00:00
void argumentEvaluationOrder();
Fix crash in Installer Framework when used with Qt 5.6 IFW uses QQmlV4Function in a QJSEngine environment, so there is no QML context. Up to commit cc98678f404cd49750076795f39b31bfa36c80c3 that would work. Let's fall back to the root context as scope if we don't have a qml context. Change-Id: Ib240746a95a0d16d61620f97abc31e4c74f36723 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-02-01 08:33:38 +00:00
void v4FunctionWithoutQML();
Fix crash when using with statement with an expression that throws We need to evaluate the expression for the "with" statement that is supposed to define the new scope _before_ opening up the scope, otherwise - when the evaluation of the expression throws an exception - we'll try to pop the "with" scope we couldn't open in the first place. [ChangeLog][QtQml] Fix crash when using the "with" statement with an expression that throws an exception. Task-number: QTBUG-53794 Change-Id: I7733f5a4c5d844916302b9a91c789a0f6b421e8a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-06-02 13:57:41 +00:00
void withNoContext();
Fix corruption when adding or changing properties of JS objects Commit 833c99db20 introduced this regression by only moving part of the value data to the proper offset. Task-number: QTBUG-53261 Change-Id: I11241c57057a57794bc3ca60ee437206e524f355 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-14 09:21:36 +00:00
void holeInPropertyData();
Fix crash when using with statement with an expression that throws We need to evaluate the expression for the "with" statement that is supposed to define the new scope _before_ opening up the scope, otherwise - when the evaluation of the expression throws an exception - we'll try to pop the "with" scope we couldn't open in the first place. [ChangeLog][QtQml] Fix crash when using the "with" statement with an expression that throws an exception. Task-number: QTBUG-53794 Change-Id: I7733f5a4c5d844916302b9a91c789a0f6b421e8a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-06-02 13:57:41 +00:00
Improved robustness of the optimizer when removing expressions For example during dead code elimination we may invalidate statements, but at the same time there may still be instances left in the work list of optimizeSSA(). When we encounter then, we should not process them any further. Task-number: QTBUG-56255 Change-Id: I4c24b1a225ce1bde112172e9606f91c426c19f19 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-11-22 14:16:09 +00:00
void malformedExpression();
Fix exception thrown in slot without Qml Engine Don't crash when an exception is thrown in a JS slot but we don't have a Qml engine. Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-07 11:23:17 +00:00
signals:
void testSignal();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
};
tst_QJSEngine::tst_QJSEngine()
{
}
tst_QJSEngine::~tst_QJSEngine()
{
}
Fix infinite loop in method overload resolution When resolving overloaded slots in a situation without property cache, then we need to detect that we've reached the end of the overload lists and exit from RelatedMethod with zero. Task-number: QTBUG-37157 Change-Id: Ifaab8cc1b377725c99c1bb89bb9bb74d5a0af1b8 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-03-24 13:31:05 +00:00
Q_DECLARE_METATYPE(Qt::KeyboardModifier)
Q_DECLARE_METATYPE(Qt::KeyboardModifiers)
Fix calls to overloaded slots for QObjects not created by QML If we don't have a property cache, we need to fall back to a slower method of determining the overload methods. We have the code for that in RelatedMethod, once we determine that we're calling overloads, but we never hit that code path because we did not _initially_ determine that the method was an overload. Task-number: QTBUG-37157 Change-Id: I8ff39156e5668236b3797400b4086ed545624398 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:01:53 +00:00
class OverloadedSlots : public QObject
{
Q_OBJECT
public:
OverloadedSlots()
{
}
signals:
void slotWithoutArgCalled();
void slotWithSingleArgCalled(const QString &arg);
void slotWithArgumentsCalled(const QString &arg1, const QString &arg2, const QString &arg3);
Fix infinite loop in method overload resolution When resolving overloaded slots in a situation without property cache, then we need to detect that we've reached the end of the overload lists and exit from RelatedMethod with zero. Task-number: QTBUG-37157 Change-Id: Ifaab8cc1b377725c99c1bb89bb9bb74d5a0af1b8 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-03-24 13:31:05 +00:00
void slotWithOverloadedArgumentsCalled(const QString &arg, Qt::KeyboardModifier modifier, Qt::KeyboardModifiers moreModifiers);
Fix method overload calling of Qt slots from JavaScript After commit ac57f185d1a2203cd4b585df7bd7af01c3ec33ed we succeed in selecting the correct overload based on the supplied arguments. However when calling slots on objects without a property cache, we end up using the local "dummy" variable to store the synthetic propert data. We also store the currently best patch in the "best" variable, which is a _pointer_ to the property data of the match. Suppose we have 5 overloads to choose from, we find that the 3rd is the best. Then we try the fourth but find it unsufficient and break out of the loop. Unfortunately the "dummy" property data at this point contains the data of the fourth (wrong) overload, and our best match variable points to it. So then when we finally call the method, we do it based on the wrong property data. The easy patch is to simply copy the few bytes of property data, so "best" is stored by value instead of pointer. Change-Id: Ie2ebbdb88a117770b6c7b9490e1c634077020e9d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-04 11:17:30 +00:00
void slotWithTwoOverloadedArgumentsCalled(const QString &arg, Qt::KeyboardModifiers moreModifiers, Qt::KeyboardModifier modifier);
Fix calls to overloaded slots for QObjects not created by QML If we don't have a property cache, we need to fall back to a slower method of determining the overload methods. We have the code for that in RelatedMethod, once we determine that we're calling overloads, but we never hit that code path because we did not _initially_ determine that the method was an overload. Task-number: QTBUG-37157 Change-Id: I8ff39156e5668236b3797400b4086ed545624398 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:01:53 +00:00
public slots:
void slotToCall() { emit slotWithoutArgCalled(); }
void slotToCall(const QString &arg) { emit slotWithSingleArgCalled(arg); }
void slotToCall(const QString &arg, const QString &arg2, const QString &arg3 = QString())
{
slotWithArgumentsCalled(arg, arg2, arg3);
}
Fix infinite loop in method overload resolution When resolving overloaded slots in a situation without property cache, then we need to detect that we've reached the end of the overload lists and exit from RelatedMethod with zero. Task-number: QTBUG-37157 Change-Id: Ifaab8cc1b377725c99c1bb89bb9bb74d5a0af1b8 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-03-24 13:31:05 +00:00
void slotToCall(const QString &arg, Qt::KeyboardModifier modifier, Qt::KeyboardModifiers blah = Qt::ShiftModifier)
{
emit slotWithOverloadedArgumentsCalled(arg, modifier, blah);
}
Fix method overload calling of Qt slots from JavaScript After commit ac57f185d1a2203cd4b585df7bd7af01c3ec33ed we succeed in selecting the correct overload based on the supplied arguments. However when calling slots on objects without a property cache, we end up using the local "dummy" variable to store the synthetic propert data. We also store the currently best patch in the "best" variable, which is a _pointer_ to the property data of the match. Suppose we have 5 overloads to choose from, we find that the 3rd is the best. Then we try the fourth but find it unsufficient and break out of the loop. Unfortunately the "dummy" property data at this point contains the data of the fourth (wrong) overload, and our best match variable points to it. So then when we finally call the method, we do it based on the wrong property data. The easy patch is to simply copy the few bytes of property data, so "best" is stored by value instead of pointer. Change-Id: Ie2ebbdb88a117770b6c7b9490e1c634077020e9d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-04 11:17:30 +00:00
void slotToCallTwoDefault(const QString &arg, Qt::KeyboardModifiers modifiers = Qt::ShiftModifier | Qt::ControlModifier, Qt::KeyboardModifier modifier = Qt::AltModifier)
{
emit slotWithTwoOverloadedArgumentsCalled(arg, modifiers, modifier);
}
Fix calls to overloaded slots for QObjects not created by QML If we don't have a property cache, we need to fall back to a slower method of determining the overload methods. We have the code for that in RelatedMethod, once we determine that we're calling overloads, but we never hit that code path because we did not _initially_ determine that the method was an overload. Task-number: QTBUG-37157 Change-Id: I8ff39156e5668236b3797400b4086ed545624398 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:01:53 +00:00
};
void tst_QJSEngine::callQObjectSlot()
{
OverloadedSlots dummy;
QJSEngine eng;
eng.globalObject().setProperty("dummy", eng.newQObject(&dummy));
QQmlEngine::setObjectOwnership(&dummy, QQmlEngine::CppOwnership);
{
QSignalSpy spy(&dummy, SIGNAL(slotWithoutArgCalled()));
eng.evaluate("dummy.slotToCall();");
QCOMPARE(spy.count(), 1);
}
{
QSignalSpy spy(&dummy, SIGNAL(slotWithSingleArgCalled(QString)));
eng.evaluate("dummy.slotToCall('arg');");
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
}
{
QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString, QString, QString)));
eng.evaluate("dummy.slotToCall('arg', 'arg2');");
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(arguments.at(1).toString(), QString("arg2"));
QCOMPARE(arguments.at(2).toString(), QString());
}
{
QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString, QString, QString)));
eng.evaluate("dummy.slotToCall('arg', 'arg2', 'arg3');");
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(arguments.at(1).toString(), QString("arg2"));
QCOMPARE(arguments.at(2).toString(), QString("arg3"));
}
Fix infinite loop in method overload resolution When resolving overloaded slots in a situation without property cache, then we need to detect that we've reached the end of the overload lists and exit from RelatedMethod with zero. Task-number: QTBUG-37157 Change-Id: Ifaab8cc1b377725c99c1bb89bb9bb74d5a0af1b8 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-03-24 13:31:05 +00:00
{
QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString, Qt::KeyboardModifier, Qt::KeyboardModifiers)));
eng.evaluate(QStringLiteral("dummy.slotToCall('arg', %1);").arg(QString::number(Qt::ControlModifier)));
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.first();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(arguments.at(1).toInt(), int(Qt::ControlModifier));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifiers>(arguments.at(2))), int(Qt::ShiftModifier));
}
Fix method overload calling of Qt slots from JavaScript After commit ac57f185d1a2203cd4b585df7bd7af01c3ec33ed we succeed in selecting the correct overload based on the supplied arguments. However when calling slots on objects without a property cache, we end up using the local "dummy" variable to store the synthetic propert data. We also store the currently best patch in the "best" variable, which is a _pointer_ to the property data of the match. Suppose we have 5 overloads to choose from, we find that the 3rd is the best. Then we try the fourth but find it unsufficient and break out of the loop. Unfortunately the "dummy" property data at this point contains the data of the fourth (wrong) overload, and our best match variable points to it. So then when we finally call the method, we do it based on the wrong property data. The easy patch is to simply copy the few bytes of property data, so "best" is stored by value instead of pointer. Change-Id: Ie2ebbdb88a117770b6c7b9490e1c634077020e9d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-04 11:17:30 +00:00
{
QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString, Qt::KeyboardModifiers, Qt::KeyboardModifier)));
QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCallTwoDefault('arg', %1);").arg(QString::number(Qt::MetaModifier | Qt::KeypadModifier)));
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.first();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifiers>(arguments.at(1))), int(Qt::MetaModifier | Qt::KeypadModifier));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifier>(arguments.at(2))), int(Qt::AltModifier));
}
QJSValue jsArray = eng.newArray();
jsArray.setProperty(QStringLiteral("MetaModifier"), QJSValue(Qt::MetaModifier));
jsArray.setProperty(QStringLiteral("ShiftModifier"), QJSValue(Qt::ShiftModifier));
jsArray.setProperty(QStringLiteral("ControlModifier"), QJSValue(Qt::ControlModifier));
jsArray.setProperty(QStringLiteral("KeypadModifier"), QJSValue(Qt::KeypadModifier));
QJSValue value = eng.newQObject(new QObject);
value.setPrototype(jsArray);
eng.globalObject().setProperty(QStringLiteral("Qt"), value);
{
QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString, Qt::KeyboardModifier, Qt::KeyboardModifiers)));
QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCall('arg', Qt.ControlModifier);"));
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.first();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(arguments.at(1).toInt(), int(Qt::ControlModifier));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifiers>(arguments.at(2))), int(Qt::ShiftModifier));
}
{
QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString, Qt::KeyboardModifiers, Qt::KeyboardModifier)));
QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCallTwoDefault('arg', Qt.MetaModifier | Qt.KeypadModifier);"));
QCOMPARE(spy.count(), 1);
const QList<QVariant> arguments = spy.first();
QCOMPARE(arguments.at(0).toString(), QString("arg"));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifiers>(arguments.at(1))), int(Qt::MetaModifier | Qt::KeypadModifier));
QCOMPARE(int(qvariant_cast<Qt::KeyboardModifier>(arguments.at(2))), int(Qt::AltModifier));
}
Fix calls to overloaded slots for QObjects not created by QML If we don't have a property cache, we need to fall back to a slower method of determining the overload methods. We have the code for that in RelatedMethod, once we determine that we're calling overloads, but we never hit that code path because we did not _initially_ determine that the method was an overload. Task-number: QTBUG-37157 Change-Id: I8ff39156e5668236b3797400b4086ed545624398 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:01:53 +00:00
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void tst_QJSEngine::constructWithParent()
{
QPointer<QJSEngine> ptr;
{
QObject obj;
QJSEngine *engine = new QJSEngine(&obj);
ptr = engine;
}
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QVERIFY(ptr.isNull());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::newObject()
{
QJSEngine eng;
QJSValue object = eng.newObject();
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!object.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(object.isObject(), true);
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QCOMPARE(object.isCallable(), false);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// prototype should be Object.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!object.prototype().isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(object.prototype().isObject(), true);
QCOMPARE(object.prototype().strictlyEquals(eng.evaluate("Object.prototype")), true);
}
void tst_QJSEngine::newArray()
{
QJSEngine eng;
QJSValue array = eng.newArray();
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!array.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(array.isArray(), true);
QCOMPARE(array.isObject(), true);
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(!array.isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// prototype should be Array.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!array.prototype().isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(array.prototype().isArray(), true);
QCOMPARE(array.prototype().strictlyEquals(eng.evaluate("Array.prototype")), true);
}
void tst_QJSEngine::newArray_HooliganTask218092()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("[].splice(0, 0, 'a')");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toInt(), 0);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("['a'].splice(0, 1, 'b')");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toInt(), 1);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("['a', 'b'].splice(0, 1, 'c')");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toInt(), 1);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("['a', 'b', 'c'].splice(0, 2, 'd')");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toInt(), 2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("['a', 'b', 'c'].splice(1, 2, 'd', 'e', 'f')");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toInt(), 2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::newArray_HooliganTask233836()
{
QJSEngine eng;
{
// According to ECMA-262, this should cause a RangeError.
QJSValue ret = eng.evaluate("a = new Array(4294967295); a.push('foo')");
QVERIFY(ret.isError() && ret.toString().contains(QLatin1String("RangeError")));
}
{
QJSValue ret = eng.newArray(0xFFFFFFFF);
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toUInt(), uint(0xFFFFFFFF));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
ret.setProperty(0xFFFFFFFF, 123);
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toUInt(), uint(0xFFFFFFFF));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(ret.property(0xFFFFFFFF).isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property(0xFFFFFFFF).toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
ret.setProperty(123, 456);
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("length").toUInt(), uint(0xFFFFFFFF));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(ret.property(123).isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property(123).toInt(), 456);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::newVariant()
{
QJSEngine eng;
{
Remove QJSEngine::newVariant() function Rationale: This is a remnant from QtScript. There is no reason one should be able to explicitly wrap an arbitrary C++ type in a QVariant. toScriptValue() will automatically wrap the type in a QVariant if it's a type that's not specifically handled by the meta-type system, or if it can't usefully/losslessly be converted to a native JavaScript type. Task-number: QTBUG-23604 Change-Id: I5790cd92b9ffd5fcfbee1cd73a8eaa16fc74846f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:49:52 +00:00
QJSValue opaque = eng.toScriptValue(QVariant(QPoint(1, 2)));
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!opaque.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(opaque.isVariant(), true);
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(!opaque.isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(opaque.isObject(), true);
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!opaque.prototype().isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(opaque.prototype().isVariant(), true);
Remove QJSEngine::newVariant() function Rationale: This is a remnant from QtScript. There is no reason one should be able to explicitly wrap an arbitrary C++ type in a QVariant. toScriptValue() will automatically wrap the type in a QVariant if it's a type that's not specifically handled by the meta-type system, or if it can't usefully/losslessly be converted to a native JavaScript type. Task-number: QTBUG-23604 Change-Id: I5790cd92b9ffd5fcfbee1cd73a8eaa16fc74846f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:49:52 +00:00
QVERIFY(opaque.property("valueOf").callWithInstance(opaque).equals(opaque));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::newVariant_valueOfToString()
{
// valueOf() and toString()
QJSEngine eng;
{
Remove QJSEngine::newVariant() function Rationale: This is a remnant from QtScript. There is no reason one should be able to explicitly wrap an arbitrary C++ type in a QVariant. toScriptValue() will automatically wrap the type in a QVariant if it's a type that's not specifically handled by the meta-type system, or if it can't usefully/losslessly be converted to a native JavaScript type. Task-number: QTBUG-23604 Change-Id: I5790cd92b9ffd5fcfbee1cd73a8eaa16fc74846f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:49:52 +00:00
QJSValue object = eng.toScriptValue(QVariant(QPoint(10, 20)));
Add QJSValue::callWithInstance() function With the deprecated call() overload, it was confusing what the first argument was (the this-object or an actual argument passed to the function). Introduce a dedicated function for the "explicit this-object" case. This makes code more readable, and eliminates the need to pass a "dummy" this-object to call() in the quite common case where you don't care about the this-object. Task-number: QTBUG-23604 Change-Id: I18f8be6592a848436351516bea266fc7e9195777 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:01:39 +00:00
QJSValue value = object.property("valueOf").callWithInstance(object);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(value.isObject());
QVERIFY(value.strictlyEquals(object));
QCOMPARE(object.toString(), QString::fromLatin1("QVariant(QPoint)"));
}
}
Fix handling of enum values encapsulated in QVariant In case a QJSValue contains a QVariant which wrapps an enum value, the valueOf() method will convert the enum to an int32. Change-Id: I0b92207184f343d53f73884245b90552165c34fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-17 12:51:55 +00:00
void tst_QJSEngine::newVariant_valueOfEnum()
{
QJSEngine eng;
{
QJSValue object = eng.toScriptValue(QVariant::fromValue(Qt::ControlModifier));
QJSValue value = object.property("valueOf").callWithInstance(object);
QVERIFY(value.isNumber());
QCOMPARE(value.toInt(), static_cast<qint32>(Qt::ControlModifier));
}
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void tst_QJSEngine::newRegExp()
{
QJSEngine eng;
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QJSValue rexp = eng.toScriptValue(QRegExp("foo"));
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!rexp.isUndefined());
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(rexp.isRegExp(), true);
QCOMPARE(rexp.isObject(), true);
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
QCOMPARE(rexp.isCallable(), false);
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
// prototype should be RegExp.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!rexp.prototype().isUndefined());
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(rexp.prototype().isObject(), true);
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
QCOMPARE(rexp.prototype().isRegExp(), true);
// Get [[Class]] internal property of RegExp Prototype Object.
// See ECMA-262 Section 8.6.2, "Object Internal Properties and Methods".
// See ECMA-262 Section 15.10.6, "Properties of the RegExp Prototype Object".
QJSValue r = eng.evaluate("Object.prototype.toString.call(RegExp.prototype)");
QCOMPARE(r.toString(), QString::fromLatin1("[object RegExp]"));
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(rexp.prototype().strictlyEquals(eng.evaluate("RegExp.prototype")), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(qjsvalue_cast<QRegExp>(rexp).pattern(), QRegExp("foo").pattern());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::jsRegExp()
{
// See ECMA-262 Section 15.10, "RegExp Objects".
// These should really be JS-only tests, as they test the implementation's
// ECMA-compliance, not the C++ API. Compliance should already be covered
// by the Mozilla tests (qscriptjstestsuite).
// We can consider updating the expected results of this test if the
// RegExp implementation changes.
QJSEngine eng;
QJSValue r = eng.evaluate("/foo/gim");
QVERIFY(r.isRegExp());
QCOMPARE(r.toString(), QString::fromLatin1("/foo/gim"));
QJSValue rxCtor = eng.globalObject().property("RegExp");
Add QJSValue::call() overload This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-20 07:00:27 +00:00
QJSValue r2 = rxCtor.call(QJSValueList() << r);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r2.isRegExp());
QVERIFY(r2.strictlyEquals(r));
Add QJSValue::call() overload This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-20 07:00:27 +00:00
QJSValue r3 = rxCtor.call(QJSValueList() << r << "gim");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r3.isError());
QVERIFY(r3.toString().contains(QString::fromLatin1("TypeError"))); // Cannot supply flags when constructing one RegExp from another
Add QJSValue::call() overload This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-20 07:00:27 +00:00
QJSValue r4 = rxCtor.call(QJSValueList() << "foo" << "gim");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r4.isRegExp());
Add QJSValue::callAsConstructor() function The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:15:59 +00:00
QJSValue r5 = rxCtor.callAsConstructor(QJSValueList() << r);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r5.isRegExp());
QCOMPARE(r5.toString(), QString::fromLatin1("/foo/gim"));
// In JSC, constructing a RegExp from another produces the same identical object.
// This is different from SpiderMonkey and old back-end.
QVERIFY(!r5.strictlyEquals(r));
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
// See ECMA-262 Section 15.10.4.1, "new RegExp(pattern, flags)".
Add QJSValue::callAsConstructor() function The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:15:59 +00:00
QJSValue r6 = rxCtor.callAsConstructor(QJSValueList() << "foo" << "bar");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r6.isError());
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
QVERIFY(r6.toString().contains(QString::fromLatin1("SyntaxError"))); // Invalid regular expression flag
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue r7 = eng.evaluate("/foo/gimp");
QVERIFY(r7.isError());
QVERIFY(r7.toString().contains(QString::fromLatin1("SyntaxError"))); // Invalid regular expression flag
QJSValue r8 = eng.evaluate("/foo/migmigmig");
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
QVERIFY(r8.isError());
QVERIFY(r8.toString().contains(QString::fromLatin1("SyntaxError"))); // Invalid regular expression flag
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::callAsConstructor() function The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:15:59 +00:00
QJSValue r9 = rxCtor.callAsConstructor();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r9.isRegExp());
QCOMPARE(r9.toString(), QString::fromLatin1("/(?:)/"));
Add QJSValue::callAsConstructor() function The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:15:59 +00:00
QJSValue r10 = rxCtor.callAsConstructor(QJSValueList() << "" << "gim");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r10.isRegExp());
QCOMPARE(r10.toString(), QString::fromLatin1("/(?:)/gim"));
Add QJSValue::callAsConstructor() function The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 13:15:59 +00:00
QJSValue r11 = rxCtor.callAsConstructor(QJSValueList() << "{1.*}" << "g");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(r11.isRegExp());
QCOMPARE(r11.toString(), QString::fromLatin1("/{1.*}/g"));
}
void tst_QJSEngine::newDate()
{
QJSEngine eng;
{
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QJSValue date = eng.evaluate("new Date(0)");
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!date.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(date.isDate(), true);
QCOMPARE(date.isObject(), true);
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(!date.isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// prototype should be Date.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!date.prototype().isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(date.prototype().isDate(), true);
QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true);
}
{
QDateTime dt = QDateTime(QDate(1, 2, 3), QTime(4, 5, 6, 7), Qt::LocalTime);
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QJSValue date = eng.toScriptValue(dt);
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!date.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(date.isDate(), true);
QCOMPARE(date.isObject(), true);
// prototype should be Date.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!date.prototype().isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(date.prototype().isDate(), true);
QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true);
QCOMPARE(date.toDateTime(), dt);
}
{
QDateTime dt = QDateTime(QDate(1, 2, 3), QTime(4, 5, 6, 7), Qt::UTC);
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QJSValue date = eng.toScriptValue(dt);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// toDateTime() result should be in local time
QCOMPARE(date.toDateTime(), dt.toLocalTime());
}
}
void tst_QJSEngine::jsParseDate()
{
QJSEngine eng;
// Date.parse() should return NaN when it fails
{
QJSValue ret = eng.evaluate("Date.parse()");
QVERIFY(ret.isNumber());
QVERIFY(qIsNaN(ret.toNumber()));
}
// Date.parse() should be able to parse the output of Date().toString()
{
QJSValue ret = eng.evaluate("var x = new Date(); var s = x.toString(); s == new Date(Date.parse(s)).toString()");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(ret.isBool());
QCOMPARE(ret.toBool(), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::newQObject()
{
QJSEngine eng;
Don't allow tst_QJSEngine or tst_QJSValue instance to be collected Both of those unit tests currently change the ownership of the test instance object, which could result in it being collected by the JS GC and deleted if events were processed. Change-Id: I5a9821fb56e19af1d52fea46e54755875dfbb29a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 00:20:26 +00:00
QObject temp;
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue qobject = eng.newQObject(0);
QCOMPARE(qobject.isNull(), true);
QCOMPARE(qobject.isObject(), false);
QCOMPARE(qobject.toQObject(), (QObject *)0);
}
{
Don't allow tst_QJSEngine or tst_QJSValue instance to be collected Both of those unit tests currently change the ownership of the test instance object, which could result in it being collected by the JS GC and deleted if events were processed. Change-Id: I5a9821fb56e19af1d52fea46e54755875dfbb29a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 00:20:26 +00:00
QJSValue qobject = eng.newQObject(&temp);
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!qobject.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(qobject.isQObject(), true);
QCOMPARE(qobject.isObject(), true);
Don't allow tst_QJSEngine or tst_QJSValue instance to be collected Both of those unit tests currently change the ownership of the test instance object, which could result in it being collected by the JS GC and deleted if events were processed. Change-Id: I5a9821fb56e19af1d52fea46e54755875dfbb29a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-15 00:20:26 +00:00
QCOMPARE(qobject.toQObject(), (QObject *)&temp);
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(!qobject.isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// prototype should be QObject.prototype
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QCOMPARE(qobject.prototype().isObject(), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QEXPECT_FAIL("", "FIXME: newly created QObject's prototype is an JS Object", Continue);
QCOMPARE(qobject.prototype().isQObject(), true);
}
}
void tst_QJSEngine::newQObject_ownership()
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSEngine eng;
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QPointer<QObject> ptr = new QObject();
QVERIFY(ptr != 0);
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue v = eng.newQObject(ptr);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Turn on exact garbage collection by default Keep conservative GC as a fallback for testing Enable all tests again that were skipped due to GC issues. Change-Id: I8e0fa728207bdd39a96d0acf95e27841157d8402 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-15 14:00:49 +00:00
eng.collectGarbage();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
if (ptr)
Use QGuiApplication, not QApplication, in tests Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-01-13 02:08:20 +00:00
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QVERIFY(ptr.isNull());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QPointer<QObject> ptr = new QObject(this);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(ptr != 0);
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue v = eng.newQObject(ptr);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
QObject *before = ptr;
Turn on exact garbage collection by default Keep conservative GC as a fallback for testing Enable all tests again that were skipped due to GC issues. Change-Id: I8e0fa728207bdd39a96d0acf95e27841157d8402 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-15 14:00:49 +00:00
eng.collectGarbage();
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QCOMPARE(ptr.data(), before);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
delete ptr;
}
{
QObject *parent = new QObject();
QObject *child = new QObject(parent);
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue v = eng.newQObject(child);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(v.toQObject(), child);
delete parent;
QCOMPARE(v.toQObject(), (QObject *)0);
}
{
QPointer<QObject> ptr = new QObject();
QVERIFY(ptr != 0);
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue v = eng.newQObject(ptr);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Turn on exact garbage collection by default Keep conservative GC as a fallback for testing Enable all tests again that were skipped due to GC issues. Change-Id: I8e0fa728207bdd39a96d0acf95e27841157d8402 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-15 14:00:49 +00:00
eng.collectGarbage();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// no parent, so it should be like ScriptOwnership
if (ptr)
Use QGuiApplication, not QApplication, in tests Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-01-13 02:08:20 +00:00
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QVERIFY(ptr.isNull());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QObject *parent = new QObject();
QPointer<QObject> child = new QObject(parent);
QVERIFY(child != 0);
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue v = eng.newQObject(child);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Turn on exact garbage collection by default Keep conservative GC as a fallback for testing Enable all tests again that were skipped due to GC issues. Change-Id: I8e0fa728207bdd39a96d0acf95e27841157d8402 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-15 14:00:49 +00:00
eng.collectGarbage();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// has parent, so it should be like QtOwnership
QVERIFY(child != 0);
delete parent;
}
Make it possible to call QQmlEngine::setObjectOwnership at any time QJSEngine::newQObject should call setObjectOwnership only if it wasn't called before, to preserve any policy set by the user earlier. Otherwise it's only safe to call after newQObject and then you'd have to call it _every_ time the QObject is wrapped, at all call sites. Instead this patch preserves any policy set. Task-number: QTBUG-37160 Change-Id: I6178fa38cd7f4b09d818b6f18762c21588562422 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-28 15:19:10 +00:00
{
QPointer<QObject> ptr = new QObject();
QVERIFY(ptr != 0);
{
QQmlEngine::setObjectOwnership(ptr.data(), QQmlEngine::CppOwnership);
QJSValue v = eng.newQObject(ptr);
}
eng.collectGarbage();
if (ptr)
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
QVERIFY(!ptr.isNull());
delete ptr.data();
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Avoid calling gc in QQmlEngine destructor. GC may be expensive. GC call in QQmlEngine doesn't have much sense because V8 will destroy all objects living in a current context. The only problem is that V8 may decide to not invoke weak callbacks which may cause a memory leak. To avoid that we track all QObjects that have JavaScript ownership set and we delete them explicitly. The change reduce time of destroying QQmlEngine by 75%, which is really visible in qquicklistmodel test. Change-Id: I2a3668fd23630669114baee8c241a7ecc4100e33 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-04-19 12:38:38 +00:00
void tst_QJSEngine::newQObject_deletedEngine()
{
QJSValue object;
QObject *ptr = new QObject();
QSignalSpy spy(ptr, SIGNAL(destroyed()));
{
QJSEngine engine;
object = engine.newQObject(ptr);
engine.globalObject().setProperty("obj", object);
}
QTRY_VERIFY(spy.count());
}
Fix exception thrown in slot without Qml Engine Don't crash when an exception is thrown in a JS slot but we don't have a Qml engine. Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-07 11:23:17 +00:00
void tst_QJSEngine::exceptionInSlot()
{
QJSEngine engine;
QJSValue wrappedThis = engine.newQObject(this);
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
engine.globalObject().setProperty("testCase", wrappedThis);
engine.evaluate(
"var called = false\n"
"function throwingSlot() {\n"
" called = true\n"
" throw 42;\n"
"}\n"
"testCase.testSignal.connect(throwingSlot)\n"
);
QCOMPARE(engine.globalObject().property("called").toBool(), false);
emit testSignal();
QCOMPARE(engine.globalObject().property("called").toBool(), true);
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
void tst_QJSEngine::globalObjectProperties()
{
// See ECMA-262 Section 15.1, "The Global Object".
QJSEngine eng;
QJSValue global = eng.globalObject();
QVERIFY(global.property("NaN").isNumber());
QVERIFY(qIsNaN(global.property("NaN").toNumber()));
QVERIFY(global.property("Infinity").isNumber());
QVERIFY(qIsInf(global.property("Infinity").toNumber()));
QVERIFY(global.property("undefined").isUndefined());
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("eval").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("parseInt").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("parseFloat").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("isNaN").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("isFinite").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("decodeURI").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("decodeURIComponent").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("encodeURI").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("encodeURIComponent").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(global.property("Object").isCallable());
QVERIFY(global.property("Function").isCallable());
QVERIFY(global.property("Array").isCallable());
QVERIFY(global.property("String").isCallable());
QVERIFY(global.property("Boolean").isCallable());
QVERIFY(global.property("Number").isCallable());
QVERIFY(global.property("Date").isCallable());
QVERIFY(global.property("RegExp").isCallable());
QVERIFY(global.property("Error").isCallable());
QVERIFY(global.property("EvalError").isCallable());
QVERIFY(global.property("RangeError").isCallable());
QVERIFY(global.property("ReferenceError").isCallable());
QVERIFY(global.property("SyntaxError").isCallable());
QVERIFY(global.property("TypeError").isCallable());
QVERIFY(global.property("URIError").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(global.property("Math").isObject());
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(!global.property("Math").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::globalObjectEquals()
{
QJSEngine eng;
QJSValue o = eng.globalObject();
QVERIFY(o.strictlyEquals(eng.globalObject()));
QVERIFY(o.equals(eng.globalObject()));
}
void tst_QJSEngine::globalObjectProperties_enumerate()
{
Enable globalObjectProperties_enumerate test. The test can be enabled because QJSValueIterator is back. Change-Id: I81220ea17470663dab799eb818168480d2df1a54 Reviewed-on: http://codereview.qt.nokia.com/2439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 10:48:34 +00:00
QJSEngine eng;
QJSValue global = eng.globalObject();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QSet<QString> expectedNames;
expectedNames
<< "isNaN"
<< "parseFloat"
<< "String"
<< "EvalError"
<< "URIError"
<< "Math"
<< "encodeURIComponent"
<< "RangeError"
<< "eval"
<< "isFinite"
<< "ReferenceError"
<< "Infinity"
<< "Function"
<< "RegExp"
<< "Number"
<< "parseInt"
<< "Object"
<< "decodeURI"
<< "TypeError"
<< "Boolean"
<< "encodeURI"
<< "NaN"
<< "Error"
<< "decodeURIComponent"
<< "Date"
<< "Array"
<< "escape"
<< "unescape"
<< "SyntaxError"
<< "undefined"
<< "JSON"
Implement ArrayBuffer This is the first class required to support typed arrays in our JS engine. Change-Id: I0fe1e1ca430769c171912dda207cfae772e9b9db Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-10 12:50:28 +00:00
<< "ArrayBuffer"
Implement DataView The second class that is required for typed array support. Change-Id: Idc2dcec7c1eee541f76dc5ab1aea6057ba03cb93 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-10 14:39:23 +00:00
<< "DataView"
Basic support for typed arrays This implements most of the spec required for the Khronos typed array specification. It tries to follow ECMAScript 6 as closely as possible, but currently only implements a subset of the ECMAScript 6 specification. Addes a test script in tests/manual/v4 to test our implementation. Change-Id: I8ec63869500358e088b73240e1f37120ae3cf59a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-11 13:37:31 +00:00
<< "Int8Array"
<< "Uint8Array"
<< "Uint8ClampedArray"
<< "Int16Array"
<< "Uint16Array"
<< "Int32Array"
<< "Uint32Array"
<< "Float32Array"
<< "Float64Array"
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
;
QSet<QString> actualNames;
{
Enable globalObjectProperties_enumerate test. The test can be enabled because QJSValueIterator is back. Change-Id: I81220ea17470663dab799eb818168480d2df1a54 Reviewed-on: http://codereview.qt.nokia.com/2439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 10:48:34 +00:00
QJSValueIterator it(global);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
while (it.hasNext()) {
it.next();
actualNames.insert(it.name());
}
}
QSet<QString> remainingNames = actualNames;
{
QSet<QString>::const_iterator it;
for (it = expectedNames.constBegin(); it != expectedNames.constEnd(); ++it) {
QString name = *it;
QVERIFY(actualNames.contains(name));
remainingNames.remove(name);
}
}
QVERIFY(remainingNames.isEmpty());
}
void tst_QJSEngine::createGlobalObjectProperty()
{
QJSEngine eng;
QJSValue global = eng.globalObject();
// create property with no attributes
{
QString name = QString::fromLatin1("foo");
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(global.property(name).isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue val(123);
global.setProperty(name, val);
QVERIFY(global.property(name).equals(val));
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
global.deleteProperty(name);
QVERIFY(global.property(name).isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::globalObjectWithCustomPrototype()
{
QJSEngine engine;
QJSValue proto = engine.newObject();
proto.setProperty("protoProperty", 123);
QJSValue global = engine.globalObject();
QJSValue originalProto = global.prototype();
global.setPrototype(proto);
{
QJSValue ret = engine.evaluate("protoProperty");
QVERIFY(ret.isNumber());
QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
}
{
QJSValue ret = engine.evaluate("this.protoProperty");
QVERIFY(ret.isNumber());
QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
}
{
QJSValue ret = engine.evaluate("this.hasOwnProperty('protoProperty')");
QVERIFY(ret.isBool());
QVERIFY(!ret.toBool());
}
// Custom prototype set from JS
{
QJSValue ret = engine.evaluate("this.__proto__ = { 'a': 123 }; a");
QVERIFY(ret.isNumber());
QVERIFY(ret.strictlyEquals(global.property("a")));
}
}
void tst_QJSEngine::builtinFunctionNames_data()
{
QTest::addColumn<QString>("expression");
QTest::addColumn<QString>("expectedName");
// See ECMA-262 Chapter 15, "Standard Built-in ECMAScript Objects".
QTest::newRow("parseInt") << QString("parseInt") << QString("parseInt");
QTest::newRow("parseFloat") << QString("parseFloat") << QString("parseFloat");
QTest::newRow("isNaN") << QString("isNaN") << QString("isNaN");
QTest::newRow("isFinite") << QString("isFinite") << QString("isFinite");
QTest::newRow("decodeURI") << QString("decodeURI") << QString("decodeURI");
QTest::newRow("decodeURIComponent") << QString("decodeURIComponent") << QString("decodeURIComponent");
QTest::newRow("encodeURI") << QString("encodeURI") << QString("encodeURI");
QTest::newRow("encodeURIComponent") << QString("encodeURIComponent") << QString("encodeURIComponent");
QTest::newRow("escape") << QString("escape") << QString("escape");
QTest::newRow("unescape") << QString("unescape") << QString("unescape");
QTest::newRow("Array") << QString("Array") << QString("Array");
QTest::newRow("Array.prototype.toString") << QString("Array.prototype.toString") << QString("toString");
QTest::newRow("Array.prototype.toLocaleString") << QString("Array.prototype.toLocaleString") << QString("toLocaleString");
QTest::newRow("Array.prototype.concat") << QString("Array.prototype.concat") << QString("concat");
QTest::newRow("Array.prototype.join") << QString("Array.prototype.join") << QString("join");
QTest::newRow("Array.prototype.pop") << QString("Array.prototype.pop") << QString("pop");
QTest::newRow("Array.prototype.push") << QString("Array.prototype.push") << QString("push");
QTest::newRow("Array.prototype.reverse") << QString("Array.prototype.reverse") << QString("reverse");
QTest::newRow("Array.prototype.shift") << QString("Array.prototype.shift") << QString("shift");
QTest::newRow("Array.prototype.slice") << QString("Array.prototype.slice") << QString("slice");
QTest::newRow("Array.prototype.sort") << QString("Array.prototype.sort") << QString("sort");
QTest::newRow("Array.prototype.splice") << QString("Array.prototype.splice") << QString("splice");
QTest::newRow("Array.prototype.unshift") << QString("Array.prototype.unshift") << QString("unshift");
QTest::newRow("Boolean") << QString("Boolean") << QString("Boolean");
QTest::newRow("Boolean.prototype.toString") << QString("Boolean.prototype.toString") << QString("toString");
QTest::newRow("Date") << QString("Date") << QString("Date");
QTest::newRow("Date.prototype.toString") << QString("Date.prototype.toString") << QString("toString");
QTest::newRow("Date.prototype.toDateString") << QString("Date.prototype.toDateString") << QString("toDateString");
QTest::newRow("Date.prototype.toTimeString") << QString("Date.prototype.toTimeString") << QString("toTimeString");
QTest::newRow("Date.prototype.toLocaleString") << QString("Date.prototype.toLocaleString") << QString("toLocaleString");
QTest::newRow("Date.prototype.toLocaleDateString") << QString("Date.prototype.toLocaleDateString") << QString("toLocaleDateString");
QTest::newRow("Date.prototype.toLocaleTimeString") << QString("Date.prototype.toLocaleTimeString") << QString("toLocaleTimeString");
QTest::newRow("Date.prototype.valueOf") << QString("Date.prototype.valueOf") << QString("valueOf");
QTest::newRow("Date.prototype.getTime") << QString("Date.prototype.getTime") << QString("getTime");
QTest::newRow("Date.prototype.getYear") << QString("Date.prototype.getYear") << QString("getYear");
QTest::newRow("Date.prototype.getFullYear") << QString("Date.prototype.getFullYear") << QString("getFullYear");
QTest::newRow("Date.prototype.getUTCFullYear") << QString("Date.prototype.getUTCFullYear") << QString("getUTCFullYear");
QTest::newRow("Date.prototype.getMonth") << QString("Date.prototype.getMonth") << QString("getMonth");
QTest::newRow("Date.prototype.getUTCMonth") << QString("Date.prototype.getUTCMonth") << QString("getUTCMonth");
QTest::newRow("Date.prototype.getDate") << QString("Date.prototype.getDate") << QString("getDate");
QTest::newRow("Date.prototype.getUTCDate") << QString("Date.prototype.getUTCDate") << QString("getUTCDate");
QTest::newRow("Date.prototype.getDay") << QString("Date.prototype.getDay") << QString("getDay");
QTest::newRow("Date.prototype.getUTCDay") << QString("Date.prototype.getUTCDay") << QString("getUTCDay");
QTest::newRow("Date.prototype.getHours") << QString("Date.prototype.getHours") << QString("getHours");
QTest::newRow("Date.prototype.getUTCHours") << QString("Date.prototype.getUTCHours") << QString("getUTCHours");
QTest::newRow("Date.prototype.getMinutes") << QString("Date.prototype.getMinutes") << QString("getMinutes");
QTest::newRow("Date.prototype.getUTCMinutes") << QString("Date.prototype.getUTCMinutes") << QString("getUTCMinutes");
QTest::newRow("Date.prototype.getSeconds") << QString("Date.prototype.getSeconds") << QString("getSeconds");
QTest::newRow("Date.prototype.getUTCSeconds") << QString("Date.prototype.getUTCSeconds") << QString("getUTCSeconds");
QTest::newRow("Date.prototype.getMilliseconds") << QString("Date.prototype.getMilliseconds") << QString("getMilliseconds");
QTest::newRow("Date.prototype.getUTCMilliseconds") << QString("Date.prototype.getUTCMilliseconds") << QString("getUTCMilliseconds");
QTest::newRow("Date.prototype.getTimezoneOffset") << QString("Date.prototype.getTimezoneOffset") << QString("getTimezoneOffset");
QTest::newRow("Date.prototype.setTime") << QString("Date.prototype.setTime") << QString("setTime");
QTest::newRow("Date.prototype.setMilliseconds") << QString("Date.prototype.setMilliseconds") << QString("setMilliseconds");
QTest::newRow("Date.prototype.setUTCMilliseconds") << QString("Date.prototype.setUTCMilliseconds") << QString("setUTCMilliseconds");
QTest::newRow("Date.prototype.setSeconds") << QString("Date.prototype.setSeconds") << QString("setSeconds");
QTest::newRow("Date.prototype.setUTCSeconds") << QString("Date.prototype.setUTCSeconds") << QString("setUTCSeconds");
QTest::newRow("Date.prototype.setMinutes") << QString("Date.prototype.setMinutes") << QString("setMinutes");
QTest::newRow("Date.prototype.setUTCMinutes") << QString("Date.prototype.setUTCMinutes") << QString("setUTCMinutes");
QTest::newRow("Date.prototype.setHours") << QString("Date.prototype.setHours") << QString("setHours");
QTest::newRow("Date.prototype.setUTCHours") << QString("Date.prototype.setUTCHours") << QString("setUTCHours");
QTest::newRow("Date.prototype.setDate") << QString("Date.prototype.setDate") << QString("setDate");
QTest::newRow("Date.prototype.setUTCDate") << QString("Date.prototype.setUTCDate") << QString("setUTCDate");
QTest::newRow("Date.prototype.setMonth") << QString("Date.prototype.setMonth") << QString("setMonth");
QTest::newRow("Date.prototype.setUTCMonth") << QString("Date.prototype.setUTCMonth") << QString("setUTCMonth");
QTest::newRow("Date.prototype.setYear") << QString("Date.prototype.setYear") << QString("setYear");
QTest::newRow("Date.prototype.setFullYear") << QString("Date.prototype.setFullYear") << QString("setFullYear");
QTest::newRow("Date.prototype.setUTCFullYear") << QString("Date.prototype.setUTCFullYear") << QString("setUTCFullYear");
QTest::newRow("Date.prototype.toUTCString") << QString("Date.prototype.toUTCString") << QString("toUTCString");
QTest::newRow("Date.prototype.toGMTString") << QString("Date.prototype.toGMTString") << QString("toGMTString");
QTest::newRow("Error") << QString("Error") << QString("Error");
// QTest::newRow("Error.prototype.backtrace") << QString("Error.prototype.backtrace") << QString("backtrace");
QTest::newRow("Error.prototype.toString") << QString("Error.prototype.toString") << QString("toString");
QTest::newRow("EvalError") << QString("EvalError") << QString("EvalError");
QTest::newRow("RangeError") << QString("RangeError") << QString("RangeError");
QTest::newRow("ReferenceError") << QString("ReferenceError") << QString("ReferenceError");
QTest::newRow("SyntaxError") << QString("SyntaxError") << QString("SyntaxError");
QTest::newRow("TypeError") << QString("TypeError") << QString("TypeError");
QTest::newRow("URIError") << QString("URIError") << QString("URIError");
QTest::newRow("Function") << QString("Function") << QString("Function");
QTest::newRow("Function.prototype.toString") << QString("Function.prototype.toString") << QString("toString");
QTest::newRow("Function.prototype.apply") << QString("Function.prototype.apply") << QString("apply");
QTest::newRow("Function.prototype.call") << QString("Function.prototype.call") << QString("call");
/* In V8, those function are only there for signals
QTest::newRow("Function.prototype.connect") << QString("Function.prototype.connect") << QString("connect");
QTest::newRow("Function.prototype.disconnect") << QString("Function.prototype.disconnect") << QString("disconnect");*/
QTest::newRow("Math.abs") << QString("Math.abs") << QString("abs");
QTest::newRow("Math.acos") << QString("Math.acos") << QString("acos");
QTest::newRow("Math.asin") << QString("Math.asin") << QString("asin");
QTest::newRow("Math.atan") << QString("Math.atan") << QString("atan");
QTest::newRow("Math.atan2") << QString("Math.atan2") << QString("atan2");
QTest::newRow("Math.ceil") << QString("Math.ceil") << QString("ceil");
QTest::newRow("Math.cos") << QString("Math.cos") << QString("cos");
QTest::newRow("Math.exp") << QString("Math.exp") << QString("exp");
QTest::newRow("Math.floor") << QString("Math.floor") << QString("floor");
QTest::newRow("Math.log") << QString("Math.log") << QString("log");
QTest::newRow("Math.max") << QString("Math.max") << QString("max");
QTest::newRow("Math.min") << QString("Math.min") << QString("min");
QTest::newRow("Math.pow") << QString("Math.pow") << QString("pow");
QTest::newRow("Math.random") << QString("Math.random") << QString("random");
QTest::newRow("Math.round") << QString("Math.round") << QString("round");
QTest::newRow("Math.sin") << QString("Math.sin") << QString("sin");
QTest::newRow("Math.sqrt") << QString("Math.sqrt") << QString("sqrt");
QTest::newRow("Math.tan") << QString("Math.tan") << QString("tan");
QTest::newRow("Number") << QString("Number") << QString("Number");
QTest::newRow("Number.prototype.toString") << QString("Number.prototype.toString") << QString("toString");
QTest::newRow("Number.prototype.toLocaleString") << QString("Number.prototype.toLocaleString") << QString("toLocaleString");
QTest::newRow("Number.prototype.valueOf") << QString("Number.prototype.valueOf") << QString("valueOf");
QTest::newRow("Number.prototype.toFixed") << QString("Number.prototype.toFixed") << QString("toFixed");
QTest::newRow("Number.prototype.toExponential") << QString("Number.prototype.toExponential") << QString("toExponential");
QTest::newRow("Number.prototype.toPrecision") << QString("Number.prototype.toPrecision") << QString("toPrecision");
QTest::newRow("Object") << QString("Object") << QString("Object");
QTest::newRow("Object.prototype.toString") << QString("Object.prototype.toString") << QString("toString");
QTest::newRow("Object.prototype.toLocaleString") << QString("Object.prototype.toLocaleString") << QString("toLocaleString");
QTest::newRow("Object.prototype.valueOf") << QString("Object.prototype.valueOf") << QString("valueOf");
QTest::newRow("Object.prototype.hasOwnProperty") << QString("Object.prototype.hasOwnProperty") << QString("hasOwnProperty");
QTest::newRow("Object.prototype.isPrototypeOf") << QString("Object.prototype.isPrototypeOf") << QString("isPrototypeOf");
QTest::newRow("Object.prototype.propertyIsEnumerable") << QString("Object.prototype.propertyIsEnumerable") << QString("propertyIsEnumerable");
QTest::newRow("Object.prototype.__defineGetter__") << QString("Object.prototype.__defineGetter__") << QString("__defineGetter__");
QTest::newRow("Object.prototype.__defineSetter__") << QString("Object.prototype.__defineSetter__") << QString("__defineSetter__");
QTest::newRow("RegExp") << QString("RegExp") << QString("RegExp");
QTest::newRow("RegExp.prototype.exec") << QString("RegExp.prototype.exec") << QString("exec");
QTest::newRow("RegExp.prototype.test") << QString("RegExp.prototype.test") << QString("test");
QTest::newRow("RegExp.prototype.toString") << QString("RegExp.prototype.toString") << QString("toString");
QTest::newRow("String") << QString("String") << QString("String");
QTest::newRow("String.prototype.toString") << QString("String.prototype.toString") << QString("toString");
QTest::newRow("String.prototype.valueOf") << QString("String.prototype.valueOf") << QString("valueOf");
QTest::newRow("String.prototype.charAt") << QString("String.prototype.charAt") << QString("charAt");
QTest::newRow("String.prototype.charCodeAt") << QString("String.prototype.charCodeAt") << QString("charCodeAt");
QTest::newRow("String.prototype.concat") << QString("String.prototype.concat") << QString("concat");
QTest::newRow("String.prototype.indexOf") << QString("String.prototype.indexOf") << QString("indexOf");
QTest::newRow("String.prototype.lastIndexOf") << QString("String.prototype.lastIndexOf") << QString("lastIndexOf");
QTest::newRow("String.prototype.localeCompare") << QString("String.prototype.localeCompare") << QString("localeCompare");
QTest::newRow("String.prototype.match") << QString("String.prototype.match") << QString("match");
QTest::newRow("String.prototype.replace") << QString("String.prototype.replace") << QString("replace");
QTest::newRow("String.prototype.search") << QString("String.prototype.search") << QString("search");
QTest::newRow("String.prototype.slice") << QString("String.prototype.slice") << QString("slice");
QTest::newRow("String.prototype.split") << QString("String.prototype.split") << QString("split");
QTest::newRow("String.prototype.substring") << QString("String.prototype.substring") << QString("substring");
QTest::newRow("String.prototype.toLowerCase") << QString("String.prototype.toLowerCase") << QString("toLowerCase");
QTest::newRow("String.prototype.toLocaleLowerCase") << QString("String.prototype.toLocaleLowerCase") << QString("toLocaleLowerCase");
QTest::newRow("String.prototype.toUpperCase") << QString("String.prototype.toUpperCase") << QString("toUpperCase");
QTest::newRow("String.prototype.toLocaleUpperCase") << QString("String.prototype.toLocaleUpperCase") << QString("toLocaleUpperCase");
}
void tst_QJSEngine::builtinFunctionNames()
{
QFETCH(QString, expression);
QFETCH(QString, expectedName);
QJSEngine eng;
// The "name" property is actually non-standard, but JSC supports it.
QJSValue ret = eng.evaluate(QString::fromLatin1("%0.name").arg(expression));
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), expectedName);
}
Clean up QJSEngine tests. Change-Id: Ia778f07a79c3354b639e25dbd847c0ff643b5418 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-05-29 07:40:58 +00:00
void tst_QJSEngine::evaluate_data()
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QTest::addColumn<QString>("code");
Clean up QJSEngine tests. Change-Id: Ia778f07a79c3354b639e25dbd847c0ff643b5418 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-05-29 07:40:58 +00:00
QTest::addColumn<int>("lineNumber");
QTest::addColumn<bool>("expectHadError");
QTest::addColumn<int>("expectErrorLineNumber");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Clean up QJSEngine tests. Change-Id: Ia778f07a79c3354b639e25dbd847c0ff643b5418 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-05-29 07:40:58 +00:00
QTest::newRow("(newline)") << QString("\n") << -1 << false << -1;
QTest::newRow("0 //") << QString("0 //") << -1 << false << -1;
QTest::newRow("/* */") << QString("/* */") << -1 << false << -1;
QTest::newRow("//") << QString("//") << -1 << false << -1;
QTest::newRow("(spaces)") << QString(" ") << -1 << false << -1;
QTest::newRow("(empty)") << QString("") << -1 << false << -1;
QTest::newRow("0") << QString("0") << -1 << false << -1;
QTest::newRow("0=1") << QString("\n0=1;\n") << -1 << true << 2;
QTest::newRow("a=1") << QString("a=1\n") << -1 << false << -1;
QTest::newRow("a=1;K") << QString("a=1;\nK") << -1 << true << 2;
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QTest::newRow("f()") << QString("function f()\n"
"{\n"
" var a;\n"
" var b=\";\n" // here's the error
"}\n"
"f();\n")
<< -1 << true << 4;
QTest::newRow("0") << QString("0") << 10 << false << -1;
QTest::newRow("0=1") << QString("\n\n0=1\n") << 10 << true << 12;
QTest::newRow("a=1") << QString("a=1\n") << 10 << false << -1;
QTest::newRow("a=1;K") << QString("a=1;\n\nK") << 10 << true << 12;
QTest::newRow("f()") << QString("function f()\n"
"{\n"
" var a;\n"
"\n\n"
" var b=\";\n" // here's the error
"}\n"
"f();\n")
<< 10 << true << 15;
QTest::newRow("functionThatDoesntExist()")
<< QString(";\n;\n;\nfunctionThatDoesntExist()")
<< -1 << true << 4;
QTest::newRow("for (var p in this) { continue labelThatDoesntExist; }")
<< QString("for (var p in this) {\ncontinue labelThatDoesntExist; }")
<< 4 << true << 5;
QTest::newRow("duplicateLabel: { duplicateLabel: ; }")
<< QString("duplicateLabel: { duplicateLabel: ; }")
<< 12 << true << 12;
QTest::newRow("/=/") << QString("/=/") << -1 << false << -1;
QTest::newRow("/=/g") << QString("/=/g") << -1 << false << -1;
QTest::newRow("/a/") << QString("/a/") << -1 << false << -1;
QTest::newRow("/a/g") << QString("/a/g") << -1 << false << -1;
QTest::newRow("/a/gim") << QString("/a/gim") << -1 << false << -1;
QTest::newRow("/a/gimp") << QString("/a/gimp") << 1 << true << 1;
Fix crash when calling concat on an empty array Make sure to create the array data. The earlier called copyArrayData() doesn't have to do that. Task-number: QTBUG-37506 Change-Id: I6671769fcd471234c4c2eaa1614aa61266db0e5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-03-14 15:00:36 +00:00
QTest::newRow("empty-array-concat") << QString("var a = []; var b = [1]; var c = a.concat(b); ") << 1 << false << -1;
Fix crash in sparse array handling When re-allocating the sparse array data, make sure to initialize the free list correctly. Previously this was only done for the first allocation. Test cases uses an object literal, as that's a reliable way to ensure a sparse array is created. Task-number: QTBUG-37892 Change-Id: Ib38cfce50104904af0c980f022c9dbb7461ae5f8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-03-28 13:12:41 +00:00
QTest::newRow("object-literal") << QString("var a = {\"0\":\"#\",\"2\":\"#\",\"5\":\"#\",\"8\":\"#\",\"6\":\"#\",\"12\":\"#\",\"13\":\"#\",\"16\":\"#\",\"18\":\"#\",\"39\":\"#\",\"40\":\"#\"}") << 1 << false << -1;
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::evaluate()
{
QFETCH(QString, code);
QFETCH(int, lineNumber);
QFETCH(bool, expectHadError);
QFETCH(int, expectErrorLineNumber);
QJSEngine eng;
QJSValue ret;
if (lineNumber != -1)
ret = eng.evaluate(code, /*fileName =*/QString(), lineNumber);
else
ret = eng.evaluate(code);
Remove QJS exception API This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-07 12:56:33 +00:00
QCOMPARE(ret.isError(), expectHadError);
if (ret.isError()) {
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QVERIFY(ret.property("lineNumber").strictlyEquals(eng.toScriptValue(expectErrorLineNumber)));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::errorMessage_QT679()
{
QJSEngine engine;
engine.globalObject().setProperty("foo", 15);
QJSValue error = engine.evaluate("'hello world';\nfoo.bar.blah");
QVERIFY(error.isError());
QVERIFY(error.toString().startsWith(QString::fromLatin1("TypeError: ")));
}
struct Foo {
public:
int x, y;
Foo() : x(-1), y(-1) { }
};
Q_DECLARE_METATYPE(Foo)
Q_DECLARE_METATYPE(Foo*)
Q_DECLARE_METATYPE(QLinkedList<QString>)
Q_DECLARE_METATYPE(QList<Foo>)
Q_DECLARE_METATYPE(QVector<QChar>)
Q_DECLARE_METATYPE(QStack<int>)
Q_DECLARE_METATYPE(QQueue<char>)
Q_DECLARE_METATYPE(QLinkedList<QStack<int> >)
void tst_QJSEngine::valueConversion_basic()
{
QJSEngine eng;
{
QJSValue num = eng.toScriptValue(123);
QCOMPARE(num.isNumber(), true);
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QCOMPARE(num.strictlyEquals(eng.toScriptValue(123)), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
int inum = eng.fromScriptValue<int>(num);
QCOMPARE(inum, 123);
QString snum = eng.fromScriptValue<QString>(num);
QCOMPARE(snum, QLatin1String("123"));
}
{
QJSValue num = eng.toScriptValue(123);
QCOMPARE(num.isNumber(), true);
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QCOMPARE(num.strictlyEquals(eng.toScriptValue(123)), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
int inum = eng.fromScriptValue<int>(num);
QCOMPARE(inum, 123);
QString snum = eng.fromScriptValue<QString>(num);
QCOMPARE(snum, QLatin1String("123"));
}
{
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QJSValue num = eng.toScriptValue(123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(eng.fromScriptValue<char>(num), char(123));
QCOMPARE(eng.fromScriptValue<unsigned char>(num), (unsigned char)(123));
QCOMPARE(eng.fromScriptValue<short>(num), short(123));
QCOMPARE(eng.fromScriptValue<unsigned short>(num), (unsigned short)(123));
QCOMPARE(eng.fromScriptValue<float>(num), float(123));
QCOMPARE(eng.fromScriptValue<double>(num), double(123));
QCOMPARE(eng.fromScriptValue<qlonglong>(num), qlonglong(123));
QCOMPARE(eng.fromScriptValue<qulonglong>(num), qulonglong(123));
}
{
QJSValue num(123);
QCOMPARE(eng.fromScriptValue<char>(num), char(123));
QCOMPARE(eng.fromScriptValue<unsigned char>(num), (unsigned char)(123));
QCOMPARE(eng.fromScriptValue<short>(num), short(123));
QCOMPARE(eng.fromScriptValue<unsigned short>(num), (unsigned short)(123));
QCOMPARE(eng.fromScriptValue<float>(num), float(123));
QCOMPARE(eng.fromScriptValue<double>(num), double(123));
QCOMPARE(eng.fromScriptValue<qlonglong>(num), qlonglong(123));
QCOMPARE(eng.fromScriptValue<qulonglong>(num), qulonglong(123));
}
{
QJSValue num = eng.toScriptValue(Q_INT64_C(0x100000000));
QCOMPARE(eng.fromScriptValue<qlonglong>(num), Q_INT64_C(0x100000000));
QCOMPARE(eng.fromScriptValue<qulonglong>(num), Q_UINT64_C(0x100000000));
}
{
QChar c = QLatin1Char('c');
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QJSValue str = eng.toScriptValue(QString::fromLatin1("ciao"));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(eng.fromScriptValue<QChar>(str), c);
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QJSValue code = eng.toScriptValue(c.unicode());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(eng.fromScriptValue<QChar>(code), c);
QCOMPARE(eng.fromScriptValue<QChar>(eng.toScriptValue(c)), c);
}
Make QVariant conversion for JS null type symmetric If you pass (void*)0 to QJSEngine::toScriptValue(), or you pass a QVariant of type QMetaType::VoidStar containing a 0 value, you get back a QJSValue of type null (isNull() returns true); that's fine. However, if you called QJSValue::toVariant() on a JS null value, you would get back an invalid QVariant. The expected result is a QVariant of type QMetaType::VoidStar containing a 0 value. This makes the conversion of the JS null type symmetric and avoids loss of data. Change-Id: Ifa6e788152118f80adf9c2d7be1283f053b44294 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-03-15 09:15:53 +00:00
QVERIFY(eng.toScriptValue(static_cast<void *>(0)).isNull());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::valueConversion_QVariant()
{
QJSEngine eng;
// qScriptValueFromValue() should be "smart" when the argument is a QVariant
{
QJSValue val = eng.toScriptValue(QVariant());
QVERIFY(!val.isVariant());
QVERIFY(val.isUndefined());
}
// Checking nested QVariants
{
QVariant tmp1;
QVariant tmp2(QMetaType::QVariant, &tmp1);
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QCOMPARE(QMetaType::Type(tmp2.type()), QMetaType::QVariant);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue val1 = eng.toScriptValue(tmp1);
QJSValue val2 = eng.toScriptValue(tmp2);
QVERIFY(val1.isUndefined());
QEXPECT_FAIL("", "Variant are unrwapped, maybe we should not...", Continue);
QVERIFY(!val2.isUndefined());
QVERIFY(!val1.isVariant());
QEXPECT_FAIL("", "Variant are unrwapped, maybe we should not...", Continue);
QVERIFY(val2.isVariant());
}
{
QVariant tmp1(123);
QVariant tmp2(QMetaType::QVariant, &tmp1);
QVariant tmp3(QMetaType::QVariant, &tmp2);
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QCOMPARE(QMetaType::Type(tmp1.type()), QMetaType::Int);
QCOMPARE(QMetaType::Type(tmp2.type()), QMetaType::QVariant);
QCOMPARE(QMetaType::Type(tmp3.type()), QMetaType::QVariant);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue val1 = eng.toScriptValue(tmp2);
QJSValue val2 = eng.toScriptValue(tmp3);
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!val1.isUndefined());
QVERIFY(!val2.isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QEXPECT_FAIL("", "Variant are unrwapped, maybe we should not...", Continue);
QVERIFY(val1.isVariant());
QEXPECT_FAIL("", "Variant are unrwapped, maybe we should not...", Continue);
QVERIFY(val2.isVariant());
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QCOMPARE(val1.toVariant().toInt(), 123);
QCOMPARE(eng.toScriptValue(val2.toVariant()).toVariant().toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(QVariant(true));
QVERIFY(!val.isVariant());
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(val.isBool());
QCOMPARE(val.toBool(), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(QVariant(int(123)));
QVERIFY(!val.isVariant());
QVERIFY(val.isNumber());
QCOMPARE(val.toNumber(), qreal(123));
}
{
QJSValue val = eng.toScriptValue(QVariant(qreal(1.25)));
QVERIFY(!val.isVariant());
QVERIFY(val.isNumber());
QCOMPARE(val.toNumber(), qreal(1.25));
}
{
QString str = QString::fromLatin1("ciao");
QJSValue val = eng.toScriptValue(QVariant(str));
QVERIFY(!val.isVariant());
QVERIFY(val.isString());
QCOMPARE(val.toString(), str);
}
{
QJSValue val = eng.toScriptValue(qVariantFromValue((QObject*)this));
QVERIFY(!val.isVariant());
QVERIFY(val.isQObject());
QCOMPARE(val.toQObject(), (QObject*)this);
}
{
QVariant var = qVariantFromValue(QPoint(123, 456));
QJSValue val = eng.toScriptValue(var);
QVERIFY(val.isVariant());
QCOMPARE(val.toVariant(), var);
}
QCOMPARE(qjsvalue_cast<QVariant>(QJSValue(123)), QVariant(123));
Make QVariant conversion for JS null type symmetric If you pass (void*)0 to QJSEngine::toScriptValue(), or you pass a QVariant of type QMetaType::VoidStar containing a 0 value, you get back a QJSValue of type null (isNull() returns true); that's fine. However, if you called QJSValue::toVariant() on a JS null value, you would get back an invalid QVariant. The expected result is a QVariant of type QMetaType::VoidStar containing a 0 value. This makes the conversion of the JS null type symmetric and avoids loss of data. Change-Id: Ifa6e788152118f80adf9c2d7be1283f053b44294 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-03-15 09:15:53 +00:00
QVERIFY(eng.toScriptValue(QVariant(QMetaType::VoidStar, 0)).isNull());
Fix crash in conversion from QVariantMap to QJSValue When the key is an array index, use arraySet instead of trying to insert an array index as internal class member. Task-number: QTBUG-37854 Change-Id: I23f01cc9d6be98b57d3f13ac7ee847298e9632a3 Reviewed-by: Matt Broadstone <mbroadst@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-28 15:02:45 +00:00
{
QVariantMap map;
map.insert("42", "the answer to life the universe and everything");
QJSValue val = eng.toScriptValue(map);
QVERIFY(val.isObject());
QCOMPARE(val.property(42).toString(), map.value(QStringLiteral("42")).toString());
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::valueConversion_basic2()
{
QJSEngine eng;
// more built-in types
{
QJSValue val = eng.toScriptValue(uint(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(qulonglong(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(float(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(short(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(ushort(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(char(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue val = eng.toScriptValue(uchar(123));
QVERIFY(val.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(val.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::valueConversion_dateTime()
{
QJSEngine eng;
{
QDateTime in = QDateTime::currentDateTime();
QJSValue val = eng.toScriptValue(in);
QVERIFY(val.isDate());
QCOMPARE(val.toDateTime(), in);
}
{
QDate in = QDate::currentDate();
QJSValue val = eng.toScriptValue(in);
QVERIFY(val.isDate());
QCOMPARE(val.toDateTime().date(), in);
}
}
void tst_QJSEngine::valueConversion_regExp()
{
QJSEngine eng;
{
QRegExp in = QRegExp("foo");
QJSValue val = eng.toScriptValue(in);
QVERIFY(val.isRegExp());
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QRegExp out = qjsvalue_cast<QRegExp>(val);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QEXPECT_FAIL("", "QTBUG-6136: JSC-based back-end doesn't preserve QRegExp::patternSyntax (always uses RegExp2)", Continue);
QCOMPARE(out.patternSyntax(), in.patternSyntax());
QCOMPARE(out.pattern(), in.pattern());
QCOMPARE(out.caseSensitivity(), in.caseSensitivity());
QCOMPARE(out.isMinimal(), in.isMinimal());
}
{
QRegExp in = QRegExp("foo", Qt::CaseSensitive, QRegExp::RegExp2);
QJSValue val = eng.toScriptValue(in);
QVERIFY(val.isRegExp());
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(qjsvalue_cast<QRegExp>(val), in);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QRegExp in = QRegExp("foo");
in.setMinimal(true);
QJSValue val = eng.toScriptValue(in);
QVERIFY(val.isRegExp());
QEXPECT_FAIL("", "QTBUG-6136: JSC-based back-end doesn't preserve QRegExp::minimal (always false)", Continue);
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QCOMPARE(qjsvalue_cast<QRegExp>(val).isMinimal(), in.isMinimal());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
Q_DECLARE_METATYPE(QGradient)
Q_DECLARE_METATYPE(QGradient*)
Q_DECLARE_METATYPE(QLinearGradient)
class Klazz : public QWidget,
public QStandardItem,
public QGraphicsItem
{
QtDeclarative: Fix warnings in tests. - Unused parameters - Missing interfaces - tst_QQuickListView: Fix call canvas->rootContext()->setContextProperty to use a QVariant (instead of implicitly converting to QObject*) which was apparently intended. Change-Id: Idc95d9408051e6f5b7005a7eccd764ac218ff867 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-11-25 07:49:45 +00:00
Q_INTERFACES(QGraphicsItem)
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Q_OBJECT
public:
Klazz(QWidget *parent = 0) : QWidget(parent) { }
virtual QRectF boundingRect() const { return QRectF(); }
virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) { }
};
Q_DECLARE_METATYPE(Klazz*)
Q_DECLARE_METATYPE(QStandardItem*)
void tst_QJSEngine::castWithMultipleInheritance()
{
QJSEngine eng;
Klazz klz;
QJSValue v = eng.newQObject(&klz);
QCOMPARE(qjsvalue_cast<Klazz*>(v), &klz);
QCOMPARE(qjsvalue_cast<QWidget*>(v), (QWidget *)&klz);
QCOMPARE(qjsvalue_cast<QObject*>(v), (QObject *)&klz);
QCOMPARE(qjsvalue_cast<QStandardItem*>(v), (QStandardItem *)&klz);
QCOMPARE(qjsvalue_cast<QGraphicsItem*>(v), (QGraphicsItem *)&klz);
}
void tst_QJSEngine::collectGarbage()
{
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSEngine eng;
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
eng.evaluate("a = new Object(); a = new Object(); a = new Object()");
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
QJSValue a = eng.newObject();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
a = eng.newObject();
a = eng.newObject();
QPointer<QObject> ptr = new QObject();
QVERIFY(ptr != 0);
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
(void)eng.newQObject(ptr);
Turn on exact garbage collection by default Keep conservative GC as a fallback for testing Enable all tests again that were skipped due to GC issues. Change-Id: I8e0fa728207bdd39a96d0acf95e27841157d8402 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-15 14:00:49 +00:00
eng.collectGarbage();
Fix QJSEngine::newQObject ownership behaviour Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 14:04:26 +00:00
if (ptr)
Use QGuiApplication, not QApplication, in tests Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-01-13 02:08:20 +00:00
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-07-24 13:27:58 +00:00
QVERIFY(ptr.isNull());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::gcWithNestedDataStructure()
{
// The GC must be able to traverse deeply nested objects, otherwise this
// test would crash.
QJSEngine eng;
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
eng.installExtensions(QJSEngine::GarbageCollectionExtension);
Remove QJS exception API This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-07 12:56:33 +00:00
QJSValue ret = eng.evaluate(
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
"function makeList(size)"
"{"
" var head = { };"
" var l = head;"
" for (var i = 0; i < size; ++i) {"
" l.data = i + \"\";"
" l.next = { }; l = l.next;"
" }"
" l.next = null;"
" return head;"
"}");
Remove QJS exception API This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-07 12:56:33 +00:00
QVERIFY(!ret.isError());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
const int size = 200;
QJSValue head = eng.evaluate(QString::fromLatin1("makeList(%0)").arg(size));
Remove QJS exception API This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-07 12:56:33 +00:00
QVERIFY(!head.isError());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
for (int x = 0; x < 2; ++x) {
if (x == 1)
eng.evaluate("gc()");
QJSValue l = head;
// Make sure all the nodes are still alive.
for (int i = 0; i < 200; ++i) {
QCOMPARE(l.property("data").toString(), QString::number(i));
l = l.property("next");
}
}
}
void tst_QJSEngine::stacktrace()
{
QString script = QString::fromLatin1(
"function foo(counter) {\n"
" switch (counter) {\n"
" case 0: foo(counter+1); break;\n"
" case 1: foo(counter+1); break;\n"
" case 2: foo(counter+1); break;\n"
" case 3: foo(counter+1); break;\n"
" case 4: foo(counter+1); break;\n"
" default:\n"
" throw new Error('blah');\n"
" }\n"
"}\n"
"foo(0);");
const QString fileName("testfile");
QStringList backtrace;
backtrace << "foo(5)@testfile:9"
<< "foo(4)@testfile:7"
<< "foo(3)@testfile:6"
<< "foo(2)@testfile:5"
<< "foo(1)@testfile:4"
<< "foo(0)@testfile:3"
<< "<global>()@testfile:12";
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSEngine eng;
QJSValue result = eng.evaluate(script, fileName);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(result.isError());
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSValue stack = result.property("stack");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSValueIterator it(stack);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
int counter = 5;
while (it.hasNext()) {
it.next();
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSValue obj = it.value();
QJSValue frame = obj.property("frame");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(obj.property("fileName").toString(), fileName);
if (counter >= 0) {
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSValue callee = frame.property("arguments").property("callee");
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(callee.strictlyEquals(eng.globalObject().property("foo")));
QCOMPARE(obj.property("functionName").toString(), QString("foo"));
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
int line = obj.property("lineNumber").toInt();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
if (counter == 5)
QCOMPARE(line, 9);
else
QCOMPARE(line, 3 + counter);
} else {
QVERIFY(frame.strictlyEquals(eng.globalObject()));
QVERIFY(obj.property("functionName").toString().isEmpty());
}
--counter;
}
// throw something that isn't an Error object
// ###FIXME: No uncaughtExceptionBacktrace: QVERIFY(eng.uncaughtExceptionBacktrace().isEmpty());
QString script2 = QString::fromLatin1(
"function foo(counter) {\n"
" switch (counter) {\n"
" case 0: foo(counter+1); break;\n"
" case 1: foo(counter+1); break;\n"
" case 2: foo(counter+1); break;\n"
" case 3: foo(counter+1); break;\n"
" case 4: foo(counter+1); break;\n"
" default:\n"
" throw 'just a string';\n"
" }\n"
"}\n"
"foo(0);");
Enable tst_QJSEngine::stacktrace test. The test can be enabled because QJSValueIterator is back. Change-Id: I33a84b0e584137ecff0d65c2a6152ca972e863f1 Reviewed-on: http://codereview.qt.nokia.com/2440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-01 11:31:19 +00:00
QJSValue result2 = eng.evaluate(script2, fileName);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(!result2.isError());
QVERIFY(result2.isString());
}
void tst_QJSEngine::numberParsing_data()
{
QTest::addColumn<QString>("string");
QTest::addColumn<qreal>("expect");
QTest::newRow("decimal 0") << QString("0") << qreal(0);
Comment out test of octal numbers We don't currently support octal numbers in v4 Change-Id: Icb31d399a199eb573068b431954a22d169de9b9e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-06-14 11:09:19 +00:00
// QTest::newRow("octal 0") << QString("00") << qreal(00);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QTest::newRow("hex 0") << QString("0x0") << qreal(0x0);
QTest::newRow("decimal 100") << QString("100") << qreal(100);
QTest::newRow("hex 100") << QString("0x100") << qreal(0x100);
Comment out test of octal numbers We don't currently support octal numbers in v4 Change-Id: Icb31d399a199eb573068b431954a22d169de9b9e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-06-14 11:09:19 +00:00
// QTest::newRow("octal 100") << QString("0100") << qreal(0100);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QTest::newRow("decimal 4G") << QString("4294967296") << qreal(Q_UINT64_C(4294967296));
QTest::newRow("hex 4G") << QString("0x100000000") << qreal(Q_UINT64_C(0x100000000));
Comment out test of octal numbers We don't currently support octal numbers in v4 Change-Id: Icb31d399a199eb573068b431954a22d169de9b9e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-06-14 11:09:19 +00:00
// QTest::newRow("octal 4G") << QString("040000000000") << qreal(Q_UINT64_C(040000000000));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QTest::newRow("0.5") << QString("0.5") << qreal(0.5);
QTest::newRow("1.5") << QString("1.5") << qreal(1.5);
QTest::newRow("1e2") << QString("1e2") << qreal(100);
}
void tst_QJSEngine::numberParsing()
{
QFETCH(QString, string);
QFETCH(qreal, expect);
QJSEngine eng;
QJSValue ret = eng.evaluate(string);
QVERIFY(ret.isNumber());
qreal actual = ret.toNumber();
QCOMPARE(actual, expect);
}
// see ECMA-262, section 7.9
// This is testing ECMA compliance, not our C++ API, but it's important that
// the back-end is conformant in this regard.
void tst_QJSEngine::automaticSemicolonInsertion()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("{ 1 2 } 3");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains("SyntaxError"));
}
{
QJSValue ret = eng.evaluate("{ 1\n2 } 3");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("for (a; b\n)");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains("SyntaxError"));
}
{
QJSValue ret = eng.evaluate("(function() { return\n1 + 2 })()");
QVERIFY(ret.isUndefined());
}
{
eng.evaluate("c = 2; b = 1");
QJSValue ret = eng.evaluate("a = b\n++c");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("if (a > b)\nelse c = d");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains("SyntaxError"));
}
{
eng.evaluate("function c() { return { foo: function() { return 5; } } }");
eng.evaluate("b = 1; d = 2; e = 3");
QJSValue ret = eng.evaluate("a = b + c\n(d + e).foo()");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 6);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("throw\n1");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains("SyntaxError"));
}
{
QJSValue ret = eng.evaluate("a = Number(1)\n++a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
// "a semicolon is never inserted automatically if the semicolon
// would then be parsed as an empty statement"
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if (0)\n ++a; a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if (0)\n --a; a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if ((0))\n ++a; a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if ((0))\n --a; a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if (0\n)\n ++a; a");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if (0\n ++a; a");
QVERIFY(ret.isError());
}
{
eng.evaluate("a = 123");
QJSValue ret = eng.evaluate("if (0))\n ++a; a");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("n = 0; for (i = 0; i < 10; ++i)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 30; for (i = 0; i < 10; ++i)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 20);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 0; for (var i = 0; i < 10; ++i)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 30; for (var i = 0; i < 10; ++i)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 20);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 0; i = 0; while (i++ < 10)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 30; i = 0; while (i++ < 10)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 20);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { a: 0, b: 1, c: 2 }; n = 0; for (i in o)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { a: 0, b: 1, c: 2 }; n = 9; for (i in o)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 6);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { a: 0, b: 1, c: 2 }; n = 0; for (var i in o)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { a: 0, b: 1, c: 2 }; n = 9; for (var i in o)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 6);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { n: 3 }; n = 5; with (o)\n ++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 5);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("o = { n: 3 }; n = 10; with (o)\n --n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 5; i = 0; do\n ++n; while (++i < 10); n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 15);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 20; i = 0; do\n --n; while (++i < 10); n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 1; i = 0; if (n) i\n++n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("n = 1; i = 0; if (n) i\n--n; n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 0);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("if (0)");
QVERIFY(ret.isError());
}
Fix another bug with automatic semicolon insertion Avoid empty statements after else. Change-Id: Ia7782a3371bc79c7e93857aa252309d2824a5a9e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-08 12:17:53 +00:00
{
QJSValue ret = eng.evaluate("n = 0; if (1) --n;else\n ++n;\n n");
QVERIFY(ret.isNumber());
QCOMPARE(ret.toInt(), -1);
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("while (0)");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("for (;;)");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("for (p in this)");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("with (this)");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("do");
QVERIFY(ret.isError());
}
}
Clean up QJSEngine tests. Change-Id: Ia778f07a79c3354b639e25dbd847c0ff643b5418 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-05-29 07:40:58 +00:00
void tst_QJSEngine::errorConstructors()
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSEngine eng;
QStringList prefixes;
prefixes << "" << "Eval" << "Range" << "Reference" << "Syntax" << "Type" << "URI";
for (int x = 0; x < 3; ++x) {
for (int i = 0; i < prefixes.size(); ++i) {
QString name = prefixes.at(i) + QLatin1String("Error");
QString code = QString(i+1, QLatin1Char('\n'));
if (x == 0)
code += QLatin1String("throw ");
else if (x == 1)
code += QLatin1String("new ");
code += name + QLatin1String("()");
QJSValue ret = eng.evaluate(code);
QVERIFY(ret.isError());
QVERIFY(ret.toString().startsWith(name));
Make Managed inherit Value This completes the first milestone towards being able to move objects across the GC heap. Change-Id: I8e6ce90254ea767188a31f0dc85b133534c87eb0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-18 20:22:44 +00:00
qDebug() << ret.property("stack").toString();
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.property("lineNumber").toInt(), i+2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
}
void tst_QJSEngine::argumentsProperty_globalContext()
{
QJSEngine eng;
{
// Unlike function calls, the global context doesn't have an
// arguments property.
QJSValue ret = eng.evaluate("arguments");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
}
eng.evaluate("arguments = 10");
{
QJSValue ret = eng.evaluate("arguments");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("delete arguments").toBool());
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(eng.globalObject().property("arguments").isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::argumentsProperty_JS()
{
{
QJSEngine eng;
eng.evaluate("o = { arguments: 123 }");
QJSValue ret = eng.evaluate("with (o) { arguments; }");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSEngine eng;
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(eng.globalObject().property("arguments").isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// This is testing ECMA-262 compliance. In function calls, "arguments"
// appears like a local variable, and it can be replaced.
QJSValue ret = eng.evaluate("(function() { arguments = 456; return arguments; })()");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 456);
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(eng.globalObject().property("arguments").isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::jsNumberClass()
{
// See ECMA-262 Section 15.7, "Number Objects".
QJSEngine eng;
QJSValue ctor = eng.globalObject().property("Number");
QVERIFY(ctor.property("length").isNumber());
QCOMPARE(ctor.property("length").toNumber(), qreal(1));
QJSValue proto = ctor.property("prototype");
QVERIFY(proto.isObject());
{
QVERIFY(ctor.property("MAX_VALUE").isNumber());
QVERIFY(ctor.property("MIN_VALUE").isNumber());
QVERIFY(ctor.property("NaN").isNumber());
QVERIFY(ctor.property("NEGATIVE_INFINITY").isNumber());
QVERIFY(ctor.property("POSITIVE_INFINITY").isNumber());
}
QCOMPARE(proto.toNumber(), qreal(0));
QVERIFY(proto.property("constructor").strictlyEquals(ctor));
{
QJSValue ret = eng.evaluate("Number()");
QVERIFY(ret.isNumber());
QCOMPARE(ret.toNumber(), qreal(0));
}
{
QJSValue ret = eng.evaluate("Number(123)");
QVERIFY(ret.isNumber());
QCOMPARE(ret.toNumber(), qreal(123));
}
{
QJSValue ret = eng.evaluate("Number('456')");
QVERIFY(ret.isNumber());
QCOMPARE(ret.toNumber(), qreal(456));
}
{
QJSValue ret = eng.evaluate("new Number()");
QVERIFY(!ret.isNumber());
QVERIFY(ret.isObject());
QCOMPARE(ret.toNumber(), qreal(0));
}
{
QJSValue ret = eng.evaluate("new Number(123)");
QVERIFY(!ret.isNumber());
QVERIFY(ret.isObject());
QCOMPARE(ret.toNumber(), qreal(123));
}
{
QJSValue ret = eng.evaluate("new Number('456')");
QVERIFY(!ret.isNumber());
QVERIFY(ret.isObject());
QCOMPARE(ret.toNumber(), qreal(456));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("toString").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).toString()");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("123"));
}
{
QJSValue ret = eng.evaluate("new Number(123).toString(8)");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("173"));
}
{
QJSValue ret = eng.evaluate("new Number(123).toString(16)");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("7b"));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("toLocaleString").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).toLocaleString()");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("123"));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("valueOf").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).valueOf()");
QVERIFY(ret.isNumber());
QCOMPARE(ret.toNumber(), qreal(123));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("toExponential").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).toExponential()");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("1.23e+2"));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("toFixed").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).toFixed()");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("123"));
}
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(proto.property("toPrecision").isCallable());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSValue ret = eng.evaluate("new Number(123).toPrecision()");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("123"));
V4: Correctly format on Number.toPrecision(n) The ecmascript standard mandates that we add trailing zeroes if the given precision is greater than the number of digits available. The only way to request this from QLocale is currently QString::asprintf(), which adds a few other incompatibilities that are easier to 'fix' by editing the resulting string. Thus we use it as a stop gap measure until we can expose better API from qtbase. Task-number: QTBUG-55358 Change-Id: Iafc11f21abb341fbe458ad75b46b4222ae5bc1db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-08-19 08:13:45 +00:00
ret = eng.evaluate("new Number(42).toPrecision(1)");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("4e+1"));
ret = eng.evaluate("new Number(42).toPrecision(2)");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("42"));
ret = eng.evaluate("new Number(42).toPrecision(3)");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("42.0"));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::jsForInStatement_simple()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("o = { }; r = []; for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QVERIFY(lst.isEmpty());
}
{
QJSValue ret = eng.evaluate("o = { p: 123 }; r = [];"
"for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 1);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
{
QJSValue ret = eng.evaluate("o = { p: 123, q: 456 }; r = [];"
"for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 2);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
QCOMPARE(lst.at(1), QString::fromLatin1("q"));
}
}
void tst_QJSEngine::jsForInStatement_prototypeProperties()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("o = { }; o.__proto__ = { p: 123 }; r = [];"
"for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 1);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
{
QJSValue ret = eng.evaluate("o = { p: 123 }; o.__proto__ = { q: 456 }; r = [];"
"for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 2);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
QCOMPARE(lst.at(1), QString::fromLatin1("q"));
}
{
// shadowed property
QJSValue ret = eng.evaluate("o = { p: 123 }; o.__proto__ = { p: 456 }; r = [];"
"for (var p in o) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 1);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
}
void tst_QJSEngine::jsForInStatement_mutateWhileIterating()
{
QJSEngine eng;
// deleting property during enumeration
{
QJSValue ret = eng.evaluate("o = { p: 123 }; r = [];"
"for (var p in o) { r[r.length] = p; delete r[p]; } r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 1);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
{
QJSValue ret = eng.evaluate("o = { p: 123, q: 456 }; r = [];"
"for (var p in o) { r[r.length] = p; delete o.q; } r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 1);
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
// adding property during enumeration
{
QJSValue ret = eng.evaluate("o = { p: 123 }; r = [];"
"for (var p in o) { r[r.length] = p; o.q = 456; } r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
Fix test case The for..in statements behavior is actually undefined when it comes to inserting values into the object being iterated over. Simply adjust the test case to the v4 behavior. Change-Id: I85774ae98810d8c14ee457138ccc54082de47802 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-06-13 15:44:44 +00:00
QCOMPARE(lst.size(), 2);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(lst.at(0), QString::fromLatin1("p"));
}
}
void tst_QJSEngine::jsForInStatement_arrays()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("a = [123, 456]; r = [];"
"for (var p in a) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 2);
QCOMPARE(lst.at(0), QString::fromLatin1("0"));
QCOMPARE(lst.at(1), QString::fromLatin1("1"));
}
{
QJSValue ret = eng.evaluate("a = [123, 456]; a.foo = 'bar'; r = [];"
"for (var p in a) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 3);
QCOMPARE(lst.at(0), QString::fromLatin1("0"));
QCOMPARE(lst.at(1), QString::fromLatin1("1"));
QCOMPARE(lst.at(2), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("a = [123, 456]; a.foo = 'bar';"
"b = [111, 222, 333]; b.bar = 'baz';"
"a.__proto__ = b; r = [];"
"for (var p in a) r[r.length] = p; r");
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), 5);
QCOMPARE(lst.at(0), QString::fromLatin1("0"));
QCOMPARE(lst.at(1), QString::fromLatin1("1"));
QCOMPARE(lst.at(2), QString::fromLatin1("foo"));
QCOMPARE(lst.at(3), QString::fromLatin1("2"));
QCOMPARE(lst.at(4), QString::fromLatin1("bar"));
}
}
Fixes to for...in statement Properly convert the argument to an object if it's not null or undefined as mandated by the standard. Add a similar test case for the with statement. Change-Id: Idd8e245e8dae4803eb0e2010e3d43bb912670444 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-18 08:12:42 +00:00
void tst_QJSEngine::jsForInStatement_constant()
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("r = true; for (var p in undefined) r = false; r");
QVERIFY(ret.isBool());
QVERIFY(ret.toBool());
}
{
QJSValue ret = eng.evaluate("r = true; for (var p in null) r = false; r");
QVERIFY(ret.isBool());
QVERIFY(ret.toBool());
}
Fixes to for...in statement Properly convert the argument to an object if it's not null or undefined as mandated by the standard. Add a similar test case for the with statement. Change-Id: Idd8e245e8dae4803eb0e2010e3d43bb912670444 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-18 08:12:42 +00:00
{
QJSValue ret = eng.evaluate("r = false; for (var p in 1) r = true; r");
QVERIFY(ret.isBool());
QVERIFY(!ret.toBool());
}
{
QJSValue ret = eng.evaluate("r = false; for (var p in 'abc') r = true; r");
QVERIFY(ret.isBool());
QVERIFY(ret.toBool());
}
}
void tst_QJSEngine::with_constant()
{
QJSEngine eng;
{
QJSValue ret = eng.evaluate("r = false; with(null) { r= true; } r");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("r = false; with(undefined) { r= true; } r");
QVERIFY(ret.isError());
}
{
QJSValue ret = eng.evaluate("r = false; with(1) { r= true; } r");
QVERIFY(ret.isBool());
QVERIFY(ret.toBool());
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::stringObjects()
{
// See ECMA-262 Section 15.5, "String Objects".
QJSEngine eng;
QString str("ciao");
// in C++
{
Remove QJSEngine::toObject() and QJSValue::toObject() Rationale: There is no compelling usecase for these functions. They are a remnant from QtScript. Task-number: QTBUG-23604 Change-Id: I6d8b4299956dd8f6284934739c4f1a65e4deb64c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-16 12:29:38 +00:00
QJSValue obj = eng.evaluate(QString::fromLatin1("new String('%0')").arg(str));
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(obj.property("length").toInt(), str.length());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
for (int i = 0; i < str.length(); ++i) {
QString pname = QString::number(i);
QVERIFY(obj.property(pname).isString());
QCOMPARE(obj.property(pname).toString(), QString(str.at(i)));
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(!obj.deleteProperty(pname));
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
obj.setProperty(pname, 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(obj.property(pname).isString());
QCOMPARE(obj.property(pname).toString(), QString(str.at(i)));
}
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(obj.property("-1").isUndefined());
QVERIFY(obj.property(QString::number(str.length())).isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
Remove QJSValue constructors that take QJSEngine argument Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 14:42:36 +00:00
QJSValue val = eng.toScriptValue(123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
obj.setProperty("-1", val);
QVERIFY(obj.property("-1").strictlyEquals(val));
obj.setProperty("100", val);
QVERIFY(obj.property("100").strictlyEquals(val));
}
{
QJSValue ret = eng.evaluate("s = new String('ciao'); r = []; for (var p in s) r.push(p); r");
QVERIFY(ret.isArray());
QStringList lst = qjsvalue_cast<QStringList>(ret);
QCOMPARE(lst.size(), str.length());
for (int i = 0; i < str.length(); ++i)
QCOMPARE(lst.at(i), QString::number(i));
QJSValue ret2 = eng.evaluate("s[0] = 123; s[0]");
QVERIFY(ret2.isString());
QCOMPARE(ret2.toString().length(), 1);
QCOMPARE(ret2.toString().at(0), str.at(0));
QJSValue ret3 = eng.evaluate("s[-1] = 123; s[-1]");
QVERIFY(ret3.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret3.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue ret4 = eng.evaluate("s[s.length] = 456; s[s.length]");
QVERIFY(ret4.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret4.toInt(), 456);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue ret5 = eng.evaluate("delete s[0]");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(ret5.isBool());
QVERIFY(!ret5.toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue ret6 = eng.evaluate("delete s[-1]");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(ret6.isBool());
QVERIFY(ret6.toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue ret7 = eng.evaluate("delete s[s.length]");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(ret7.isBool());
QVERIFY(ret7.toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::jsStringPrototypeReplaceBugs()
{
QJSEngine eng;
// task 212440
{
QJSValue ret = eng.evaluate("replace_args = []; \"a a a\".replace(/(a)/g, function() { replace_args.push(arguments); }); replace_args");
QVERIFY(ret.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
int len = ret.property("length").toInt();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(len, 3);
for (int i = 0; i < len; ++i) {
QJSValue args = ret.property(i);
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(args.property("length").toInt(), 4);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(args.property(0).toString(), QString::fromLatin1("a")); // matched string
QCOMPARE(args.property(1).toString(), QString::fromLatin1("a")); // capture
QVERIFY(args.property(2).isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(args.property(2).toInt(), i*2); // index of match
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(args.property(3).toString(), QString::fromLatin1("a a a"));
}
}
// task 212501
{
QJSValue ret = eng.evaluate("\"foo\".replace(/a/g, function() {})");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
}
void tst_QJSEngine::getterSetterThisObject_global()
{
{
QJSEngine eng;
// read
eng.evaluate("__defineGetter__('x', function() { return this; });");
{
QJSValue ret = eng.evaluate("x");
QVERIFY(ret.equals(eng.globalObject()));
}
{
QJSValue ret = eng.evaluate("(function() { return x; })()");
QVERIFY(ret.equals(eng.globalObject()));
}
{
QJSValue ret = eng.evaluate("with (this) x");
QVERIFY(ret.equals(eng.globalObject()));
}
{
QJSValue ret = eng.evaluate("with ({}) x");
QVERIFY(ret.equals(eng.globalObject()));
}
{
QJSValue ret = eng.evaluate("(function() { with ({}) return x; })()");
QVERIFY(ret.equals(eng.globalObject()));
}
// write
eng.evaluate("__defineSetter__('x', function() { return this; });");
{
QJSValue ret = eng.evaluate("x = 'foo'");
// SpiderMonkey says setter return value, JSC says RHS.
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("(function() { return x = 'foo'; })()");
// SpiderMonkey says setter return value, JSC says RHS.
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("with (this) x = 'foo'");
// SpiderMonkey says setter return value, JSC says RHS.
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("with ({}) x = 'foo'");
// SpiderMonkey says setter return value, JSC says RHS.
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("(function() { with ({}) return x = 'foo'; })()");
// SpiderMonkey says setter return value, JSC says RHS.
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
}
}
void tst_QJSEngine::getterSetterThisObject_plain()
{
{
QJSEngine eng;
eng.evaluate("o = {}");
// read
eng.evaluate("o.__defineGetter__('x', function() { return this; })");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("o.x === o").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(eng.evaluate("with (o) x").equals(eng.evaluate("o")));
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("(function() { with (o) return x; })() === o").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
eng.evaluate("q = {}; with (o) with (q) x").equals(eng.evaluate("o"));
// write
eng.evaluate("o.__defineSetter__('x', function() { return this; });");
// SpiderMonkey says setter return value, JSC says RHS.
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("(o.x = 'foo') === 'foo'").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(eng.evaluate("with (o) x = 'foo'").equals("foo"));
QVERIFY(eng.evaluate("with (o) with (q) x = 'foo'").equals("foo"));
}
}
void tst_QJSEngine::getterSetterThisObject_prototypeChain()
{
{
QJSEngine eng;
eng.evaluate("o = {}; p = {}; o.__proto__ = p");
// read
eng.evaluate("p.__defineGetter__('x', function() { return this; })");
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("o.x === o").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(eng.evaluate("with (o) x").equals(eng.evaluate("o")));
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("(function() { with (o) return x; })() === o").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
eng.evaluate("q = {}; with (o) with (q) x").equals(eng.evaluate("o"));
eng.evaluate("with (q) with (o) x").equals(eng.evaluate("o"));
// write
eng.evaluate("o.__defineSetter__('x', function() { return this; });");
// SpiderMonkey says setter return value, JSC says RHS.
Remove obsolete toBoolean() and isBoolean() QJSValue getters We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-09 11:08:18 +00:00
QVERIFY(eng.evaluate("(o.x = 'foo') === 'foo'").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(eng.evaluate("with (o) x = 'foo'").equals("foo"));
QVERIFY(eng.evaluate("with (o) with (q) x = 'foo'").equals("foo"));
}
}
void tst_QJSEngine::jsContinueInSwitch()
{
// This is testing ECMA-262 compliance, not C++ API.
QJSEngine eng;
// switch - continue
{
QJSValue ret = eng.evaluate("switch (1) { default: continue; }");
QVERIFY(ret.isError());
}
// for - switch - case - continue
{
QJSValue ret = eng.evaluate("j = 0; for (i = 0; i < 100000; ++i) {\n"
" switch (i) {\n"
" case 1: ++j; continue;\n"
" case 100: ++j; continue;\n"
" case 1000: ++j; continue;\n"
" }\n"
"}; j");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
// for - switch - case - default - continue
{
QJSValue ret = eng.evaluate("j = 0; for (i = 0; i < 100000; ++i) {\n"
" switch (i) {\n"
" case 1: ++j; continue;\n"
" case 100: ++j; continue;\n"
" case 1000: ++j; continue;\n"
" default: if (i < 50000) break; else continue;\n"
" }\n"
"}; j");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
// switch - for - continue
{
QJSValue ret = eng.evaluate("j = 123; switch (j) {\n"
" case 123:\n"
" for (i = 0; i < 100000; ++i) {\n"
" continue;\n"
" }\n"
"}; i\n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 100000);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
// switch - switch - continue
{
QJSValue ret = eng.evaluate("i = 1; switch (i) { default: switch (i) { case 1: continue; } }");
QVERIFY(ret.isError());
}
// for - switch - switch - continue
{
QJSValue ret = eng.evaluate("j = 0; for (i = 0; i < 100000; ++i) {\n"
" switch (i) {\n"
" case 1:\n"
" switch (i) {\n"
" case 1: ++j; continue;\n"
" }\n"
" }\n"
"}; j");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 1);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
// switch - for - switch - continue
{
QJSValue ret = eng.evaluate("j = 123; switch (j) {\n"
" case 123:\n"
" for (i = 0; i < 100000; ++i) {\n"
" switch (i) {\n"
" case 1:\n"
" ++j; continue;\n"
" }\n"
" }\n"
"}; i\n");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 100000);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::jsShadowReadOnlyPrototypeProperty()
{
QJSEngine eng;
QVERIFY(eng.evaluate("o = {}; o.__proto__ = parseInt; o.length").isNumber());
Update some QML tests and temporarily skip them These tests should be skipped until the next V8 update is landed into QtJSBackend. The expected results of these tests currently check wrong behavior. These bugs have been already fixed in the official V8 thus we need to update and skip them until the fix is landed into QtJSBackend. Change-Id: I77d8ee50b45cd6599cbb5735ddef7d1461aeceab Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-23 10:03:47 +00:00
QVERIFY(eng.evaluate("o.length = 123; o.length").toInt() != 123);
QVERIFY(!eng.evaluate("o.hasOwnProperty('length')").toBool());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::jsReservedWords_data()
{
QTest::addColumn<QString>("word");
QTest::newRow("break") << QString("break");
QTest::newRow("case") << QString("case");
QTest::newRow("catch") << QString("catch");
QTest::newRow("continue") << QString("continue");
QTest::newRow("default") << QString("default");
QTest::newRow("delete") << QString("delete");
QTest::newRow("do") << QString("do");
QTest::newRow("else") << QString("else");
QTest::newRow("false") << QString("false");
QTest::newRow("finally") << QString("finally");
QTest::newRow("for") << QString("for");
QTest::newRow("function") << QString("function");
QTest::newRow("if") << QString("if");
QTest::newRow("in") << QString("in");
QTest::newRow("instanceof") << QString("instanceof");
QTest::newRow("new") << QString("new");
QTest::newRow("null") << QString("null");
QTest::newRow("return") << QString("return");
QTest::newRow("switch") << QString("switch");
QTest::newRow("this") << QString("this");
QTest::newRow("throw") << QString("throw");
QTest::newRow("true") << QString("true");
QTest::newRow("try") << QString("try");
QTest::newRow("typeof") << QString("typeof");
QTest::newRow("var") << QString("var");
QTest::newRow("void") << QString("void");
QTest::newRow("while") << QString("while");
QTest::newRow("with") << QString("with");
}
void tst_QJSEngine::jsReservedWords()
{
// See ECMA-262 Section 7.6.1, "Reserved Words".
// We prefer that the implementation is less strict than the spec; e.g.
// it's good to allow reserved words as identifiers in object literals,
// and when accessing properties using dot notation.
QFETCH(QString, word);
{
QJSEngine eng;
QJSValue ret = eng.evaluate(word + " = 123");
QVERIFY(ret.isError());
QString str = ret.toString();
QVERIFY(str.startsWith("SyntaxError") || str.startsWith("ReferenceError"));
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("var " + word + " = 123");
QVERIFY(ret.isError());
QVERIFY(ret.toString().startsWith("SyntaxError"));
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("o = {}; o." + word + " = 123");
// in the old back-end, in SpiderMonkey and in v8, this is allowed, but not in JSC
QVERIFY(!ret.isError());
QVERIFY(ret.strictlyEquals(eng.evaluate("o." + word)));
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("o = { " + word + ": 123 }");
// in the old back-end, in SpiderMonkey and in v8, this is allowed, but not in JSC
QVERIFY(!ret.isError());
QVERIFY(ret.property(word).isNumber());
}
{
// SpiderMonkey allows this, but we don't
QJSEngine eng;
QJSValue ret = eng.evaluate("function " + word + "() {}");
QVERIFY(ret.isError());
QVERIFY(ret.toString().startsWith("SyntaxError"));
}
}
void tst_QJSEngine::jsFutureReservedWords_data()
{
QTest::addColumn<QString>("word");
QTest::addColumn<bool>("allowed");
QTest::newRow("abstract") << QString("abstract") << true;
QTest::newRow("boolean") << QString("boolean") << true;
QTest::newRow("byte") << QString("byte") << true;
QTest::newRow("char") << QString("char") << true;
QTest::newRow("class") << QString("class") << false;
QTest::newRow("const") << QString("const") << false;
QTest::newRow("debugger") << QString("debugger") << false;
QTest::newRow("double") << QString("double") << true;
QTest::newRow("enum") << QString("enum") << false;
QTest::newRow("export") << QString("export") << false;
QTest::newRow("extends") << QString("extends") << false;
QTest::newRow("final") << QString("final") << true;
QTest::newRow("float") << QString("float") << true;
QTest::newRow("goto") << QString("goto") << true;
QTest::newRow("implements") << QString("implements") << true;
QTest::newRow("import") << QString("import") << false;
QTest::newRow("int") << QString("int") << true;
QTest::newRow("interface") << QString("interface") << true;
QTest::newRow("long") << QString("long") << true;
QTest::newRow("native") << QString("native") << true;
QTest::newRow("package") << QString("package") << true;
QTest::newRow("private") << QString("private") << true;
QTest::newRow("protected") << QString("protected") << true;
QTest::newRow("public") << QString("public") << true;
QTest::newRow("short") << QString("short") << true;
QTest::newRow("static") << QString("static") << true;
QTest::newRow("super") << QString("super") << false;
QTest::newRow("synchronized") << QString("synchronized") << true;
QTest::newRow("throws") << QString("throws") << true;
QTest::newRow("transient") << QString("transient") << true;
QTest::newRow("volatile") << QString("volatile") << true;
}
void tst_QJSEngine::jsFutureReservedWords()
{
// See ECMA-262 Section 7.6.1.2, "Future Reserved Words".
// In real-world implementations, most of these words are
// actually allowed as normal identifiers.
QFETCH(QString, word);
QFETCH(bool, allowed);
{
QJSEngine eng;
QJSValue ret = eng.evaluate(word + " = 123");
QCOMPARE(!ret.isError(), allowed);
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("var " + word + " = 123");
QCOMPARE(!ret.isError(), allowed);
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("o = {}; o." + word + " = 123");
tst_QJSEngine::jsFutureReservedWords(): QSKIP -> QEXPECT_FAIL Task-number: QTBUG-27193 Change-Id: Iaf0bed44374396e59ad3d7f977e3f29d7d5112ee Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-09-10 15:42:01 +00:00
Fix keywords test The reserved keywords are allowed as property names in objects. Change-Id: I5e0025ff374e0e154df81590660fc96b5c529ea4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-05-04 21:57:45 +00:00
QCOMPARE(ret.isNumber(), true);
QCOMPARE(!ret.isError(), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSEngine eng;
QJSValue ret = eng.evaluate("o = { " + word + ": 123 }");
Fix keywords test The reserved keywords are allowed as property names in objects. Change-Id: I5e0025ff374e0e154df81590660fc96b5c529ea4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-05-04 21:57:45 +00:00
QCOMPARE(!ret.isError(), true);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
void tst_QJSEngine::jsThrowInsideWithStatement()
{
// This is testing ECMA-262 compliance, not C++ API.
// task 209988
QJSEngine eng;
{
QJSValue ret = eng.evaluate(
"try {"
" o = { bad : \"bug\" };"
" with (o) {"
" throw 123;"
" }"
"} catch (e) {"
" bad;"
"}");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
}
{
QJSValue ret = eng.evaluate(
"try {"
" o = { bad : \"bug\" };"
" with (o) {"
" throw 123;"
" }"
"} finally {"
" bad;"
"}");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
}
{
QJSValue ret = eng.evaluate(
"o = { bug : \"no bug\" };"
"with (o) {"
" try {"
" throw 123;"
" } finally {"
" bug;"
" }"
"}");
Remove QJS exception API This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-07 12:56:33 +00:00
QVERIFY(!ret.isError());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 123);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate(
"o = { bug : \"no bug\" };"
"with (o) {"
" throw 123;"
"}");
QVERIFY(ret.isNumber());
QJSValue ret2 = eng.evaluate("bug");
QVERIFY(ret2.isError());
QVERIFY(ret2.toString().contains(QString::fromLatin1("ReferenceError")));
}
}
void tst_QJSEngine::reentrancy_globalObjectProperties()
{
QJSEngine eng1;
QJSEngine eng2;
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(eng2.globalObject().property("a").isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
eng1.evaluate("a = 10");
QVERIFY(eng1.globalObject().property("a").isNumber());
Remove invalid QJSValue type Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 08:37:30 +00:00
QVERIFY(eng2.globalObject().property("a").isUndefined());
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
eng2.evaluate("a = 20");
QVERIFY(eng2.globalObject().property("a").isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(eng1.globalObject().property("a").toInt(), 10);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::reentrancy_Array()
{
// weird bug with JSC backend
{
QJSEngine eng;
QCOMPARE(eng.evaluate("Array()").toString(), QString());
eng.evaluate("Array.prototype.toString");
QCOMPARE(eng.evaluate("Array()").toString(), QString());
}
{
QJSEngine eng;
QCOMPARE(eng.evaluate("Array()").toString(), QString());
}
}
void tst_QJSEngine::reentrancy_objectCreation()
{
Don't put JavaScript-owned objects on the stack. Only the fact that the object wrapper uses deleteLater() instead of delete made this not crash. Change-Id: I034d8c7f24b963be9e031446ffdfa33e6bc266cc Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-08-13 13:48:44 +00:00
// Owned by JS engine, as newQObject() sets JS ownership explicitly
QObject *temp = new QObject();
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSEngine eng1;
QJSEngine eng2;
{
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QDateTime dt = QDateTime::currentDateTime();
QJSValue d1 = eng1.toScriptValue(dt);
QJSValue d2 = eng2.toScriptValue(dt);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(d1.toDateTime(), d2.toDateTime());
QCOMPARE(d2.toDateTime(), d1.toDateTime());
}
{
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
QJSValue r1 = eng1.evaluate("new RegExp('foo', 'gim')");
QJSValue r2 = eng2.evaluate("new RegExp('foo', 'gim')");
QCOMPARE(qjsvalue_cast<QRegExp>(r1), qjsvalue_cast<QRegExp>(r2));
QCOMPARE(qjsvalue_cast<QRegExp>(r2), qjsvalue_cast<QRegExp>(r1));
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
Don't put JavaScript-owned objects on the stack. Only the fact that the object wrapper uses deleteLater() instead of delete made this not crash. Change-Id: I034d8c7f24b963be9e031446ffdfa33e6bc266cc Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-08-13 13:48:44 +00:00
QJSValue o1 = eng1.newQObject(temp);
QJSValue o2 = eng2.newQObject(temp);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(o1.toQObject(), o2.toQObject());
QCOMPARE(o2.toQObject(), o1.toQObject());
}
}
void tst_QJSEngine::jsIncDecNonObjectProperty()
{
// This is testing ECMA-262 compliance, not C++ API.
QJSEngine eng;
{
QJSValue ret = eng.evaluate("var a; a.n++");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a; a.n--");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a = null; a.n++");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a = null; a.n--");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a; ++a.n");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a; --a.n");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a; a.n += 1");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a; a.n -= 1");
QVERIFY(ret.isError());
QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
}
{
QJSValue ret = eng.evaluate("var a = 'ciao'; a.length++");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 4);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("var a = 'ciao'; a.length--");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 4);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("var a = 'ciao'; ++a.length");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 5);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
{
QJSValue ret = eng.evaluate("var a = 'ciao'; --a.length");
QVERIFY(ret.isNumber());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(ret.toInt(), 3);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
}
Fix a crash in JSON.parse Properly set members that are actually array indices and don't crash when trying to set those. Task-number: QTBUG-35383 Change-Id: I04d4b65c27e97a2e9db19541ed46ee1bb202f780 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2013-12-04 15:03:59 +00:00
void tst_QJSEngine::JSONparse()
{
QJSEngine eng;
QJSValue ret = eng.evaluate("var json=\"{\\\"1\\\": null}\"; JSON.parse(json);");
QVERIFY(ret.isObject());
}
Fix crashes when calling Array.sort with imperfect sort functions We can't use std::sort to implement Array.sort. The reason is that std::sort expects a conformant compare function, and can do weird things (esp. crash) when the sort function isn't conformant. Falling back to qSort is not possible, as the method has been deprecated. So add a copy of the qSort implementation here, and use that one instead. Fix the sortint test in tst_qqmlecmascript to have a consistent sort function for strings, as the result of calling sort is otherwise undefined according to the ecma standard. Task-number: QTBUG-39072 Change-Id: I0602b3aa1ffa4de5006da58396f166805cf4a5e2 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-06-12 12:35:53 +00:00
void tst_QJSEngine::arraySort()
{
// tests that calling Array.sort with a bad sort function doesn't cause issues
// Using std::sort is e.g. not safe when used with a bad sort function and causes
// crashes
QJSEngine eng;
eng.evaluate("function crashMe() {"
" var data = [];"
" for (var i = 0; i < 50; i++) {"
" data[i] = 'whatever';"
" }"
" data.sort(function(a, b) {"
" return -1;"
" });"
"}"
"crashMe();");
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
static QRegExp minimal(QRegExp r) { r.setMinimal(true); return r; }
void tst_QJSEngine::qRegExpInport_data()
{
QTest::addColumn<QRegExp>("rx");
QTest::addColumn<QString>("string");
QTest::addColumn<QString>("matched");
QTest::newRow("normal") << QRegExp("(test|foo)") << "test _ foo _ test _ Foo";
QTest::newRow("normal2") << QRegExp("(Test|Foo)") << "test _ foo _ test _ Foo";
QTest::newRow("case insensitive)") << QRegExp("(test|foo)", Qt::CaseInsensitive) << "test _ foo _ test _ Foo";
QTest::newRow("case insensitive2)") << QRegExp("(Test|Foo)", Qt::CaseInsensitive) << "test _ foo _ test _ Foo";
QTest::newRow("b(a*)(b*)") << QRegExp("b(a*)(b*)", Qt::CaseInsensitive) << "aaabbBbaAabaAaababaaabbaaab";
QTest::newRow("greedy") << QRegExp("a*(a*)", Qt::CaseInsensitive, QRegExp::RegExp2) << "aaaabaaba";
QTest::newRow("willcard") << QRegExp("*.txt", Qt::CaseSensitive, QRegExp::Wildcard) << "file.txt";
QTest::newRow("willcard 2") << QRegExp("a?b.txt", Qt::CaseSensitive, QRegExp::Wildcard) << "ab.txt abb.rtc acb.txt";
QTest::newRow("slash") << QRegExp("g/.*/s", Qt::CaseInsensitive, QRegExp::RegExp2) << "string/string/string";
QTest::newRow("slash2") << QRegExp("g / .* / s", Qt::CaseInsensitive, QRegExp::RegExp2) << "string / string / string";
QTest::newRow("fixed") << QRegExp("a*aa.a(ba)*a\\ba", Qt::CaseInsensitive, QRegExp::FixedString) << "aa*aa.a(ba)*a\\ba";
QTest::newRow("fixed insensitive") << QRegExp("A*A", Qt::CaseInsensitive, QRegExp::FixedString) << "a*A A*a A*A a*a";
QTest::newRow("fixed sensitive") << QRegExp("A*A", Qt::CaseSensitive, QRegExp::FixedString) << "a*A A*a A*A a*a";
QTest::newRow("html") << QRegExp("<b>(.*)</b>", Qt::CaseSensitive, QRegExp::RegExp2) << "<b>bold</b><i>italic</i><b>bold</b>";
QTest::newRow("html minimal") << minimal(QRegExp("<b>(.*)</b>", Qt::CaseSensitive, QRegExp::RegExp2)) << "<b>bold</b><i>italic</i><b>bold</b>";
QTest::newRow("aaa") << QRegExp("a{2,5}") << "aAaAaaaaaAa";
QTest::newRow("aaa minimal") << minimal(QRegExp("a{2,5}")) << "aAaAaaaaaAa";
QTest::newRow("minimal") << minimal(QRegExp(".*\\} [*8]")) << "}?} ?} *";
QTest::newRow(".? minimal") << minimal(QRegExp(".?")) << ".?";
QTest::newRow(".+ minimal") << minimal(QRegExp(".+")) << ".+";
QTest::newRow("[.?] minimal") << minimal(QRegExp("[.?]")) << ".?";
QTest::newRow("[.+] minimal") << minimal(QRegExp("[.+]")) << ".+";
}
void tst_QJSEngine::qRegExpInport()
{
QFETCH(QRegExp, rx);
QFETCH(QString, string);
QJSEngine eng;
QJSValue rexp;
QJS{Engine,Value}: Remove QRegExp-specific functions Rationale: QRegExp regular expressions have different semantics than JavaScript RegExp. This can cause data loss and unexpected behavior. qjsvalue_cast() and fromScriptValue() can still be used to convert between QRegExp and JS RegExp. Task-number: QTBUG-23604 Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 07:28:18 +00:00
rexp = eng.toScriptValue(rx);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QCOMPARE(rexp.isRegExp(), true);
Update regex related tests of QJSEngine Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2012-10-01 16:18:59 +00:00
QCOMPARE(rexp.isCallable(), false);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QJSValue func = eng.evaluate("(function(string, regexp) { return string.match(regexp); })");
Add QJSValue::call() overload This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-20 07:00:27 +00:00
QJSValue result = func.call(QJSValueList() << string << rexp);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
rx.indexIn(string);
for (int i = 0; i <= rx.captureCount(); i++) {
QCOMPARE(result.property(i).toString(), rx.cap(i));
}
}
// QScriptValue::toDateTime() returns a local time, whereas JS dates
Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Qt3D -> Qt 3D QtLocation -> Qt Location QtScript -> Qt Script Change-Id: Id59cb209e0e0407d564de0bfaab73990e64a02e6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-04-23 14:15:47 +00:00
// are always stored as UTC. Qt Script must respect the current time
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
// zone, and correctly adjust for daylight saving time that may be in
// effect at a given date (QTBUG-9770).
void tst_QJSEngine::dateRoundtripJSQtJS()
{
Skip the date time conversion tests on Windows There's an issue in QDateTime, now that we're using that in our ECMAScript date implementation... Change-Id: I7599900a670097623d1b7e5b9bb086ef43d6e7e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-05 14:17:09 +00:00
#ifdef Q_OS_WIN
QSKIP("This test fails on Windows due to a bug in QDateTime.");
#endif
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
QJSEngine eng;
for (int i = 0; i < 8000; ++i) {
QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
QDateTime qtDate = jsDate.toDateTime();
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QJSValue jsDate2 = eng.toScriptValue(qtDate);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
if (jsDate2.toNumber() != jsDate.toNumber())
QFAIL(qPrintable(jsDate.toString()));
secs += 2*60*60;
}
}
void tst_QJSEngine::dateRoundtripQtJSQt()
{
Skip the date time conversion tests on Windows There's an issue in QDateTime, now that we're using that in our ECMAScript date implementation... Change-Id: I7599900a670097623d1b7e5b9bb086ef43d6e7e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-05 14:17:09 +00:00
#ifdef Q_OS_WIN
QSKIP("This test fails on Windows due to a bug in QDateTime.");
#endif
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QDateTime qtDate = QDateTime(QDate(2009, 1, 1));
QJSEngine eng;
for (int i = 0; i < 8000; ++i) {
Remove QJSEngine::newDate() functions Rationale: Passing a QDateTime to toScriptValue() should be sufficient, there's no need to have a dedicated factory function for Date objects. QDateTime has API for specifying a time in milliseconds, so the newDate() overload that takes a double argument should be redundant. Task-number: QTBUG-23604 Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-17 08:25:53 +00:00
QJSValue jsDate = eng.toScriptValue(qtDate);
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QDateTime qtDate2 = jsDate.toDateTime();
if (qtDate2 != qtDate)
QFAIL(qPrintable(qtDate.toString()));
qtDate = qtDate.addSecs(2*60*60);
}
}
void tst_QJSEngine::dateConversionJSQt()
{
Revert "Temporarily disable tst_QJSEngine tests [...]" This reverts commit 17ae095602bf36ece892598e69f794ef982c603b. The test can be re-enabled now. Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:57:41 +00:00
#ifdef Q_OS_WIN
QSKIP("This test fails on Windows due to a bug in QDateTime.");
#endif
uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
QJSEngine eng;
for (int i = 0; i < 8000; ++i) {
QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
QDateTime qtDate = jsDate.toDateTime();
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString();
Remove milliseconds before comparing JS + Qt date strings. It seems that tst_qjsengine also needs: https://codereview.qt-project.org/#change,65811 Change-Id: I5f5586f004dec047c3a1edebbc98d7ecde195bfd Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:25:08 +00:00
jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000")
Revert "Temporarily disable tst_QJSEngine tests [...]" This reverts commit 17ae095602bf36ece892598e69f794ef982c603b. The test can be re-enabled now. Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:57:41 +00:00
if (qtUTCDateStr != jsUTCDateStr)
QFAIL(qPrintable(jsDate.toString()));
secs += 2*60*60;
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
void tst_QJSEngine::dateConversionQtJS()
{
Revert "Temporarily disable tst_QJSEngine tests [...]" This reverts commit 17ae095602bf36ece892598e69f794ef982c603b. The test can be re-enabled now. Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:57:41 +00:00
QDateTime qtDate = QDateTime(QDate(2009, 1, 1));
QJSEngine eng;
for (int i = 0; i < 8000; ++i) {
QJSValue jsDate = eng.toScriptValue(qtDate);
QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString();
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
Remove milliseconds before comparing JS + Qt date strings. It seems that tst_qjsengine also needs: https://codereview.qt-project.org/#change,65811 Change-Id: I5f5586f004dec047c3a1edebbc98d7ecde195bfd Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:25:08 +00:00
jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000")
Revert "Temporarily disable tst_QJSEngine tests [...]" This reverts commit 17ae095602bf36ece892598e69f794ef982c603b. The test can be re-enabled now. Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-18 13:57:41 +00:00
if (jsUTCDateStr != qtUTCDateStr)
QFAIL(qPrintable(qtDate.toString()));
qtDate = qtDate.addSecs(2*60*60);
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
}
Don't enumerate Function.prototype.{connect,disconnect} QML/JS adds connect and disconnect methods to the standard Function.prototype object. Follow the convention of ECMA-262: Function properties should be non-enumerable. In particular, we don't want such built-in properties to show up in user code "for-in" statements. Task-number: QTBUG-21120 Change-Id: I416106badf35daddf32e16f757d37b2b09e58310 Reviewed-on: http://codereview.qt.nokia.com/3587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2011-08-25 10:51:03 +00:00
void tst_QJSEngine::functionPrototypeExtensions()
{
// QJS adds connect and disconnect properties to Function.prototype.
QJSEngine eng;
QJSValue funProto = eng.globalObject().property("Function").property("prototype");
Add QJSValue::isCallable() function This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:23:16 +00:00
QVERIFY(funProto.isCallable());
QVERIFY(funProto.property("connect").isCallable());
QVERIFY(funProto.property("disconnect").isCallable());
Don't enumerate Function.prototype.{connect,disconnect} QML/JS adds connect and disconnect methods to the standard Function.prototype object. Follow the convention of ECMA-262: Function properties should be non-enumerable. In particular, we don't want such built-in properties to show up in user code "for-in" statements. Task-number: QTBUG-21120 Change-Id: I416106badf35daddf32e16f757d37b2b09e58310 Reviewed-on: http://codereview.qt.nokia.com/3587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2011-08-25 10:51:03 +00:00
// No properties should appear in for-in statements.
QJSValue props = eng.evaluate("props = []; for (var p in Function.prototype) props.push(p); props");
QVERIFY(props.isArray());
Add QJSValue::toInt() and toUInt() These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-18 12:12:00 +00:00
QCOMPARE(props.property("length").toInt(), 0);
Don't enumerate Function.prototype.{connect,disconnect} QML/JS adds connect and disconnect methods to the standard Function.prototype object. Follow the convention of ECMA-262: Function properties should be non-enumerable. In particular, we don't want such built-in properties to show up in user code "for-in" statements. Task-number: QTBUG-21120 Change-Id: I416106badf35daddf32e16f757d37b2b09e58310 Reviewed-on: http://codereview.qt.nokia.com/3587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2011-08-25 10:51:03 +00:00
}
Fix that QJSEngine cannot be used from threads other than the gui thread Implicitly allocate & enter an isolate per thread if needed, store it in TLS and exit it upon thread destruction. As the code that represents QObject dependencies in the GC through implicit dependencies uses its own context, its per-thread data is folded into the v8engine TLS to ensure that it is destructed before the isolate is exited. Task-number: QTBUG-23099 Change-Id: I86538b54939b2fe64db843052eac04c7fd31813e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2011-12-13 09:04:40 +00:00
class ThreadedTestEngine : public QThread {
Q_OBJECT;
public:
int result;
ThreadedTestEngine()
: result(0) {}
void run() {
QJSEngine firstEngine;
QJSEngine secondEngine;
QJSValue value = firstEngine.evaluate("1");
Remove QJSValue::toInteger() function Rationale: This is a remnant from QtScript. A function called toInteger() that returns a double looks strange. Use toInt32() to convert a QJSValue to an integer. Task-number: QTBUG-23604 Change-Id: I2829704c64b077fca264b660c46248c3f35cb5c0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
2012-01-16 14:01:29 +00:00
result = secondEngine.evaluate("1 + " + QString::number(value.toInt())).toInt();
Fix that QJSEngine cannot be used from threads other than the gui thread Implicitly allocate & enter an isolate per thread if needed, store it in TLS and exit it upon thread destruction. As the code that represents QObject dependencies in the GC through implicit dependencies uses its own context, its per-thread data is folded into the v8engine TLS to ensure that it is destructed before the isolate is exited. Task-number: QTBUG-23099 Change-Id: I86538b54939b2fe64db843052eac04c7fd31813e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2011-12-13 09:04:40 +00:00
}
};
void tst_QJSEngine::threadedEngine()
{
ThreadedTestEngine thread1;
ThreadedTestEngine thread2;
thread1.start();
thread2.start();
thread1.wait();
thread2.wait();
QCOMPARE(thread1.result, 2);
QCOMPARE(thread2.result, 2);
}
Allow for function declarations inside conditionals This is strictly speaking a regression from 5.1/v8, which allows for that as real world JavaScript appears to require it. Task-number: QTBUG-33064 Change-Id: Iceaca84373f12fb08459ed007afb25b5a705fa31 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-22 07:24:19 +00:00
void tst_QJSEngine::functionDeclarationsInConditionals()
{
// Even though this is bad practice (and test262 covers it with best practices test cases),
// we do allow for function declarations in if and while statements, as unfortunately that's
// real world JavaScript. (QTBUG-33064 for example)
QJSEngine eng;
QJSValue result = eng.evaluate("if (true) {\n"
" function blah() { return false; }\n"
"} else {\n"
" function blah() { return true; }\n"
"}\n"
"blah();");
QVERIFY(result.isBool());
QCOMPARE(result.toBool(), true);
}
[ChangeLog][QtQml] Fix JavaScript Array.pop() not updating the internal array length correctly While the length property was reporting the correct value, the internal array length was out-of-sync. Task-number: QTBUG-35979 Change-Id: I68820a349cf1ce88c6aabc6a2301a8a861018a10 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-01-07 08:59:10 +00:00
void tst_QJSEngine::arrayPop_QTBUG_35979()
{
QJSEngine eng;
QJSValue result = eng.evaluate(""
"var x = [1, 2]\n"
"x.pop()\n"
"x[1] = 3\n"
"x.toString()\n");
QCOMPARE(result.toString(), QString("1,3"));
}
Fix memory corruption when calling Array.unshift() The dequeue offset won't wrap around when n > offset. [ChangeLog][QtQml] Fix crash with Array.unshift() Task-number: QTBUG-52065 Change-Id: I5e8b89ec964cd6397100442a5239254bca989a3f Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2016-04-14 10:40:31 +00:00
void tst_QJSEngine::array_unshift_QTBUG_52065()
{
QJSEngine eng;
QJSValue result = eng.evaluate("[1, 2, 3, 4, 5, 6, 7, 8, 9]");
QJSValue unshift = result.property(QStringLiteral("unshift"));
unshift.callWithInstance(result, QJSValueList() << QJSValue(0));
int len = result.property(QStringLiteral("length")).toInt();
QCOMPARE(len, 10);
for (int i = 0; i < len; ++i)
QCOMPARE(result.property(i).toInt(), i);
}
Fix crash on Array.prototype.join.call(0) We (incorrectly) didn't check the return value to make sure we had a valid self. At the same time, rename the self variable to match up with other methods. Task-number: QTBUG-53672 Change-Id: Ia0ae5a553e49c4c3b2834c7fdf649fe6373951a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-27 22:09:05 +00:00
void tst_QJSEngine::array_join_QTBUG_53672()
{
QJSEngine eng;
QJSValue result = eng.evaluate("Array.prototype.join.call(0)");
QVERIFY(result.isString());
QCOMPARE(result.toString(), QString(""));
}
Add support for deprecated RegExp (constructor) properties These were apparently part of ancient EcmaScript specs, aren't even listed anymore in any recent spec (not even as deprecated), but apparently they are part of what the web supports as well as previous versions of Qml. So this patch implements them. Task-number: QTBUG-36244 Change-Id: I1b9ea7ea09fceb6a486f615837a71e41aae12de4 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-01-20 13:32:26 +00:00
void tst_QJSEngine::regexpLastMatch()
{
QJSEngine eng;
QCOMPARE(eng.evaluate("RegExp.input").toString(), QString());
QJSValue hasProperty;
for (int i = 1; i < 9; ++i) {
hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$" + QString::number(i) + "\")");
QVERIFY(hasProperty.isBool());
QVERIFY(hasProperty.toBool());
}
hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$0\")");
QVERIFY(hasProperty.isBool());
QVERIFY(!hasProperty.toBool());
hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$10\")");
QVERIFY(!hasProperty.toBool());
hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"lastMatch\")");
QVERIFY(hasProperty.toBool());
hasProperty = eng.evaluate("RegExp.hasOwnProperty(\"$&\")");
QVERIFY(hasProperty.toBool());
QJSValue result = eng.evaluate(""
"var re = /h(el)l(o)/\n"
"var text = \"blah hello world\"\n"
"text.match(re)\n");
QVERIFY(!result.isError());
QJSValue match = eng.evaluate("RegExp.$1");
QCOMPARE(match.toString(), QString("el"));
match = eng.evaluate("RegExp.$2");
QCOMPARE(match.toString(), QString("o"));
for (int i = 3; i <= 9; ++i) {
match = eng.evaluate("RegExp.$" + QString::number(i));
QVERIFY(match.isString());
QCOMPARE(match.toString(), QString());
}
QCOMPARE(eng.evaluate("RegExp.input").toString(), QString("blah hello world"));
QCOMPARE(eng.evaluate("RegExp.lastParen").toString(), QString("o"));
QCOMPARE(eng.evaluate("RegExp.leftContext").toString(), QString("blah "));
QCOMPARE(eng.evaluate("RegExp.rightContext").toString(), QString(" world"));
QCOMPARE(eng.evaluate("RegExp.lastMatch").toString(), QString("hello"));
result = eng.evaluate(""
"var re = /h(ello)/\n"
"var text = \"hello\"\n"
"text.match(re)\n");
QVERIFY(!result.isError());
match = eng.evaluate("RegExp.$1");
QCOMPARE(match.toString(), QString("ello"));
for (int i = 2; i <= 9; ++i) {
match = eng.evaluate("RegExp.$" + QString::number(i));
QVERIFY(match.isString());
QCOMPARE(match.toString(), QString());
}
}
Fix a crash in the register allocator The base for an indexed access can be a constant. Change-Id: Icc529c02fb0ff2ac30d6f40088781b6ecfba81fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-21 14:48:39 +00:00
void tst_QJSEngine::indexedAccesses()
{
QJSEngine engine;
QJSValue v = engine.evaluate("function foo() { return 1[1] } foo()");
QVERIFY(v.isUndefined());
v = engine.evaluate("function foo() { return /x/[1] } foo()");
QVERIFY(v.isUndefined());
v = engine.evaluate("function foo() { return \"xy\"[1] } foo()");
QVERIFY(v.isString());
v = engine.evaluate("function foo() { return \"xy\"[2] } foo()");
QVERIFY(v.isUndefined());
}
Fix marking of prototype objects in chain With a real prototype chain it can happen that an internal class' prototype's class itself has a prototype. Therefore the first transition on the empty class is a PrototypeChange one, but the class the transition leads to may have PrototypeChange transitions itself, which weren't marked. There are multiple solutions to this, but this patch is the minimal fix by recursing fully through the internal class tree. That way it's easier to back-port the fix also into 5.2.x based branches. Task-number: QTBUG-37834 Change-Id: I901b13a2663fbad5844003ca5752f2f304de320c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-07 09:20:03 +00:00
void tst_QJSEngine::prototypeChainGc()
{
QJSEngine engine;
QJSValue getProto = engine.evaluate("Object.getPrototypeOf");
QJSValue factory = engine.evaluate("function() { return Object.create(Object.create({})); }");
QVERIFY(factory.isCallable());
QJSValue obj = factory.call();
engine.collectGarbage();
QJSValue proto = getProto.call(QJSValueList() << obj);
proto = getProto.call(QJSValueList() << proto);
QVERIFY(proto.isObject());
}
Fix marking of prototype objects in internal class pool As per reported bug, we have to protect ourselves against potential loops and can mark the internal classes much simpler by just walking through the memory pool they were allocated in. Task-number: QTBUG-38299 Change-Id: I3ae96e8082e76d06f4321c5aa6d2e9645d2830a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-16 07:36:38 +00:00
void tst_QJSEngine::prototypeChainGc_QTBUG38299()
{
QJSEngine engine;
engine.evaluate("var mapping = {"
"'prop1': \"val1\",\n"
"'prop2': \"val2\"\n"
"}\n"
"\n"
"delete mapping.prop2\n"
"delete mapping.prop1\n"
"\n");
// Don't hang!
engine.collectGarbage();
}
Add support for dynamic properties for QObjects in JavaScript In QtScript you could add properties to a JS object that wraps a QObject. Depending on the wrap option the property was either stored on the JavaScript side or as dynamic QObject property. In QJSEngine/QJSValue, neither was supported - properties could not be added. For QObjects wrapped in JavaScript that weren't created by QML, we can restore the behavior of storing dynamically added properties as JavaScript properties. This makes porting from QtScript to QJS* much easier. Task-number: QTBUG-37408 Change-Id: I5ef1f379c08c3d84de9bdcac9b6a9397238064de Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-09 10:17:40 +00:00
void tst_QJSEngine::dynamicProperties()
{
Refine fix for dynamic properties on QObjects wrapped in JavaScript This is an ammendment to commit 60730cbb5e5475b5db6a15641211aa6958a93197 to further restrict the ability to set dynamic properties on JS wrapped QObjects only on those that are associated with a qml context. Only one such association comes with the static property lookup rules of QML and therefore only those should be prohibited from dynamic properties. The previous implementation on using the "compiledData" field to detect QML association or not is not strong and reliable enough. Change-Id: I10c0e6e58a2727c01a6cb56fdf912bf250333e1f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-04-10 10:58:15 +00:00
{
QJSEngine engine;
QObject *obj = new QObject;
QJSValue wrapper = engine.newQObject(obj);
wrapper.setProperty("someRandomProperty", 42);
QCOMPARE(wrapper.property("someRandomProperty").toInt(), 42);
QVERIFY(!qmlContext(obj));
}
{
QQmlEngine qmlEngine;
QQmlComponent component(&qmlEngine);
component.setData("import QtQml 2.0; QtObject { property QtObject subObject: QtObject {} }", QUrl());
QObject *root = component.create(0);
QVERIFY(root);
QVERIFY(qmlContext(root));
QJSValue wrapper = qmlEngine.newQObject(root);
wrapper.setProperty("someRandomProperty", 42);
QVERIFY(!wrapper.hasProperty("someRandomProperty"));
QObject *subObject = qvariant_cast<QObject*>(root->property("subObject"));
QVERIFY(subObject);
QVERIFY(qmlContext(subObject));
wrapper = qmlEngine.newQObject(subObject);
wrapper.setProperty("someRandomProperty", 42);
QVERIFY(!wrapper.hasProperty("someRandomProperty"));
}
Add support for dynamic properties for QObjects in JavaScript In QtScript you could add properties to a JS object that wraps a QObject. Depending on the wrap option the property was either stored on the JavaScript side or as dynamic QObject property. In QJSEngine/QJSValue, neither was supported - properties could not be added. For QObjects wrapped in JavaScript that weren't created by QML, we can restore the behavior of storing dynamically added properties as JavaScript properties. This makes porting from QtScript to QJS* much easier. Task-number: QTBUG-37408 Change-Id: I5ef1f379c08c3d84de9bdcac9b6a9397238064de Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-09 10:17:40 +00:00
}
Fix QJSEngine::evaluate using the wrong execution context In contrary to what the documentation says, QJSEngine in Qt 5.x executes in the context of the global object (QScriptIsolate always called enter on the QV8Engine's "root" context, thus making it current). The v4 implementation unfortunately did what the documentation said and used the current context, which is wrong in many ways. For example it completely breaks the optimization of stack allocated contexts, because when a C++ callback is called from within a JS function with a stack allocated context and that C++ code calls QJSEngine::evaluate and creates new closures, the stack context would become an outter context and cause crashes during GC. This patch restores the behavior of Qt 5.0/5.1 and fixes the documentation. Task-number: QTBUG-38530 Change-Id: Ie6481f02e676954cc94b188a1c87c88e7c56dafa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-05-05 13:45:54 +00:00
class EvaluateWrapper : public QObject
{
Q_OBJECT
public:
EvaluateWrapper(QJSEngine *engine)
: engine(engine)
{}
public slots:
QJSValue cppEvaluate(const QString &program)
{
return engine->evaluate(program);
}
private:
QJSEngine *engine;
};
void tst_QJSEngine::scopeOfEvaluate()
{
QJSEngine engine;
QJSValue wrapper = engine.newQObject(new EvaluateWrapper(&engine));
engine.evaluate("testVariable = 42");
QJSValue function = engine.evaluate("(function(evalWrapper){\n"
"var testVariable = 100; \n"
"try { \n"
" return evalWrapper.cppEvaluate(\"(function() { return testVariable; })\")\n"
" ()\n"
"} catch (e) {}\n"
"})");
QVERIFY(function.isCallable());
QJSValue result = function.call(QJSValueList() << wrapper);
QCOMPARE(result.toInt(), 42);
}
V4: support calling constants. Consider: function f() { var a; a(); } Here the constant propagation will propagate the value for a (undefined) to the call site. This was not yet handled, resulting in Q_UNIMPLEMENTED warnings when running a debug build. Change-Id: I5f85f681d975b54df7a9e00bd5b50e6f4350139a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-09 11:10:16 +00:00
void tst_QJSEngine::callConstants()
{
QJSEngine engine;
engine.evaluate("function f() {\n"
" var one; one();\n"
" var two = null; two();\n"
"}\n");
Fix failing assertion in debug builds for JS that calls constants For true() we generate IR that looks like this: temp = true result = call temp() and therefore the move at isel time has IR::Call as source and a temp as base for the call. However constant propagation in the optimizer transforms this to result = call true() and that's a case we didn't handle in the IR visitor. Since we have Runtime::callValue we can however handle this case as well and the run-time will consequently produce the expected run-time error. Change-Id: Ia94a8116388e66f9f339913307f68e33a5c18a19 Task-number: QTBUG-43819 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Jan Kundrát <jkt@kde.org> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-13 15:59:22 +00:00
QJSValue exceptionResult = engine.evaluate("true()");
QCOMPARE(exceptionResult.toString(), QString("TypeError: true is not a function"));
V4: support calling constants. Consider: function f() { var a; a(); } Here the constant propagation will propagate the value for a (undefined) to the call site. This was not yet handled, resulting in Q_UNIMPLEMENTED warnings when running a debug build. Change-Id: I5f85f681d975b54df7a9e00bd5b50e6f4350139a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-09 11:10:16 +00:00
}
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
void tst_QJSEngine::installTranslationFunctions()
Add support for translations in pure QJSEngine based environments Re-add the QScriptEngine::addTranslatorFunctions API that brings back qsTr() and friends to pure QJSEngine based environments. The auto-test were also ported where applicable. Change-Id: Ib03e3495ef09eeea9e4c8341061499768caed307 Sanity-Review: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-06-06 10:42:23 +00:00
{
QJSEngine eng;
QJSValue global = eng.globalObject();
QVERIFY(global.property("qsTranslate").isUndefined());
QVERIFY(global.property("QT_TRANSLATE_NOOP").isUndefined());
QVERIFY(global.property("qsTr").isUndefined());
QVERIFY(global.property("QT_TR_NOOP").isUndefined());
QVERIFY(global.property("qsTrId").isUndefined());
QVERIFY(global.property("QT_TRID_NOOP").isUndefined());
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
eng.installExtensions(QJSEngine::TranslationExtension);
Add support for translations in pure QJSEngine based environments Re-add the QScriptEngine::addTranslatorFunctions API that brings back qsTr() and friends to pure QJSEngine based environments. The auto-test were also ported where applicable. Change-Id: Ib03e3495ef09eeea9e4c8341061499768caed307 Sanity-Review: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-06-06 10:42:23 +00:00
QVERIFY(global.property("qsTranslate").isCallable());
QVERIFY(global.property("QT_TRANSLATE_NOOP").isCallable());
QVERIFY(global.property("qsTr").isCallable());
QVERIFY(global.property("QT_TR_NOOP").isCallable());
QVERIFY(global.property("qsTrId").isCallable());
QVERIFY(global.property("QT_TRID_NOOP").isCallable());
{
QJSValue ret = eng.evaluate("qsTr('foo')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("qsTranslate('foo', 'bar')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("bar"));
}
{
QJSValue ret = eng.evaluate("QT_TR_NOOP('foo')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("QT_TRANSLATE_NOOP('foo', 'bar')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("bar"));
}
{
QJSValue ret = eng.evaluate("qsTrId('foo')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
{
QJSValue ret = eng.evaluate("QT_TRID_NOOP('foo')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
Add string::arg method in installTranslatorFunctions QJSEngine::installTranslatorFunctions install the translator functions to any given JS object. However, the custom string::arg() method is only added in qqmlbuiltinfunctions.cpp, making the use of qsTr() in other pure-JS programs quite hard. Task-number: QTBUG-43113 Change-Id: Ia9ed97a4c07a4d167c792f3ea13e4f6e96c97423 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-04 13:19:09 +00:00
{
QJSValue ret = eng.evaluate("qsTr('%1').arg('foo')");
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
}
Add support for translations in pure QJSEngine based environments Re-add the QScriptEngine::addTranslatorFunctions API that brings back qsTr() and friends to pure QJSEngine based environments. The auto-test were also ported where applicable. Change-Id: Ib03e3495ef09eeea9e4c8341061499768caed307 Sanity-Review: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-06-06 10:42:23 +00:00
QVERIFY(eng.evaluate("QT_TRID_NOOP()").isUndefined());
}
class TranslationScope
{
public:
TranslationScope(const QString &fileName)
{
translator.load(fileName);
QCoreApplication::instance()->installTranslator(&translator);
}
~TranslationScope()
{
QCoreApplication::instance()->removeTranslator(&translator);
}
private:
QTranslator translator;
};
void tst_QJSEngine::translateScript_data()
{
QTest::addColumn<QString>("expression");
QTest::addColumn<QString>("fileName");
QTest::addColumn<QString>("expectedTranslation");
QString fileName = QString::fromLatin1("translatable.js");
// Top-level
QTest::newRow("qsTr('One')@translatable.js")
<< QString::fromLatin1("qsTr('One')") << fileName << QString::fromLatin1("En");
QTest::newRow("qsTr('Hello')@translatable.js")
<< QString::fromLatin1("qsTr('Hello')") << fileName << QString::fromLatin1("Hallo");
// From function
QTest::newRow("(function() { return qsTr('One'); })()@translatable.js")
<< QString::fromLatin1("(function() { return qsTr('One'); })()") << fileName << QString::fromLatin1("En");
QTest::newRow("(function() { return qsTr('Hello'); })()@translatable.js")
<< QString::fromLatin1("(function() { return qsTr('Hello'); })()") << fileName << QString::fromLatin1("Hallo");
// Plural
QTest::newRow("qsTr('%n message(s) saved', '', 1)@translatable.js")
<< QString::fromLatin1("qsTr('%n message(s) saved', '', 1)") << fileName << QString::fromLatin1("1 melding lagret");
QTest::newRow("qsTr('%n message(s) saved', '', 3).arg@translatable.js")
<< QString::fromLatin1("qsTr('%n message(s) saved', '', 3)") << fileName << QString::fromLatin1("3 meldinger lagret");
// Top-level
QTest::newRow("qsTranslate('FooContext', 'Two')@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'Two')") << fileName << QString::fromLatin1("To");
QTest::newRow("qsTranslate('FooContext', 'Goodbye')@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'Goodbye')") << fileName << QString::fromLatin1("Farvel");
// From eval
QTest::newRow("eval('qsTranslate(\\'FooContext\\', \\'Two\\')')@translatable.js")
<< QString::fromLatin1("eval('qsTranslate(\\'FooContext\\', \\'Two\\')')") << fileName << QString::fromLatin1("To");
QTest::newRow("eval('qsTranslate(\\'FooContext\\', \\'Goodbye\\')')@translatable.js")
<< QString::fromLatin1("eval('qsTranslate(\\'FooContext\\', \\'Goodbye\\')')") << fileName << QString::fromLatin1("Farvel");
QTest::newRow("qsTranslate('FooContext', 'Goodbye', '')@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'Goodbye', '')") << fileName << QString::fromLatin1("Farvel");
QTest::newRow("qsTranslate('FooContext', 'Goodbye', '', 42)@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'Goodbye', '', 42)") << fileName << QString::fromLatin1("Goodbye");
QTest::newRow("qsTr('One', 'not the same one')@translatable.js")
<< QString::fromLatin1("qsTr('One', 'not the same one')") << fileName << QString::fromLatin1("Enda en");
QTest::newRow("qsTr('One', 'not the same one', 42)@translatable.js")
<< QString::fromLatin1("qsTr('One', 'not the same one', 42)") << fileName << QString::fromLatin1("One");
// Plural
QTest::newRow("qsTranslate('FooContext', '%n fooish bar(s) found', '', 1)@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', '%n fooish bar(s) found', '', 1)") << fileName << QString::fromLatin1("1 fooaktig bar funnet");
QTest::newRow("qsTranslate('FooContext', '%n fooish bar(s) found', '', 2)@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', '%n fooish bar(s) found', '', 2)") << fileName << QString::fromLatin1("2 fooaktige barer funnet");
// Don't exist in translation
QTest::newRow("qsTr('Three')@translatable.js")
<< QString::fromLatin1("qsTr('Three')") << fileName << QString::fromLatin1("Three");
QTest::newRow("qsTranslate('FooContext', 'So long')@translatable.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'So long')") << fileName << QString::fromLatin1("So long");
QTest::newRow("qsTranslate('BarContext', 'Goodbye')@translatable.js")
<< QString::fromLatin1("qsTranslate('BarContext', 'Goodbye')") << fileName << QString::fromLatin1("Goodbye");
// Translate strings from the second script (translatable2.js)
QString fileName2 = QString::fromLatin1("translatable2.js");
QTest::newRow("qsTr('Three')@translatable2.js")
<< QString::fromLatin1("qsTr('Three')") << fileName2 << QString::fromLatin1("Tre");
QTest::newRow("qsTr('Happy birthday!')@translatable2.js")
<< QString::fromLatin1("qsTr('Happy birthday!')") << fileName2 << QString::fromLatin1("Gratulerer med dagen!");
// Not translated because translation is only in translatable.js
QTest::newRow("qsTr('One')@translatable2.js")
<< QString::fromLatin1("qsTr('One')") << fileName2 << QString::fromLatin1("One");
QTest::newRow("(function() { return qsTr('One'); })()@translatable2.js")
<< QString::fromLatin1("(function() { return qsTr('One'); })()") << fileName2 << QString::fromLatin1("One");
// For qsTranslate() the filename shouldn't matter
QTest::newRow("qsTranslate('FooContext', 'Two')@translatable2.js")
<< QString::fromLatin1("qsTranslate('FooContext', 'Two')") << fileName2 << QString::fromLatin1("To");
QTest::newRow("qsTranslate('BarContext', 'Congratulations!')@translatable.js")
<< QString::fromLatin1("qsTranslate('BarContext', 'Congratulations!')") << fileName << QString::fromLatin1("Gratulerer!");
}
void tst_QJSEngine::translateScript()
{
QFETCH(QString, expression);
QFETCH(QString, fileName);
QFETCH(QString, expectedTranslation);
QJSEngine engine;
TranslationScope tranScope(":/translations/translatable_la");
engine.installTranslatorFunctions();
QCOMPARE(engine.evaluate(expression, fileName).toString(), expectedTranslation);
}
void tst_QJSEngine::translateScript_crossScript()
{
QJSEngine engine;
TranslationScope tranScope(":/translations/translatable_la");
engine.installTranslatorFunctions();
QString fileName = QString::fromLatin1("translatable.js");
QString fileName2 = QString::fromLatin1("translatable2.js");
// qsTr() should use the innermost filename as context
engine.evaluate("function foo(s) { return bar(s); }", fileName);
engine.evaluate("function bar(s) { return qsTr(s); }", fileName2);
QCOMPARE(engine.evaluate("bar('Three')", fileName2).toString(), QString::fromLatin1("Tre"));
QCOMPARE(engine.evaluate("bar('Three')", fileName).toString(), QString::fromLatin1("Tre"));
QCOMPARE(engine.evaluate("bar('One')", fileName2).toString(), QString::fromLatin1("One"));
engine.evaluate("function foo(s) { return bar(s); }", fileName2);
engine.evaluate("function bar(s) { return qsTr(s); }", fileName);
QCOMPARE(engine.evaluate("bar('Three')", fileName2).toString(), QString::fromLatin1("Three"));
QCOMPARE(engine.evaluate("bar('One')", fileName).toString(), QString::fromLatin1("En"));
QCOMPARE(engine.evaluate("bar('One')", fileName2).toString(), QString::fromLatin1("En"));
}
void tst_QJSEngine::translateScript_trNoOp()
{
QJSEngine engine;
TranslationScope tranScope(":/translations/translatable_la");
engine.installTranslatorFunctions();
QVERIFY(engine.evaluate("QT_TR_NOOP()").isUndefined());
QCOMPARE(engine.evaluate("QT_TR_NOOP('One')").toString(), QString::fromLatin1("One"));
QVERIFY(engine.evaluate("QT_TRANSLATE_NOOP()").isUndefined());
QVERIFY(engine.evaluate("QT_TRANSLATE_NOOP('FooContext')").isUndefined());
QCOMPARE(engine.evaluate("QT_TRANSLATE_NOOP('FooContext', 'Two')").toString(), QString::fromLatin1("Two"));
}
void tst_QJSEngine::translateScript_callQsTrFromCpp()
{
QJSEngine engine;
TranslationScope tranScope(":/translations/translatable_la");
engine.installTranslatorFunctions();
// There is no context, but it shouldn't crash
QCOMPARE(engine.globalObject().property("qsTr").call(QJSValueList() << "One").toString(), QString::fromLatin1("One"));
}
void tst_QJSEngine::translateWithInvalidArgs_data()
{
QTest::addColumn<QString>("expression");
QTest::addColumn<QString>("expectedError");
QTest::newRow("qsTr()") << "qsTr()" << "Error: qsTr() requires at least one argument";
QTest::newRow("qsTr(123)") << "qsTr(123)" << "Error: qsTr(): first argument (sourceText) must be a string";
QTest::newRow("qsTr('foo', 123)") << "qsTr('foo', 123)" << "Error: qsTr(): second argument (disambiguation) must be a string";
QTest::newRow("qsTr('foo', 'bar', 'baz')") << "qsTr('foo', 'bar', 'baz')" << "Error: qsTr(): third argument (n) must be a number";
QTest::newRow("qsTr('foo', 'bar', true)") << "qsTr('foo', 'bar', true)" << "Error: qsTr(): third argument (n) must be a number";
QTest::newRow("qsTranslate()") << "qsTranslate()" << "Error: qsTranslate() requires at least two arguments";
QTest::newRow("qsTranslate('foo')") << "qsTranslate('foo')" << "Error: qsTranslate() requires at least two arguments";
QTest::newRow("qsTranslate(123, 'foo')") << "qsTranslate(123, 'foo')" << "Error: qsTranslate(): first argument (context) must be a string";
QTest::newRow("qsTranslate('foo', 123)") << "qsTranslate('foo', 123)" << "Error: qsTranslate(): second argument (sourceText) must be a string";
QTest::newRow("qsTranslate('foo', 'bar', 123)") << "qsTranslate('foo', 'bar', 123)" << "Error: qsTranslate(): third argument (disambiguation) must be a string";
QTest::newRow("qsTrId()") << "qsTrId()" << "Error: qsTrId() requires at least one argument";
QTest::newRow("qsTrId(123)") << "qsTrId(123)" << "TypeError: qsTrId(): first argument (id) must be a string";
QTest::newRow("qsTrId('foo', 'bar')") << "qsTrId('foo', 'bar')" << "TypeError: qsTrId(): second argument (n) must be a number";
}
void tst_QJSEngine::translateWithInvalidArgs()
{
QFETCH(QString, expression);
QFETCH(QString, expectedError);
QJSEngine engine;
engine.installTranslatorFunctions();
QJSValue result = engine.evaluate(expression);
QVERIFY(result.isError());
QCOMPARE(result.toString(), expectedError);
}
void tst_QJSEngine::translationContext_data()
{
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("text");
QTest::addColumn<QString>("expectedTranslation");
QTest::newRow("translatable.js") << "translatable.js" << "One" << "En";
QTest::newRow("/translatable.js") << "/translatable.js" << "One" << "En";
QTest::newRow("/foo/translatable.js") << "/foo/translatable.js" << "One" << "En";
QTest::newRow("/foo/bar/translatable.js") << "/foo/bar/translatable.js" << "One" << "En";
QTest::newRow("./translatable.js") << "./translatable.js" << "One" << "En";
QTest::newRow("../translatable.js") << "../translatable.js" << "One" << "En";
QTest::newRow("foo/translatable.js") << "foo/translatable.js" << "One" << "En";
QTest::newRow("file:///home/qt/translatable.js") << "file:///home/qt/translatable.js" << "One" << "En";
QTest::newRow(":/resources/translatable.js") << ":/resources/translatable.js" << "One" << "En";
QTest::newRow("/translatable.js.foo") << "/translatable.js.foo" << "One" << "En";
QTest::newRow("/translatable.txt") << "/translatable.txt" << "One" << "En";
QTest::newRow("translatable") << "translatable" << "One" << "En";
QTest::newRow("foo/translatable") << "foo/translatable" << "One" << "En";
QTest::newRow("translatable.js/") << "translatable.js/" << "One" << "One";
QTest::newRow("nosuchscript.js") << "" << "One" << "One";
QTest::newRow("(empty)") << "" << "One" << "One";
}
void tst_QJSEngine::translationContext()
{
TranslationScope tranScope(":/translations/translatable_la");
QJSEngine engine;
engine.installTranslatorFunctions();
QFETCH(QString, path);
QFETCH(QString, text);
QFETCH(QString, expectedTranslation);
QJSValue ret = engine.evaluate(QString::fromLatin1("qsTr('%0')").arg(text), path);
QVERIFY(ret.isString());
QCOMPARE(ret.toString(), expectedTranslation);
}
void tst_QJSEngine::translateScriptIdBased()
{
QJSEngine engine;
TranslationScope tranScope(":/translations/idtranslatable_la");
engine.installTranslatorFunctions();
QString fileName = QString::fromLatin1("idtranslatable.js");
QHash<QString, QString> expectedTranslations;
expectedTranslations["qtn_foo_bar"] = "First string";
expectedTranslations["qtn_needle"] = "Second string";
expectedTranslations["qtn_haystack"] = "Third string";
expectedTranslations["qtn_bar_baz"] = "Fourth string";
QHash<QString, QString>::const_iterator it;
for (it = expectedTranslations.constBegin(); it != expectedTranslations.constEnd(); ++it) {
for (int x = 0; x < 2; ++x) {
QString fn;
if (x)
fn = fileName;
// Top-level
QCOMPARE(engine.evaluate(QString::fromLatin1("qsTrId('%0')")
.arg(it.key()), fn).toString(),
it.value());
QCOMPARE(engine.evaluate(QString::fromLatin1("QT_TRID_NOOP('%0')")
.arg(it.key()), fn).toString(),
it.key());
// From function
QCOMPARE(engine.evaluate(QString::fromLatin1("(function() { return qsTrId('%0'); })()")
.arg(it.key()), fn).toString(),
it.value());
QCOMPARE(engine.evaluate(QString::fromLatin1("(function() { return QT_TRID_NOOP('%0'); })()")
.arg(it.key()), fn).toString(),
it.key());
}
}
// Plural form
QCOMPARE(engine.evaluate("qsTrId('qtn_bar_baz', 10)").toString(),
QString::fromLatin1("10 fooish bar(s) found"));
QCOMPARE(engine.evaluate("qsTrId('qtn_foo_bar', 10)").toString(),
QString::fromLatin1("qtn_foo_bar")); // Doesn't have plural
}
// How to add a new test row:
// - Find a nice list of Unicode characters to choose from
// - Write source string/context/comment in .js using Unicode escape sequences (\uABCD)
// - Update corresponding .ts file (e.g. lupdate foo.js -ts foo.ts -codecfortr UTF-8)
// - Enter translation in Linguist
// - Update corresponding .qm file (e.g. lrelease foo.ts)
// - Evaluate script that performs translation; make sure the correct result is returned
// (e.g. by setting the resulting string as the text of a QLabel and visually verifying
// that it looks the same as what you entered in Linguist :-) )
// - Generate the expectedTranslation column data using toUtf8().toHex()
void tst_QJSEngine::translateScriptUnicode_data()
{
QTest::addColumn<QString>("expression");
QTest::addColumn<QString>("fileName");
QTest::addColumn<QString>("expectedTranslation");
QString fileName = QString::fromLatin1("translatable-unicode.js");
QTest::newRow("qsTr('H\\u2082O')@translatable-unicode.js")
<< QString::fromLatin1("qsTr('H\\u2082O')") << fileName << QString::fromUtf8("\xcd\xbb\xcd\xbc\xcd\xbd");
QTest::newRow("qsTranslate('\\u010C\\u0101\\u011F\\u0115', 'CO\\u2082')@translatable-unicode.js")
<< QString::fromLatin1("qsTranslate('\\u010C\\u0101\\u011F\\u0115', 'CO\\u2082')") << fileName << QString::fromUtf8("\xd7\x91\xd7\x9a\xd7\xa2");
QTest::newRow("qsTr('\\u0391\\u0392\\u0393')@translatable-unicode.js")
<< QString::fromLatin1("qsTr('\\u0391\\u0392\\u0393')") << fileName << QString::fromUtf8("\xd3\x9c\xd2\xb4\xd1\xbc");
QTest::newRow("qsTranslate('\\u010C\\u0101\\u011F\\u0115', '\\u0414\\u0415\\u0416')@translatable-unicode.js")
<< QString::fromLatin1("qsTranslate('\\u010C\\u0101\\u011F\\u0115', '\\u0414\\u0415\\u0416')") << fileName << QString::fromUtf8("\xd8\xae\xd8\xb3\xd8\xb3");
QTest::newRow("qsTr('H\\u2082O', 'not the same H\\u2082O')@translatable-unicode.js")
<< QString::fromLatin1("qsTr('H\\u2082O', 'not the same H\\u2082O')") << fileName << QString::fromUtf8("\xd4\xb6\xd5\x8a\xd5\x92");
QTest::newRow("qsTr('H\\u2082O')")
<< QString::fromLatin1("qsTr('H\\u2082O')") << QString() << QString::fromUtf8("\x48\xe2\x82\x82\x4f");
QTest::newRow("qsTranslate('\\u010C\\u0101\\u011F\\u0115', 'CO\\u2082')")
<< QString::fromLatin1("qsTranslate('\\u010C\\u0101\\u011F\\u0115', 'CO\\u2082')") << QString() << QString::fromUtf8("\xd7\x91\xd7\x9a\xd7\xa2");
}
void tst_QJSEngine::translateScriptUnicode()
{
QFETCH(QString, expression);
QFETCH(QString, fileName);
QFETCH(QString, expectedTranslation);
QJSEngine engine;
TranslationScope tranScope(":/translations/translatable-unicode");
engine.installTranslatorFunctions();
QCOMPARE(engine.evaluate(expression, fileName).toString(), expectedTranslation);
}
void tst_QJSEngine::translateScriptUnicodeIdBased_data()
{
QTest::addColumn<QString>("expression");
QTest::addColumn<QString>("expectedTranslation");
QTest::newRow("qsTrId('\\u01F8\\u01D2\\u0199\\u01D0\\u01E1'')")
<< QString::fromLatin1("qsTrId('\\u01F8\\u01D2\\u0199\\u01D0\\u01E1')") << QString::fromUtf8("\xc6\xa7\xc6\xb0\xc6\x88\xc8\xbc\xc8\x9d\xc8\xbf\xc8\x99");
QTest::newRow("qsTrId('\\u0191\\u01CE\\u0211\\u0229\\u019C\\u018E\\u019A\\u01D0')")
<< QString::fromLatin1("qsTrId('\\u0191\\u01CE\\u0211\\u0229\\u019C\\u018E\\u019A\\u01D0')") << QString::fromUtf8("\xc7\xa0\xc8\xa1\xc8\x8b\xc8\x85\xc8\x95");
QTest::newRow("qsTrId('\\u0181\\u01A1\\u0213\\u018F\\u018C', 10)")
<< QString::fromLatin1("qsTrId('\\u0181\\u01A1\\u0213\\u018F\\u018C', 10)") << QString::fromUtf8("\x31\x30\x20\xc6\x92\xc6\xa1\xc7\x92\x28\xc8\x99\x29");
QTest::newRow("qsTrId('\\u0181\\u01A1\\u0213\\u018F\\u018C')")
<< QString::fromLatin1("qsTrId('\\u0181\\u01A1\\u0213\\u018F\\u018C')") << QString::fromUtf8("\xc6\x91\xc6\xb0\xc7\xb9");
QTest::newRow("qsTrId('\\u01CD\\u0180\\u01A8\\u0190\\u019E\\u01AB')")
<< QString::fromLatin1("qsTrId('\\u01CD\\u0180\\u01A8\\u0190\\u019E\\u01AB')") << QString::fromUtf8("\xc7\x8d\xc6\x80\xc6\xa8\xc6\x90\xc6\x9e\xc6\xab");
}
void tst_QJSEngine::translateScriptUnicodeIdBased()
{
QFETCH(QString, expression);
QFETCH(QString, expectedTranslation);
QJSEngine engine;
TranslationScope tranScope(":/translations/idtranslatable-unicode");
engine.installTranslatorFunctions();
QCOMPARE(engine.evaluate(expression).toString(), expectedTranslation);
}
void tst_QJSEngine::translateFromBuiltinCallback()
{
QJSEngine eng;
eng.installTranslatorFunctions();
// Callback has no translation context.
eng.evaluate("function foo() { qsTr('foo'); }");
// Stack at translation time will be:
// qsTr, foo, forEach, global
// qsTr() needs to walk to the outer-most (global) frame before it finds
// a translation context, and this should not crash.
eng.evaluate("[10,20].forEach(foo)", "script.js");
}
Add extension API to QJSEngine This allows users in a JavaScript-only environment to install extensions including: - Translation functions (qsTr(), etc.) - The console object (console.log(), print(), etc.) - Garbage collection functions (gc()) This deprecates installTranslatorFunctions(). This API results in less clutter in the API, as we'd otherwise need to have several functions for each type of extension. [ChangeLog][QJSEngine] Introduced an extension API that allows installing various function and object extensions (qsTr(), console.log(), etc.) to QJSEngine. [ChangeLog][QJSEngine] installTranslatorFunctions() was deprecated in favor of the new extension API (see installExtensions()). Change-Id: I4d6eb2097c3eda6810e967b2e8f6441c28c91a16 Task-number: QTBUG-40772 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-10 07:11:13 +00:00
void tst_QJSEngine::installConsoleFunctions()
{
QJSEngine engine;
QJSValue global = engine.globalObject();
QVERIFY(global.property("console").isUndefined());
QVERIFY(global.property("print").isUndefined());
engine.installExtensions(QJSEngine::ConsoleExtension);
QVERIFY(global.property("console").isObject());
QVERIFY(global.property("print").isCallable());
}
void tst_QJSEngine::logging()
{
QLoggingCategory loggingCategory("js");
QVERIFY(loggingCategory.isDebugEnabled());
QVERIFY(loggingCategory.isWarningEnabled());
QVERIFY(loggingCategory.isCriticalEnabled());
QJSEngine engine;
engine.installExtensions(QJSEngine::ConsoleExtension);
QTest::ignoreMessage(QtDebugMsg, "console.debug");
engine.evaluate("console.debug('console.debug')");
QTest::ignoreMessage(QtDebugMsg, "console.log");
engine.evaluate("console.log('console.log')");
QTest::ignoreMessage(QtInfoMsg, "console.info");
engine.evaluate("console.info('console.info')");
QTest::ignoreMessage(QtWarningMsg, "console.warn");
engine.evaluate("console.warn('console.warn')");
QTest::ignoreMessage(QtCriticalMsg, "console.error");
engine.evaluate("console.error('console.error')");
QTest::ignoreMessage(QtDebugMsg, ": 1");
engine.evaluate("console.count()");
QTest::ignoreMessage(QtDebugMsg, ": 2");
engine.evaluate("console.count()");
}
void tst_QJSEngine::tracing()
{
QJSEngine engine;
engine.installExtensions(QJSEngine::ConsoleExtension);
QTest::ignoreMessage(QtDebugMsg, "%entry (:1)");
engine.evaluate("console.trace()");
QTest::ignoreMessage(QtDebugMsg, "a (:1)\nb (:1)\nc (:1)\n%entry (:1)");
engine.evaluate("function a() { console.trace(); } function b() { a(); } function c() { b(); }");
engine.evaluate("c()");
}
void tst_QJSEngine::asserts()
{
QJSEngine engine;
engine.installExtensions(QJSEngine::ConsoleExtension);
QTest::ignoreMessage(QtCriticalMsg, "This will fail\n%entry (:1)");
engine.evaluate("console.assert(0, 'This will fail')");
QTest::ignoreMessage(QtCriticalMsg, "This will fail too\n%entry (:1)");
engine.evaluate("console.assert(1 > 2, 'This will fail too')");
}
void tst_QJSEngine::exceptions()
{
QJSEngine engine;
engine.installExtensions(QJSEngine::ConsoleExtension);
QTest::ignoreMessage(QtCriticalMsg, "Exception 1\n%entry (:1)");
engine.evaluate("console.exception('Exception 1')");
}
void tst_QJSEngine::installGarbageCollectionFunctions()
{
QJSEngine engine;
QJSValue global = engine.globalObject();
QVERIFY(global.property("gc").isUndefined());
engine.installExtensions(QJSEngine::GarbageCollectionExtension);
QVERIFY(global.property("gc").isCallable());
}
void tst_QJSEngine::installAllExtensions()
{
QJSEngine engine;
QJSValue global = engine.globalObject();
// Pick out a few properties from each extension and check that they're there.
QVERIFY(global.property("qsTranslate").isUndefined());
QVERIFY(global.property("console").isUndefined());
QVERIFY(global.property("print").isUndefined());
QVERIFY(global.property("gc").isUndefined());
engine.installExtensions(QJSEngine::AllExtensions);
QVERIFY(global.property("qsTranslate").isCallable());
QVERIFY(global.property("console").isObject());
QVERIFY(global.property("print").isCallable());
QVERIFY(global.property("gc").isCallable());
}
Exclude private methods and QObject::deleteLater from enumerable properties This is a regression from Qt 5.1/5.0 introduced with 5.2. Private slots/methods such as QObject::_q_reRegisterTimers() as well as QObject::deleteLater() are not suitable for calls from JavaScript. deleteLater() in particular is covered by the destroy() replacement slot. Task-number: QTBUG-39744 Change-Id: I9b25f3c0d4095ba8e2e8e5ee47e37903b5def1f9 Reviewed-by: Michael Brasser <michael.brasser@live.com>
2014-06-24 10:05:35 +00:00
class ObjectWithPrivateMethods : public QObject
{
Q_OBJECT
private slots:
void myPrivateMethod() {}
};
void tst_QJSEngine::privateMethods()
{
ObjectWithPrivateMethods object;
QJSEngine engine;
QJSValue jsWrapper = engine.newQObject(&object);
QQmlEngine::setObjectOwnership(&object, QQmlEngine::CppOwnership);
QSet<QString> privateMethods;
{
const QMetaObject *mo = object.metaObject();
for (int i = 0; i < mo->methodCount(); ++i) {
const QMetaMethod method = mo->method(i);
if (method.access() == QMetaMethod::Private)
privateMethods << QString::fromUtf8(method.name());
}
}
QVERIFY(privateMethods.contains("myPrivateMethod"));
QVERIFY(privateMethods.contains("_q_reregisterTimers"));
privateMethods << QStringLiteral("deleteLater") << QStringLiteral("destroyed");
QJSValueIterator it(jsWrapper);
while (it.hasNext()) {
it.next();
QVERIFY(!privateMethods.contains(it.name()));
}
}
Add ability to retrieve QJSEngine for a given QObject [ChangeLog][QtQml] Added qjsEngine(QObject*) getter similar to qmlEngine(object) that allows retrieving the engine for an exposed object. Change-Id: Id14adec58d45fe58133f65bab773b07d6bc18569 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-01-12 12:07:38 +00:00
void tst_QJSEngine::engineForObject()
{
QObject object;
{
QJSEngine engine;
QVERIFY(!qjsEngine(&object));
QJSValue wrapper = engine.newQObject(&object);
QQmlEngine::setObjectOwnership(&object, QQmlEngine::CppOwnership);
QCOMPARE(qjsEngine(&object), wrapper.engine());
}
QVERIFY(!qjsEngine(&object));
}
V4: only optimize out to-int32 conversions when the operands are int32. The operands of bit-ops are not typed as int32 when no type-inference is done, like for the interpreter. Task-number: QTBUG-43309 Change-Id: I67af18e14ddbc0649530ac23601332ee7d7a1f34 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-18 09:24:22 +00:00
void tst_QJSEngine::intConversion_QTBUG43309()
{
// This failed in the interpreter:
QJSEngine engine;
QString jsCode = "var n = 0.1; var m = (n*255) | 0; m";
QJSValue result = engine.evaluate( jsCode );
V4: fix reverse type propagation Only do integer add/sub/mul when all operands are known to be integers. [ChangeLog][QtQml] Fixed invalidly opportunistic truncating of non-integer values for additions/subtractions/multiplications in JavaScript and binding expressions. Change-Id: I21b3bede2fb3e8033305591110b98cc9e6bf52f8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 10:40:24 +00:00
QVERIFY(result.isNumber());
QCOMPARE(result.toNumber(), 25.0);
V4: only optimize out to-int32 conversions when the operands are int32. The operands of bit-ops are not typed as int32 when no type-inference is done, like for the interpreter. Task-number: QTBUG-43309 Change-Id: I67af18e14ddbc0649530ac23601332ee7d7a1f34 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-18 09:24:22 +00:00
}
V4: fix ToFixed rounding for 0 fraction digits. (12.5).toFixed() should return 13, not 12. Task-number: QTBUG-43885 Task-number: QTBUG-44039 Change-Id: Id2b19641e8c12dd5755d8447508b74567e4a2b9b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-01-28 08:34:10 +00:00
// QTBUG-44039 and QTBUG-43885:
void tst_QJSEngine::toFixed()
{
QJSEngine engine;
QJSValue result = engine.evaluate(QStringLiteral("(12.5).toFixed()"));
QVERIFY(result.isString());
QCOMPARE(result.toString(), QStringLiteral("13"));
result = engine.evaluate(QStringLiteral("(12.05).toFixed(1)"));
QVERIFY(result.isString());
QCOMPARE(result.toString(), QStringLiteral("12.1"));
}
Fix passing of locals as function arguments with side-effects Commit 75c22465cf8fe262edfe6178bb9ca19661fb710e regressed in allowing locals and arguments to be passed directly as further arguments to function calls, but that's incorrect when considering var i = 2; testFunction(i, i += 2) where it is instrumental to place the first argument into a temp (making a copy) instead of passing it directly. Change-Id: Iffcf6c6eda92a8fb665982cda1db0b96359cd092 Task-number: QTBUG-45879 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-04-30 11:20:43 +00:00
void tst_QJSEngine::argumentEvaluationOrder()
{
QJSEngine engine;
QJSValue ok = engine.evaluate(
"function record(arg1, arg2) {\n"
" parameters = [arg1, arg2]\n"
"}\n"
"function test() {\n"
" var i = 2;\n"
" record(i, i += 2);\n"
"}\n"
"test()\n"
"parameters[0] == 2 && parameters[1] == 4");
qDebug() << ok.toString();
QVERIFY(ok.isBool());
QVERIFY(ok.toBool());
}
Fix crash in Installer Framework when used with Qt 5.6 IFW uses QQmlV4Function in a QJSEngine environment, so there is no QML context. Up to commit cc98678f404cd49750076795f39b31bfa36c80c3 that would work. Let's fall back to the root context as scope if we don't have a qml context. Change-Id: Ib240746a95a0d16d61620f97abc31e4c74f36723 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-02-01 08:33:38 +00:00
class TestObject : public QObject
{
Q_OBJECT
public:
TestObject() : called(false) {}
bool called;
Q_INVOKABLE void callMe(QQmlV4Function *) {
called = true;
}
};
void tst_QJSEngine::v4FunctionWithoutQML()
{
TestObject obj;
QJSEngine engine;
QJSValue wrapper = engine.newQObject(&obj);
QQmlEngine::setObjectOwnership(&obj, QQmlEngine::CppOwnership);
QVERIFY(!obj.called);
wrapper.property("callMe").call();
QVERIFY(obj.called);
}
Fix crash when using with statement with an expression that throws We need to evaluate the expression for the "with" statement that is supposed to define the new scope _before_ opening up the scope, otherwise - when the evaluation of the expression throws an exception - we'll try to pop the "with" scope we couldn't open in the first place. [ChangeLog][QtQml] Fix crash when using the "with" statement with an expression that throws an exception. Task-number: QTBUG-53794 Change-Id: I7733f5a4c5d844916302b9a91c789a0f6b421e8a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-06-02 13:57:41 +00:00
void tst_QJSEngine::withNoContext()
{
// Don't crash (QTBUG-53794)
QJSEngine engine;
engine.evaluate("with (noContext) true");
}
Fix corruption when adding or changing properties of JS objects Commit 833c99db20 introduced this regression by only moving part of the value data to the proper offset. Task-number: QTBUG-53261 Change-Id: I11241c57057a57794bc3ca60ee437206e524f355 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-14 09:21:36 +00:00
void tst_QJSEngine::holeInPropertyData()
{
QJSEngine engine;
QJSValue ok = engine.evaluate(
"var o = {};\n"
"o.bar = 0xcccccccc;\n"
"o.foo = 0x55555555;\n"
"Object.defineProperty(o, 'bar', { get: function() { return 0xffffffff }});\n"
"o.bar === 0xffffffff && o.foo === 0x55555555;");
QVERIFY(ok.isBool());
QVERIFY(ok.toBool());
}
Improved robustness of the optimizer when removing expressions For example during dead code elimination we may invalidate statements, but at the same time there may still be instances left in the work list of optimizeSSA(). When we encounter then, we should not process them any further. Task-number: QTBUG-56255 Change-Id: I4c24b1a225ce1bde112172e9606f91c426c19f19 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-11-22 14:16:09 +00:00
void tst_QJSEngine::malformedExpression()
{
QJSEngine engine;
engine.evaluate("5%55555&&5555555\n7-0");
}
Merge the QJSEngine and QJSValue development branch into master. This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2011-07-29 08:25:44 +00:00
QTEST_MAIN(tst_QJSEngine)
#include "tst_qjsengine.moc"