From 43b2d685fbbefd7eb89e4e84af02bc4a4aea86e0 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 18 Nov 2011 16:41:08 +0100 Subject: [PATCH] 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 --- .../qml/v8/qdeclarativebuiltinfunctions.cpp | 34 ++++--- tests/auto/declarative/declarative.pro | 1 + .../tst_qdeclarativeanimations.cpp | 8 +- .../qdeclarativeconsole/data/consoleLog.qml | 32 ++++++ .../qdeclarativeconsole/qdeclarativeconsole.pro | 12 ++ .../tst_qdeclarativeconsole.cpp | 112 ++++++++++++++++++++ .../tst_qdeclarativeecmascript.cpp | 7 +- .../tst_qdeclarativelanguage.cpp | 17 ++-- .../qdeclarativeqt/tst_qdeclarativeqt.cpp | 46 +++----- .../qdeclarativestates/tst_qdeclarativestates.cpp | 7 +- .../tst_qdeclarativevaluetypes.cpp | 5 +- 11 files changed, 212 insertions(+), 69 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml create mode 100644 tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro create mode 100644 tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp diff --git a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp index a822eb8..8613ae4 100644 --- a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp +++ b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp @@ -65,6 +65,9 @@ QT_BEGIN_NAMESPACE +// send more information such as file, line etc for console APIs +DEFINE_BOOL_CONFIG_OPTION(qmlConsoleExtended, QML_CONSOLE_EXTENDED) + namespace QDeclarativeBuiltinFunctions { enum ConsoleLogTypes { @@ -75,19 +78,8 @@ enum ConsoleLogTypes { v8::Handle console(ConsoleLogTypes logType, const v8::Arguments &args) { - int line = -1; - QString scriptName; v8::HandleScope handleScope; - { - v8::Local stackTrace = v8::StackTrace::CurrentStackTrace(1); - if (stackTrace->GetFrameCount()) { - v8::Local currentStackFrame = stackTrace->GetFrame(0); - line = currentStackFrame->GetLineNumber(); - scriptName = V8ENGINE()->toString(currentStackFrame->GetScriptName()); - } - } - QString result; for (int i = 0; i < args.Length(); ++i) { if (i != 0) @@ -109,17 +101,29 @@ v8::Handle console(ConsoleLogTypes logType, const v8::Arguments &args } } - QString log = QString(QLatin1String("%1 (%2:%3)")).arg(result).arg(scriptName).arg(line); + if (qmlConsoleExtended()) { + int line = -1; + QString scriptName; + //get only current frame + v8::Local stackTrace = v8::StackTrace::CurrentStackTrace(1); + if (stackTrace->GetFrameCount()) { + v8::Local currentStackFrame = stackTrace->GetFrame(0); + line = currentStackFrame->GetLineNumber(); + scriptName = V8ENGINE()->toString(currentStackFrame->GetScriptName()); + } + + result = QString(QLatin1String("%1 (%2:%3)")).arg(result).arg(scriptName).arg(line); + } switch (logType) { case Log: - qDebug("%s", qPrintable(log)); + qDebug("%s", qPrintable(result)); break; case Warn: - qWarning("%s", qPrintable(log)); + qWarning("%s", qPrintable(result)); break; case Error: - qCritical("%s", qPrintable(log)); + qCritical("%s", qPrintable(result)); break; default: break; diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 0d19af9..54c3563 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -11,6 +11,7 @@ PUBLICTESTS += \ parserstress \ qdeclarativecomponent \ qdeclarativecontext \ + qdeclarativeconsole \ qdeclarativeengine \ qdeclarativeerror \ qdeclarativefolderlistmodel \ diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 34b8e10..515c8fa 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -806,11 +806,9 @@ void tst_qdeclarativeanimations::attached() { QDeclarativeEngine engine; - QUrl url(QUrl::fromLocalFile(TESTDATA("attached.qml"))); - QDeclarativeComponent c(&engine, url); - QString messageFormat = QString(QLatin1String("%1 (%2:%3)")); - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("off")).arg(url.toString()).arg(24).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("on")).arg(url.toString()).arg(20).toLatin1()); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("attached.qml"))); + QTest::ignoreMessage(QtDebugMsg, "off"); + QTest::ignoreMessage(QtDebugMsg, "on"); QQuickRectangle *rect = qobject_cast(c.create()); QVERIFY(rect); } diff --git a/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml b/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml new file mode 100644 index 0000000..2692abb --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconsole/data/consoleLog.qml @@ -0,0 +1,32 @@ +import QtQuick 2.0 + +QtObject { + id: root + Component.onCompleted: { + var a = [1, 2] + var b = {a: "hello", d: 1 } + var c + var d = 12 + var e = function() { return 5;} + var f = true + var g = {toString: function() { throw new Error('toString'); }} + + + console.log("completed", "ok") + console.log("completed ok") + console.debug("completed ok") + console.warn("completed ok") + console.error("completed ok") + console.log(a) + console.log(b) + console.log(c) + console.log(d) + console.log(e) + console.log(f) + console.log(root) + console.log(g) + console.log(1, "pong!", new Object) + console.log(1, ["ping","pong"], new Object, 2) + console.log(exception) //This has to be at the end + } +} diff --git a/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro new file mode 100644 index 0000000..ed344d5 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro @@ -0,0 +1,12 @@ +CONFIG += testcase +TARGET = tst_qdeclarativeconsole +SOURCES += tst_qdeclarativeconsole.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += declarative testlib diff --git a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp new file mode 100644 index 0000000..24095e3 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2011 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_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include +#include +#include +#include +#include "../shared/util.h" + +class tst_qdeclarativeconsole : public QObject +{ + Q_OBJECT +public: + tst_qdeclarativeconsole() {} + +private slots: + void init(); + void consoleLogExtended(); + +private: + QDeclarativeEngine engine; +}; + +inline QUrl TEST_FILE(const QString &filename) +{ + return QUrl::fromLocalFile(TESTDATA(filename)); +} + +void tst_qdeclarativeconsole::init() +{ + qputenv("QML_CONSOLE_EXTENDED", QByteArray("1")); +} + +void tst_qdeclarativeconsole::consoleLogExtended() +{ + 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 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++))); + + 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; +} + +QTEST_MAIN(tst_qdeclarativeconsole) + +#include "tst_qdeclarativeconsole.moc" diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 1e0f1a8..426f966 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -1595,8 +1595,8 @@ void tst_qdeclarativeecmascript::shutdownErrors() void tst_qdeclarativeecmascript::compositePropertyType() { QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml")); - QString messageFormat = QString(QLatin1String("hello world (%1:%2)")).arg(TEST_FILE("compositePropertyType.qml").toString()).arg(7); - QTest::ignoreMessage(QtDebugMsg, qPrintable(messageFormat)); + + QTest::ignoreMessage(QtDebugMsg, "hello world"); QObject *object = qobject_cast(component.create()); delete object; } @@ -4392,8 +4392,7 @@ void tst_qdeclarativeecmascript::qtbug_9792() MyQmlObject *object = qobject_cast(component.create(context)); QVERIFY(object != 0); - QString message = QString(QLatin1String("Hello world! (%1:%2)")).arg(TEST_FILE("qtbug_9792.qml").toString()).arg(4); - QTest::ignoreMessage(QtDebugMsg, qPrintable(message)); + QTest::ignoreMessage(QtDebugMsg, "Hello world!"); object->basicSignal(); delete context; diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index a3fb5f0..34b3960 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -850,8 +850,7 @@ void tst_qdeclarativelanguage::dynamicObjectProperties() // Tests the declaration of dynamic signals and slots void tst_qdeclarativelanguage::dynamicSignalsAndSlots() { - QString message = QString(QLatin1String("1921 (%1:%2)")).arg(TEST_FILE("dynamicSignalsAndSlots.qml").toString()).arg(9); - QTest::ignoreMessage(QtDebugMsg, qPrintable(message)); + QTest::ignoreMessage(QtDebugMsg, "1921"); QDeclarativeComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml")); VERIFY_ERRORS(0); @@ -1289,10 +1288,9 @@ void tst_qdeclarativelanguage::onCompleted() { QDeclarativeComponent component(&engine, TEST_FILE("onCompleted.qml")); VERIFY_ERRORS(0); - QString formatMessage = QString(QLatin1String("%1 (%2:%3)")); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Completed 6 10")).arg(TEST_FILE("onCompleted.qml").toString()).arg(8).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Completed 6 10")).arg(TEST_FILE("onCompleted.qml").toString()).arg(14).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Completed 10 11")).arg(TEST_FILE("OnCompletedType.qml").toString()).arg(7).toLatin1()); + QTest::ignoreMessage(QtDebugMsg, "Completed 6 10"); + QTest::ignoreMessage(QtDebugMsg, "Completed 6 10"); + QTest::ignoreMessage(QtDebugMsg, "Completed 10 11"); QObject *object = component.create(); QVERIFY(object != 0); } @@ -1304,10 +1302,9 @@ void tst_qdeclarativelanguage::onDestruction() VERIFY_ERRORS(0); QObject *object = component.create(); QVERIFY(object != 0); - QString formatMessage = QString(QLatin1String("%1 (%2:%3)")); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Destruction 6 10")).arg(TEST_FILE("onDestruction.qml").toString()).arg(8).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Destruction 6 10")).arg(TEST_FILE("onDestruction.qml").toString()).arg(14).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, formatMessage.arg(QLatin1String("Destruction 10 11")).arg(TEST_FILE("OnDestructionType.qml").toString()).arg(7).toLatin1()); + QTest::ignoreMessage(QtDebugMsg, "Destruction 6 10"); + QTest::ignoreMessage(QtDebugMsg, "Destruction 6 10"); + QTest::ignoreMessage(QtDebugMsg, "Destruction 10 11"); delete object; } diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index d2feb85..293fcd3 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++))); diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index efac99c..c6a1e0a 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -74,7 +74,7 @@ public: MyRect() {} void doSomething() { emit didSomething(); } - + int propertyWithNotify() const { return m_prop; } void setPropertyWithNotify(int i) { m_prop = i; emit oddlyNamedNotifySignal(); } @@ -1229,9 +1229,8 @@ void tst_qdeclarativestates::tempState() QQuickRectangle *rect = qobject_cast(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); - QString messageFormat = QString(QLatin1String("%1 (file://%2:%3)")); - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("entering placed")).arg(TESTDATA("legalTempState.qml")).arg(11).toLatin1()); - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("entering idle")).arg(TESTDATA("legalTempState.qml")).arg(15).toLatin1()); + QTest::ignoreMessage(QtDebugMsg, "entering placed"); + QTest::ignoreMessage(QtDebugMsg, "entering idle"); rectPrivate->setState("placed"); QCOMPARE(rectPrivate->state(), QLatin1String("idle")); } diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index b9a249f..db0e05b 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -1059,9 +1059,8 @@ void tst_qdeclarativevaluetypes::bindingConflict() // doesn't crash void tst_qdeclarativevaluetypes::deletedObject() { - QString messageFormat = QString(QLatin1String("%1 (%2:%3)")); QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml")); - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("Test: 2")).arg(TEST_FILE("deletedObject.js").toString()).arg(6).toLatin1()); + QTest::ignoreMessage(QtDebugMsg, "Test: 2"); MyTypeObject *object = qobject_cast(component.create()); QVERIFY(object != 0); @@ -1069,7 +1068,7 @@ void tst_qdeclarativevaluetypes::deletedObject() QVERIFY(dObject != 0); delete dObject; - QTest::ignoreMessage(QtDebugMsg, messageFormat.arg(QLatin1String("Test: undefined")).arg(TEST_FILE("deletedObject.js").toString()).arg(11).toLatin1()); + QTest::ignoreMessage(QtDebugMsg, "Test: undefined"); object->emitRunScript(); delete object; -- 1.7.2.5