FCL/sf/mw/qt: comparison tests/auto/declarative/qdeclarativeecmascript/tst

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 #include <QtCore/qnumeric.h>
 #include <private/qdeclarativeengine_p.h>
 #include <private/qdeclarativeglobalscriptclass_p.h>
 #include "testtypes.h"
 #include "testhttpserver.h"
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
 /*
 This test covers evaluation of ECMAScript expressions and bindings from within
 QML.  This does not include static QML language issues.
 void canAssignNullToQObject();
 void functionAssignment();
 void eval();
 void function();
 void qtbug_10696();
+void qtbug_11606();
+void qtbug_11600();
 void include();
 void callQtInvokables();
 private:
 QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
 QCOMPARE(object->stringProperty(), QString("Hello World!"));
 QCOMPARE(object->uintProperty(), uint(10));
 QCOMPARE(object->intProperty(), -19);
 QCOMPARE((float)object->realProperty(), float(23.2));
-QCOMPARE((float)object->doubleProperty(), float(-19.7));
+QCOMPARE((float)object->doubleProperty(), float(-19.75));
 QCOMPARE((float)object->floatProperty(), float(8.5));
 QCOMPARE(object->colorProperty(), QColor("red"));
 QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
 QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
 QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
 QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
 QCOMPARE(object->stringProperty(), QString("Hello World!"));
 QCOMPARE(object->uintProperty(), uint(10));
 QCOMPARE(object->intProperty(), -19);
 QCOMPARE((float)object->realProperty(), float(23.2));
-QCOMPARE((float)object->doubleProperty(), float(-19.7));
+QCOMPARE((float)object->doubleProperty(), float(-19.75));
 QCOMPARE((float)object->floatProperty(), float(8.5));
 QCOMPARE(object->colorProperty(), QColor("red"));
 QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
 QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
 QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
 {
 QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->string(), QString());
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
-QCOMPARE(object->string(), QString("pass 19 Hello world! 10.3"));
+QCOMPARE(object->string(), QString("pass 19 Hello world! 10.25"));
 }
 }
 void tst_qdeclarativeecmascript::methods()
 {
 {
 QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml"));
 QString url = component.url().toString();
 QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\"";
-QString warning2 = url + ":5: TypeError: Result of expression 'a' [undefined] is not an object.";
+QString warning2 = url + ":5: ReferenceError: Can't find variable: a";
 QString warning3 = url.left(url.length() - 3) + "js:4: Error: Invalid write to global property \"a\"";
-QString warning4 = url + ":10: TypeError: Result of expression 'a' [undefined] is not an object.";
+QString warning4 = url + ":10: ReferenceError: Can't find variable: a";
-QString warning5 = url + ":8: TypeError: Result of expression 'a' [undefined] is not an object.";
+QString warning5 = url + ":8: ReferenceError: Can't find variable: a";
 QString warning6 = url + ":7: Unable to assign [undefined] to int x";
 QString warning7 = url + ":12: Error: Cannot assign to read-only property \"trueProperty\"";
 QString warning8 = url + ":13: Error: Cannot assign to non-existent property \"fakeProperty\"";
 QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
 MyInvokableObject o;
 QDeclarativeEngine qmlengine;
 QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&qmlengine);
 QScriptEngine *engine = &ep->scriptEngine;
-ep->globalClass->explicitSetProperty("object", ep->objectClass->newQObject(&o));
+QStringList names; QList<QScriptValue> values;
+names << QLatin1String("object"); values << ep->objectClass->newQObject(&o);
+names << QLatin1String("undefined"); values << engine->undefinedValue();
+ep->globalClass->explicitSetProperty(names, values);
 // Non-existent methods
 o.reset();
 QCOMPARE(engine->evaluate("object.method_nonexistent()").isError(), true);
 QCOMPARE(o.error(), false);
 QCOMPARE(o.error(), false);
 QCOMPARE(o.invoked(), 1);
 QCOMPARE(o.actuals().count(), 0);
 o.reset();
-QVERIFY(engine->evaluate("object.method_NoArgs_real()").strictlyEquals(QScriptValue(engine, 19.7)));
+QVERIFY(engine->evaluate("object.method_NoArgs_real()").strictlyEquals(QScriptValue(engine, 19.75)));
 QCOMPARE(o.error(), false);
 QCOMPARE(o.invoked(), 2);
 QCOMPARE(o.actuals().count(), 0);
 o.reset();
 QCOMPARE(o.error(), false);
 QCOMPARE(o.invoked(), 17);
 QCOMPARE(o.actuals().count(), 2);
 QCOMPARE(o.actuals().at(0), QVariant(10));
 QCOMPARE(o.actuals().at(1), QVariant(11));
+o.reset();
+QCOMPARE(engine->evaluate("object.method_with_enum(9)").isUndefined(), true);
+QCOMPARE(o.error(), false);
+QCOMPARE(o.invoked(), 18);
+QCOMPARE(o.actuals().count(), 1);
+QCOMPARE(o.actuals().at(0), QVariant(9));
 }
 // QTBUG-5675
 void tst_qdeclarativeecmascript::listToVariant()
 {
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toBool(), false);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toBool(), true);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toBool(), false);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toBool(), true);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toBool(), false);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toBool(), true);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->methodCalled(), false);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->methodCalled(), true);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->methodCalled(), false);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->methodCalled(), true);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toInt(), 0);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 delete object;
 }
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toInt(), 0);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 1);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 emit object->basicSignal();
 QCOMPARE(object->property("test").toInt(), 2);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toInt(), 0);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 1);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 emit object->basicSignal();
 QCOMPARE(object->property("test").toInt(), 2);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 delete object;
 }
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toInt(), 0);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 1);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 emit object->basicSignal();
 QCOMPARE(object->property("test").toInt(), 2);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 3);
 delete object;
 }
 {
 MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
 QVERIFY(object != 0);
 QCOMPARE(object->property("test").toInt(), 0);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 1);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 2);
 emit object->basicSignal();
 QCOMPARE(object->property("test").toInt(), 2);
-emit object->argumentSignal(19, "Hello world!", 10.3);
+emit object->argumentSignal(19, "Hello world!", 10.25);
 QCOMPARE(object->property("test").toInt(), 3);
 delete object;
 }
 }
 QObject *o = component.create();
 QVERIFY(o != 0);
 delete o;
 }
+void tst_qdeclarativeecmascript::qtbug_11606()
+{
+QDeclarativeComponent component(&engine, TEST_FILE("qtbug_11606.qml"));
+QObject *o = component.create();
+QVERIFY(o != 0);
+QCOMPARE(o->property("test").toBool(), true);
+delete o;
+}
+void tst_qdeclarativeecmascript::qtbug_11600()
+{
+QDeclarativeComponent component(&engine, TEST_FILE("qtbug_11600.qml"));
+QObject *o = component.create();
+QVERIFY(o != 0);
+QCOMPARE(o->property("test").toBool(), true);
+delete o;
+}
 QTEST_MAIN(tst_qdeclarativeecmascript)
 #include "tst_qdeclarativeecmascript.moc"

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613