diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 49 |
1 files changed, 44 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index b4ac2dfc66..c550ac2f5b 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -89,6 +89,7 @@ private slots: void atob(); void fontFamilies(); void quit(); + void resolvedUrl(); private: QDeclarativeEngine engine; @@ -436,8 +437,8 @@ void tst_qdeclarativeqt::createQmlObject() QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject(): failed to create object: \n " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name"; QString warning4 = component.url().toString()+ ":9: Error: Qt.createQmlObject(): Missing parent object"; QString warning5 = component.url().toString()+ ":8: Error: Qt.createQmlObject(): Invalid arguments"; - QString warning6 = "RunTimeError: Qt.createQmlObject(): failed to create object: \n " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; - + QString messageFormat = QString(QLatin1String("%1 (%2:%3)")); + QString warning6 = messageFormat.arg("RunTimeError: Qt.createQmlObject(): failed to create object: \n " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method").arg(TEST_FILE("createQmlObject.qml").toString()).arg(23); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3)); @@ -460,9 +461,34 @@ void tst_qdeclarativeqt::createQmlObject() void tst_qdeclarativeqt::consoleLog() { - QTest::ignoreMessage(QtDebugMsg, "completed ok"); - QTest::ignoreMessage(QtDebugMsg, "completed ok"); - QDeclarativeComponent component(&engine, TEST_FILE("consoleLog.qml")); + int startLineNumber = 15; + QUrl testFileUrl = TEST_FILE("consoleLog.qml"); + QString testString = QString(QLatin1String("completed ok (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testString.arg(startLineNumber++))); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testString.arg(startLineNumber++))); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testString.arg(startLineNumber++))); + QTest::ignoreMessage(QtWarningMsg, qPrintable(testString.arg(startLineNumber++))); + QTest::ignoreMessage(QtCriticalMsg, qPrintable(testString.arg(startLineNumber++))); + + QString testArray = QString(QLatin1String("[1,2] (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testArray.arg(startLineNumber++))); + QString testObject = QString(QLatin1String("Object (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testObject.arg(startLineNumber++))); + QString testUndefined = QString(QLatin1String("undefined (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testUndefined.arg(startLineNumber++))); + QString testNumber = QString(QLatin1String("12 (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testNumber.arg(startLineNumber++))); + QString testFunction = QString(QLatin1String("function () { return 5;} (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testFunction.arg(startLineNumber++))); + QString testBoolean = QString(QLatin1String("true (%1:%2)")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testBoolean.arg(startLineNumber++))); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testObject.arg(startLineNumber++))); + QTest::ignoreMessage(QtDebugMsg, qPrintable(testObject.arg(startLineNumber++))); + + QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testFileUrl.toString()); + QTest::ignoreMessage(QtWarningMsg, qPrintable(testException.arg(startLineNumber++))); + + QDeclarativeComponent component(&engine, testFileUrl); QObject *object = component.create(); QVERIFY(object != 0); delete object; @@ -727,6 +753,19 @@ void tst_qdeclarativeqt::quit() delete object; } +void tst_qdeclarativeqt::resolvedUrl() +{ + QDeclarativeComponent component(&engine, TEST_FILE("resolvedUrl.qml")); + + QObject *object = component.create(); + QVERIFY(object != 0); + + QCOMPARE(object->property("result").toString(), component.url().toString()); + QCOMPARE(object->property("isString").toBool(), true); + + delete object; +} + QTEST_MAIN(tst_qdeclarativeqt) #include "tst_qdeclarativeqt.moc" |