From 43b2d685fbbefd7eb89e4e84af02bc4a4aea86e0 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 18 Nov 2011 16:41:08 +0100 Subject: ConsoleAPI: Use environment variable Show detailed information, such as file and line number, for console.log, console.debug and print when the environment variable QML_CONSOLE_EXTENDED is set. Change-Id: I8f660f58d0fd08971ce9706b4a418ed60f312980 Reviewed-by: Kai Koehne --- .../qdeclarativeqt/tst_qdeclarativeqt.cpp | 46 +++++++++------------- 1 file changed, 18 insertions(+), 28 deletions(-) (limited to 'tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp') diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index d2feb85200..293fcd382f 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -437,8 +437,7 @@ 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 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); + QString warning6 = "RunTimeError: Qt.createQmlObject(): failed to create object: \n " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3)); @@ -461,33 +460,24 @@ void tst_qdeclarativeqt::createQmlObject() void tst_qdeclarativeqt::consoleLog() { - int startLineNumber = 15; + int startLineNumber = 30; 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 testMix = QString::fromLatin1("1 pong! Object (%1:%2)").arg(testFileUrl.toString()); - QTest::ignoreMessage(QtDebugMsg, qPrintable(testMix.arg(startLineNumber++))); - testMix = QString::fromLatin1("1 [ping,pong] Object 2 (%1:%2)").arg(testFileUrl.toString()); - QTest::ignoreMessage(QtDebugMsg, qPrintable(testMix.arg(startLineNumber++))); + QTest::ignoreMessage(QtDebugMsg, "completed ok"); + QTest::ignoreMessage(QtDebugMsg, "completed ok"); + QTest::ignoreMessage(QtDebugMsg, "completed ok"); + QTest::ignoreMessage(QtWarningMsg, "completed ok"); + QTest::ignoreMessage(QtCriticalMsg, "completed ok"); + + QTest::ignoreMessage(QtDebugMsg, "[1,2]"); + QTest::ignoreMessage(QtDebugMsg, "Object"); + QTest::ignoreMessage(QtDebugMsg, "undefined"); + QTest::ignoreMessage(QtDebugMsg, "12"); + QTest::ignoreMessage(QtDebugMsg, "function () { return 5;}"); + QTest::ignoreMessage(QtDebugMsg, "true"); + QTest::ignoreMessage(QtDebugMsg, "Object"); + QTest::ignoreMessage(QtDebugMsg, "Object"); + QTest::ignoreMessage(QtDebugMsg, "1 pong! Object"); + QTest::ignoreMessage(QtDebugMsg, "1 [ping,pong] Object 2"); QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testFileUrl.toString()); QTest::ignoreMessage(QtWarningMsg, qPrintable(testException.arg(startLineNumber++))); -- cgit v1.2.3