FCL/sf/mw/qt: comparison tests/auto/qscriptvalue/tst

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include "tst_qscriptvalue.h"
-#include <QtTest/QtTest>
 #include <QtGui/QPushButton>
-#include <QtCore/qnumeric.h>
-#include <QtScript/qscriptclass.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptengine.h>
 //TESTED_CLASS=
 //TESTED_FILES=
 QT_BEGIN_NAMESPACE
 extern bool qt_script_isJITEnabled();
 QT_END_NAMESPACE
-class tst_QScriptValue : public QObject
-{
-Q_OBJECT
-public:
-tst_QScriptValue();
-virtual ~tst_QScriptValue();
-private slots:
-void ctor();
-void engine();
-void toString();
-void toNumber();
-void toBoolean();
-void toBool();
-void toInteger();
-void toInt32();
-void toUInt32();
-void toUInt16();
-void toVariant();
-void toQObject();
-void toObject();
-void toDateTime();
-void toRegExp();
-void instanceOf();
-void isArray();
-void isDate();
-void isError();
-void isRegExp();
-void getSetPrototype();
-void getSetScope();
-void getSetProperty();
-void arrayElementGetterSetter();
-void getSetData();
-void getSetScriptClass();
-void call();
-void construct();
-void lessThan();
-void equals();
-void strictlyEquals();
-void castToPointer();
-void prettyPrinter_data();
-void prettyPrinter();
-void engineDeleted();
-void valueOfWithClosure();
-void objectId();
-};
 tst_QScriptValue::tst_QScriptValue()
+: engine(0)
 {
 }
 tst_QScriptValue::~tst_QScriptValue()
 {
-}
+delete engine;
+}
+void tst_QScriptValue::dataHelper(InitDataFunction init, DefineDataFunction define)
+{
+QTest::addColumn<QString>("__expression__");
+(this->*init)();
+QHash<QString,QScriptValue>::const_iterator it;
+for (it = m_values.constBegin(); it != m_values.constEnd(); ++it) {
+m_currentExpression = it.key();
+(this->*define)(it.key().toLatin1());
+}
+m_currentExpression = QString();
+}
+QTestData &tst_QScriptValue::newRow(const char *tag)
+{
+return QTest::newRow(tag) << m_currentExpression;
+}
+void tst_QScriptValue::testHelper(TestFunction fun)
+{
+QFETCH(QString, __expression__);
+QScriptValue value = m_values.value(__expression__);
+(this->*fun)(__expression__.toLatin1(), value);
+}
+void tst_QScriptValue::assignAndCopyConstruct_initData()
+{
+QTest::addColumn<int>("dummy");
+initScriptValues();
+}
+void tst_QScriptValue::assignAndCopyConstruct_makeData(const char *expr)
+{
+newRow(expr) << 0;
+}
+void tst_QScriptValue::assignAndCopyConstruct_test(const char *, const QScriptValue &value)
+{
+QScriptValue copy(value);
+QCOMPARE(copy.strictlyEquals(value), !value.isNumber() || !qIsNaN(value.toNumber()));
+QCOMPARE(copy.engine(), value.engine());
+QScriptValue assigned = copy;
+QCOMPARE(assigned.strictlyEquals(value), !copy.isNumber() || !qIsNaN(copy.toNumber()));
+QCOMPARE(assigned.engine(), assigned.engine());
+QScriptValue other(!value.toBool());
+assigned = other;
+QVERIFY(!assigned.strictlyEquals(copy));
+QVERIFY(assigned.strictlyEquals(other));
+QCOMPARE(assigned.engine(), other.engine());
+}
+DEFINE_TEST_FUNCTION(assignAndCopyConstruct)
 void tst_QScriptValue::ctor()
 {
 QScriptEngine eng;
 {
 QVERIFY(QScriptValue(0, 1.0).isNumber());
 QVERIFY(QScriptValue(0, "ciao").isString());
 QVERIFY(QScriptValue(0, QString("ciao")).isString());
 }
-void tst_QScriptValue::engine()
-{
-QScriptEngine eng;
-QScriptValue object = eng.newObject();
-QCOMPARE(object.engine(), &eng);
-}
 static QScriptValue myFunction(QScriptContext *, QScriptEngine *eng)
 {
 return eng->undefinedValue();
 }
-void tst_QScriptValue::toString()
+void tst_QScriptValue::toString_old()
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(undefined.toString(), QString("undefined"));
 QCOMPARE(variant.toString(), QString::fromLatin1("QVariant(QPoint)"));
 variant = eng.newVariant(QUrl());
 QVERIFY(variant.toString().isEmpty());
 }
-void tst_QScriptValue::toNumber()
+void tst_QScriptValue::toNumber_old()
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(qIsNaN(undefined.toNumber()), true);
 QCOMPARE(str2.toNumber(), 123.0);
 QCOMPARE(qscriptvalue_cast<qsreal>(str2), 123.0);
 }
 }
-void tst_QScriptValue::toBoolean() // deprecated
+void tst_QScriptValue::toBoolean_old() // deprecated
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(undefined.toBoolean(), false);
 QCOMPARE(str2.toBoolean(), true);
 QCOMPARE(qscriptvalue_cast<bool>(str2), true);
 }
 }
-void tst_QScriptValue::toBool()
+void tst_QScriptValue::toBool_old()
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(undefined.toBool(), false);
 QCOMPARE(str2.toBool(), true);
 QCOMPARE(qscriptvalue_cast<bool>(str2), true);
 }
 }
-void tst_QScriptValue::toInteger()
+void tst_QScriptValue::toInteger_old()
 {
 QScriptEngine eng;
 {
 QScriptValue number = QScriptValue(&eng, 123.0);
 QScriptValue inv;
 QCOMPARE(inv.toInteger(), 0.0);
 }
-void tst_QScriptValue::toInt32()
+void tst_QScriptValue::toInt32_old()
 {
 QScriptEngine eng;
 {
 QScriptValue zer0 = QScriptValue(&eng, 0.0);
 QScriptValue inv;
 QCOMPARE(inv.toInt32(), 0);
 QCOMPARE(qscriptvalue_cast<qint32>(inv), 0);
 }
-void tst_QScriptValue::toUInt32()
+void tst_QScriptValue::toUInt32_old()
 {
 QScriptEngine eng;
 {
 QScriptValue zer0 = QScriptValue(&eng, 0.0);
 QScriptValue inv;
 QCOMPARE(inv.toUInt32(), quint32(0));
 QCOMPARE(qscriptvalue_cast<quint32>(inv), quint32(0));
 }
-void tst_QScriptValue::toUInt16()
+void tst_QScriptValue::toUInt16_old()
 {
 QScriptEngine eng;
 {
 QScriptValue zer0 = QScriptValue(&eng, 0.0);
 #if defined Q_CC_MSVC && _MSC_VER < 1300
 Q_DECLARE_METATYPE(QVariant)
 #endif
-void tst_QScriptValue::toVariant()
+void tst_QScriptValue::toVariant_old()
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(undefined.toVariant(), QVariant());
 }
 // unfortunately, this is necessary in order to do qscriptvalue_cast<QPushButton*>(...)
 Q_DECLARE_METATYPE(QPushButton*)
-void tst_QScriptValue::toQObject()
+void tst_QScriptValue::toQObject_old()
 {
 QScriptEngine eng;
 QScriptValue undefined = eng.undefinedValue();
 QCOMPARE(undefined.toQObject(), (QObject *)0);
 QCOMPARE(tmp.toString(), QString::fromLatin1("ciao"));
 }
 }
 }
-void tst_QScriptValue::toDateTime()
+void tst_QScriptValue::toDateTime_old()
 {
 QScriptEngine eng;
 QDateTime dt = eng.evaluate("new Date(0)").toDateTime();
 QVERIFY(dt.isValid());
 QCOMPARE(dt.timeSpec(), Qt::LocalTime);
 QVERIFY(!QScriptValue(false).toDateTime().isValid());
 QVERIFY(!eng.nullValue().toDateTime().isValid());
 QVERIFY(!eng.undefinedValue().toDateTime().isValid());
 }
-void tst_QScriptValue::toRegExp()
+void tst_QScriptValue::toRegExp_old()
 {
 QScriptEngine eng;
 {
 QRegExp rx = eng.evaluate("/foo/").toRegExp();
 QVERIFY(rx.isValid());
 QVERIFY(QScriptValue(false).toRegExp().isEmpty());
 QVERIFY(eng.nullValue().toRegExp().isEmpty());
 QVERIFY(eng.undefinedValue().toRegExp().isEmpty());
 }
-void tst_QScriptValue::instanceOf()
+void tst_QScriptValue::instanceOf_old()
 {
 QScriptEngine eng;
 QScriptValue obj = eng.newObject();
 QCOMPARE(obj.instanceOf(eng.evaluate("Object.prototype")), false);
 QCOMPARE(obj.instanceOf(eng.evaluate("Array.prototype")), false);
 QScriptEngine otherEngine;
 QTest::ignoreMessage(QtWarningMsg, "QScriptValue::instanceof: cannot perform operation on a value created in a different engine");
 QCOMPARE(obj.instanceOf(otherEngine.globalObject().property("Object")), false);
 }
-void tst_QScriptValue::isArray()
+void tst_QScriptValue::isArray_old()
 {
 QScriptEngine eng;
 QVERIFY(eng.evaluate("[]").isArray());
 QVERIFY(!eng.evaluate("{}").isArray());
 QVERIFY(!eng.globalObject().isArray());
 QVERIFY(!QScriptValue(false).isArray());
 QVERIFY(!eng.nullValue().isArray());
 QVERIFY(!eng.undefinedValue().isArray());
 }
-void tst_QScriptValue::isDate()
+void tst_QScriptValue::isDate_old()
 {
 QScriptEngine eng;
 QVERIFY(eng.evaluate("new Date()").isDate());
 QVERIFY(!eng.evaluate("[]").isDate());
 QVERIFY(!eng.evaluate("{}").isDate());
 QVERIFY(!QScriptValue(false).isDate());
 QVERIFY(!eng.nullValue().isDate());
 QVERIFY(!eng.undefinedValue().isDate());
 }
-void tst_QScriptValue::isError()
+void tst_QScriptValue::isError_old()
 {
 QStringList errors;
 errors << "Error"
 << "EvalError"
 << "RangeError"
 QVERIFY(!eng.nullValue().isError());
 QVERIFY(!eng.undefinedValue().isError());
 QVERIFY(!eng.evaluate("new Object()").isError());
 }
-void tst_QScriptValue::isRegExp()
+void tst_QScriptValue::isRegExp_old()
 {
 QScriptEngine eng;
 QVERIFY(eng.evaluate("/foo/").isRegExp());
 QVERIFY(!eng.evaluate("[]").isRegExp());
 QVERIFY(!eng.evaluate("{}").isRegExp());
 QCOMPARE(ret4.property("length").isNumber(), true);
 QCOMPARE(ret4.property("length").toNumber(), 0.0);
 // call with something else as arguments
 QScriptValue ret5 = fun.call(QScriptValue(), QScriptValue(&eng, 123.0));
 QCOMPARE(ret5.isError(), true);
+// call with a non-array object as arguments
+QScriptValue ret6 = fun.call(QScriptValue(), eng.globalObject());
+QVERIFY(ret6.isError());
+QCOMPARE(ret6.toString(), QString::fromLatin1("TypeError: Arguments must be an array"));
 }
 // calling things that are not functions
 QVERIFY(!QScriptValue(false).call().isValid());
 QVERIFY(!QScriptValue(123).call().isValid());
 QCOMPARE(ret4.property("length").isNumber(), true);
 QCOMPARE(ret4.property("length").toNumber(), 0.0);
 // construct with something else as arguments
 QScriptValue ret5 = fun.construct(QScriptValue(&eng, 123.0));
 QCOMPARE(ret5.isError(), true);
+// construct with a non-array object as arguments
+QScriptValue ret6 = fun.construct(eng.globalObject());
+QVERIFY(ret6.isError());
+QCOMPARE(ret6.toString(), QString::fromLatin1("TypeError: Arguments must be an array"));
 }
 // construct on things that are not functions
 QVERIFY(!QScriptValue(false).construct().isValid());
 QVERIFY(!QScriptValue(123).construct().isValid());
 QVERIFY(!QScriptValue(QString::fromLatin1("ciao")).construct().isValid());
 QVERIFY(!QScriptValue(QScriptValue::UndefinedValue).construct().isValid());
 QVERIFY(!QScriptValue(QScriptValue::NullValue).construct().isValid());
 }
-void tst_QScriptValue::lessThan()
+void tst_QScriptValue::lessThan_old()
 {
 QScriptEngine eng;
 QVERIFY(!QScriptValue().lessThan(QScriptValue()));
 "cannot compare to a value created in "
 "a different engine");
 QCOMPARE(date1.lessThan(QScriptValue(&otherEngine, 123)), false);
 }
-void tst_QScriptValue::equals()
+void tst_QScriptValue::equals_old()
 {
 QScriptEngine eng;
 QVERIFY(QScriptValue().equals(QScriptValue()));
 QCOMPARE(obj2.equals(obj2), true);
 QScriptValue qobj1 = eng.newQObject(this);
 QScriptValue qobj2 = eng.newQObject(this);
 QScriptValue qobj3 = eng.newQObject(0);
-QScriptValue qobj4 = eng.newQObject(new QObject());
+QScriptValue qobj4 = eng.newQObject(new QObject(), QScriptEngine::ScriptOwnership);
 QVERIFY(qobj1.equals(qobj2)); // compares the QObject pointers
 QVERIFY(!qobj2.equals(qobj4)); // compares the QObject pointers
 QVERIFY(!qobj2.equals(obj2)); // compares the QObject pointers
 QScriptValue compareFun = eng.evaluate("(function(a, b) { return a == b; })");
 "cannot compare to a value created in "
 "a different engine");
 QCOMPARE(date1.equals(QScriptValue(&otherEngine, 123)), false);
 }
-void tst_QScriptValue::strictlyEquals()
+void tst_QScriptValue::strictlyEquals_old()
 {
 QScriptEngine eng;
 QVERIFY(QScriptValue().strictlyEquals(QScriptValue()));
 QVERIFY(!falskt.toObject().strictlyEquals(falskt));
 QVERIFY(!falskt.strictlyEquals(sant));
 QVERIFY(!falskt.strictlyEquals(undefined));
 QVERIFY(!falskt.strictlyEquals(null));
 QVERIFY(!falskt.strictlyEquals(QScriptValue()));
+QVERIFY(!QScriptValue(false).strictlyEquals(123));
+QVERIFY(!QScriptValue(QScriptValue::UndefinedValue).strictlyEquals(123));
+QVERIFY(!QScriptValue(QScriptValue::NullValue).strictlyEquals(123));
+QVERIFY(!QScriptValue(false).strictlyEquals("ciao"));
+QVERIFY(!QScriptValue(QScriptValue::UndefinedValue).strictlyEquals("ciao"));
+QVERIFY(!QScriptValue(QScriptValue::NullValue).strictlyEquals("ciao"));
+QVERIFY(QScriptValue(&eng, "ciao").strictlyEquals("ciao"));
+QVERIFY(QScriptValue("ciao").strictlyEquals(QScriptValue(&eng, "ciao")));
+QVERIFY(!QScriptValue("ciao").strictlyEquals(123));
+QVERIFY(!QScriptValue("ciao").strictlyEquals(QScriptValue(&eng, 123)));
+QVERIFY(!QScriptValue(123).strictlyEquals("ciao"));
+QVERIFY(!QScriptValue(123).strictlyEquals(QScriptValue(&eng, "ciao")));
+QVERIFY(!QScriptValue(&eng, 123).strictlyEquals("ciao"));
 QScriptValue obj1 = eng.newObject();
 QScriptValue obj2 = eng.newObject();
 QCOMPARE(obj1.strictlyEquals(obj2), false);
 QCOMPARE(obj2.strictlyEquals(obj1), false);
 QVERIFY(obj.isObject());
 QVERIFY(obj.strictlyEquals(eng.globalObject()));
 }
 QTEST_MAIN(tst_QScriptValue)
-#include "tst_qscriptvalue.moc"

changeset 7	f7bc934e204c
parent 0	1918ee327afb