diff options
122 files changed, 1900 insertions, 1917 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro index 8f61aae8c6..f51b1f3b35 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro @@ -3,10 +3,11 @@ TARGET = tst_qdeclarativedebugjs QT += declarative-private testlib macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h - +HEADERS += ../shared/debugutil_p.h \ + ../../../shared/util.h SOURCES += tst_qdeclarativedebugjs.cpp \ - ../shared/debugutil.cpp + ../shared/debugutil.cpp \ + ../../../shared/util.cpp INCLUDEPATH += ../shared diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 0f9da032e8..4b6e863df9 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -159,7 +159,7 @@ do {\ class QJSDebugClient; -class tst_QDeclarativeDebugJS : public QObject +class tst_QDeclarativeDebugJS : public QDeclarativeDataTest { Q_OBJECT @@ -982,6 +982,7 @@ QByteArray QJSDebugClient::packMessage(const QByteArray &type, const QByteArray void tst_QDeclarativeDebugJS::initTestCase() { + QDeclarativeDataTest::initTestCase(); t.start(); process = 0; client = 0; @@ -1014,9 +1015,9 @@ bool tst_QDeclarativeDebugJS::init(const QString &qmlFile, bool blockMode) systemEnvironment << "QML_DISABLE_OPTIMIZER=1"; process->setEnvironment(systemEnvironment); if (blockMode) - process->start(QStringList() << QLatin1String(BLOCKMODE) << TESTDATA(qmlFile)); + process->start(QStringList() << QLatin1String(BLOCKMODE) << testFile(qmlFile)); else - process->start(QStringList() << QLatin1String(NORMALMODE) << TESTDATA(qmlFile)); + process->start(QStringList() << QLatin1String(NORMALMODE) << testFile(qmlFile)); if (!process->waitForSessionStart()) { return false; diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro index fca909b261..112c8f015f 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro @@ -2,10 +2,12 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugtrace macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h +HEADERS += ../shared/debugutil_p.h \ + ../../../shared/util.h SOURCES += tst_qdeclarativedebugtrace.cpp \ - ../shared/debugutil.cpp + ../shared/debugutil.cpp \ + ../../../shared/util.cpp OTHER_FILES += data/test.qml diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp index 0a23a5b4a4..528d84ca98 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp @@ -75,7 +75,7 @@ protected: void messageReceived(const QByteArray &message); }; -class tst_QDeclarativeDebugTrace : public QObject +class tst_QDeclarativeDebugTrace : public QDeclarativeDataTest { Q_OBJECT @@ -190,7 +190,7 @@ void tst_QDeclarativeDebugTrace::connect(bool block) else arguments << QString("-qmljsdebugger=port:"STR_PORT); - arguments << QString(TESTDATA(QLatin1String("test.qml"))); + arguments << testFile("test.qml"); m_process = new QDeclarativeDebugProcess(executable); m_process->start(QStringList() << arguments); diff --git a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro index 12c8394645..6ef72350e9 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro +++ b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro @@ -2,10 +2,12 @@ CONFIG += testcase TARGET = tst_qv8profilerservice macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h +HEADERS += ../shared/debugutil_p.h \ + ../../../shared/util.h SOURCES += tst_qv8profilerservice.cpp \ - ../shared/debugutil.cpp + ../shared/debugutil.cpp \ + ../../../shared/util.cpp OTHER_FILES += data/test.qml diff --git a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp index 46c587da83..2ddff64049 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp +++ b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp @@ -98,7 +98,7 @@ protected: void messageReceived(const QByteArray &message); }; -class tst_QV8ProfilerService : public QObject +class tst_QV8ProfilerService : public QDeclarativeDataTest { Q_OBJECT @@ -174,7 +174,7 @@ void tst_QV8ProfilerService::connect(bool block) else arguments << QString("-qmljsdebugger=port:"STR_PORT); - arguments << QString(TESTDATA(QLatin1String("test.qml"))); + arguments << QDeclarativeDataTest::instance()->testFile("test.qml"); m_process = new QDeclarativeDebugProcess(executable); m_process->start(QStringList() << arguments); diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 5f8ee634f4..83163cdcff 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativebinding macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativebinding.cpp +SOURCES += tst_qdeclarativebinding.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 80ed10cd25..b1bdcacf06 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -45,7 +45,7 @@ #include <QtQuick/private/qquickrectangle_p.h> #include "../../shared/util.h" -class tst_qdeclarativebinding : public QObject +class tst_qdeclarativebinding : public QDeclarativeDataTest { Q_OBJECT public: @@ -69,7 +69,7 @@ tst_qdeclarativebinding::tst_qdeclarativebinding() void tst_qdeclarativebinding::binding() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-binding.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-binding.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -97,7 +97,7 @@ void tst_qdeclarativebinding::binding() void tst_qdeclarativebinding::whenAfterValue() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-binding2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-binding2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -113,7 +113,7 @@ void tst_qdeclarativebinding::whenAfterValue() void tst_qdeclarativebinding::restoreBinding() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("restoreBinding.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("restoreBinding.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -143,7 +143,7 @@ void tst_qdeclarativebinding::restoreBinding() void tst_qdeclarativebinding::restoreBindingWithLoop() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("restoreBindingWithLoop.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("restoreBindingWithLoop.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -180,7 +180,7 @@ void tst_qdeclarativebinding::restoreBindingWithLoop() void tst_qdeclarativebinding::deletedObject() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("deletedObject.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("deletedObject.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 155d615721..d04ef75f30 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativecomponent macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativecomponent.cpp +SOURCES += tst_qdeclarativecomponent.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index da15458d27..00c874beef 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -59,7 +59,7 @@ protected: } }; -class tst_qdeclarativecomponent : public QObject +class tst_qdeclarativecomponent : public QDeclarativeDataTest { Q_OBJECT public: @@ -107,7 +107,7 @@ void tst_qdeclarativecomponent::loadEmptyUrl() void tst_qdeclarativecomponent::qmlIncubateObject() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("incubateObject.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("incubateObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test1").toBool(), true); @@ -121,7 +121,7 @@ void tst_qdeclarativecomponent::qmlIncubateObject() void tst_qdeclarativecomponent::qmlCreateObject() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("createObject.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("createObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -138,7 +138,7 @@ void tst_qdeclarativecomponent::qmlCreateObject() void tst_qdeclarativecomponent::qmlCreateObjectWithProperties() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("createObjectWithScript.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("createObjectWithScript.qml")); QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8()); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index 702f3fc542..6e48be9937 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeconnection macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeconnection.cpp +SOURCES += tst_qdeclarativeconnection.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index cd8f7b7b0c..5971649da0 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -46,7 +46,7 @@ #include "../../shared/util.h" #include <QtDeclarative/qdeclarativescriptstring.h> -class tst_qdeclarativeconnection : public QObject +class tst_qdeclarativeconnection : public QDeclarativeDataTest { Q_OBJECT public: @@ -75,7 +75,7 @@ tst_qdeclarativeconnection::tst_qdeclarativeconnection() void tst_qdeclarativeconnection::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection3.qml")); QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create()); QVERIFY(item != 0); @@ -87,7 +87,7 @@ void tst_qdeclarativeconnection::defaultValues() void tst_qdeclarativeconnection::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection2.qml")); QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create()); QVERIFY(item != 0); @@ -101,7 +101,7 @@ void tst_qdeclarativeconnection::properties() void tst_qdeclarativeconnection::connection() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -118,7 +118,7 @@ void tst_qdeclarativeconnection::connection() void tst_qdeclarativeconnection::trimming() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("trimming.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("trimming.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -139,7 +139,7 @@ void tst_qdeclarativeconnection::trimming() void tst_qdeclarativeconnection::targetChanged() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("connection-targetchange.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("connection-targetchange.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -176,7 +176,7 @@ void tst_qdeclarativeconnection::unknownSignals() QFETCH(QString, file); QFETCH(QString, error); - QUrl url = QUrl::fromLocalFile(TESTDATA(file)); + QUrl url = testFileUrl(file); if (!error.isEmpty()) { QTest::ignoreMessage(QtWarningMsg, (url.toString() + error).toLatin1()); } else { @@ -214,7 +214,7 @@ void tst_qdeclarativeconnection::errors() QFETCH(QString, file); QFETCH(QString, error); - QUrl url = QUrl::fromLocalFile(TESTDATA(file)); + QUrl url = testFileUrl(file); QDeclarativeEngine engine; QDeclarativeComponent c(&engine, url); @@ -264,7 +264,7 @@ static QObject *module_api_factory(QDeclarativeEngine *engine, QJSEngine *script void tst_qdeclarativeconnection::moduleApiTarget() { qmlRegisterModuleApi("MyTestModuleApi", 1, 0, module_api_factory); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("moduleapi-target.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("moduleapi-target.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro index ed344d58b4..b66866e7cc 100644 --- a/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro +++ b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeconsole -SOURCES += tst_qdeclarativeconsole.cpp +SOURCES += tst_qdeclarativeconsole.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp index 0025798854..d79e1624ac 100644 --- a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp +++ b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeComponent> #include "../../shared/util.h" -class tst_qdeclarativeconsole : public QObject +class tst_qdeclarativeconsole : public QDeclarativeDataTest { Q_OBJECT public: @@ -58,11 +58,6 @@ 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")); @@ -71,37 +66,38 @@ void tst_qdeclarativeconsole::init() void tst_qdeclarativeconsole::consoleLogExtended() { int startLineNumber = 15; - QUrl testFileUrl = TEST_FILE("consoleLog.qml"); - QString testString = QString(QLatin1String("completed ok (%1:%2)")).arg(testFileUrl.toString()); + QUrl testUrl = testFileUrl("consoleLog.qml"); + const QString testUrlString = testUrl.toString(); + QString testString = QString(QLatin1String("completed ok (%1:%2)")).arg(testUrlString); 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()); + QString testArray = QString(QLatin1String("[1,2] (%1:%2)")).arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testArray.arg(startLineNumber++))); - QString testObject = QString(QLatin1String("Object (%1:%2)")).arg(testFileUrl.toString()); + QString testObject = QString(QLatin1String("Object (%1:%2)")).arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testObject.arg(startLineNumber++))); - QString testUndefined = QString(QLatin1String("undefined (%1:%2)")).arg(testFileUrl.toString()); + QString testUndefined = QString(QLatin1String("undefined (%1:%2)")).arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testUndefined.arg(startLineNumber++))); - QString testNumber = QString(QLatin1String("12 (%1:%2)")).arg(testFileUrl.toString()); + QString testNumber = QString(QLatin1String("12 (%1:%2)")).arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testNumber.arg(startLineNumber++))); - QString testFunction = QString(QLatin1String("function () { return 5;} (%1:%2)")).arg(testFileUrl.toString()); + QString testFunction = QString(QLatin1String("function () { return 5;} (%1:%2)")).arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testFunction.arg(startLineNumber++))); - QString testBoolean = QString(QLatin1String("true (%1:%2)")).arg(testFileUrl.toString()); + QString testBoolean = QString(QLatin1String("true (%1:%2)")).arg(testUrlString); 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()); + QString testMix = QString::fromLatin1("1 pong! Object (%1:%2)").arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testMix.arg(startLineNumber++))); - testMix = QString::fromLatin1("1 [ping,pong] Object 2 (%1:%2)").arg(testFileUrl.toString()); + testMix = QString::fromLatin1("1 [ping,pong] Object 2 (%1:%2)").arg(testUrlString); QTest::ignoreMessage(QtDebugMsg, qPrintable(testMix.arg(startLineNumber++))); - QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testFileUrl.toString()); + QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testUrlString); QTest::ignoreMessage(QtWarningMsg, qPrintable(testException.arg(startLineNumber++))); - QDeclarativeComponent component(&engine, testFileUrl); + QDeclarativeComponent component(&engine, testUrl); QObject *object = component.create(); QVERIFY(object != 0); delete object; diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index 5e48bec033..b1a0384af7 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativecontext -SOURCES += tst_qdeclarativecontext.cpp +SOURCES += tst_qdeclarativecontext.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index c57cbeceba..e74f0b7f5d 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -48,17 +48,7 @@ #include <private/qdeclarativecontext_p.h> #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativecontext : public QObject +class tst_qdeclarativecontext : public QDeclarativeDataTest { Q_OBJECT public: @@ -586,8 +576,8 @@ public slots: void tst_qdeclarativecontext::refreshExpressions() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("refreshExpressions.qml")); - QDeclarativeComponent component2(&engine, TEST_FILE("RefreshExpressionsType.qml")); + QDeclarativeComponent component(&engine, testFileUrl("refreshExpressions.qml")); + QDeclarativeComponent component2(&engine, testFileUrl("RefreshExpressionsType.qml")); CountCommand command; engine.rootContext()->setContextProperty("countCommand", &command); @@ -621,8 +611,8 @@ void tst_qdeclarativecontext::refreshExpressionsRootContext() CountCommand command; engine.rootContext()->setContextProperty("countCommand", &command); - QDeclarativeComponent component(&engine, TEST_FILE("refreshExpressions.qml")); - QDeclarativeComponent component2(&engine, TEST_FILE("refreshExpressionsRootContext.qml")); + QDeclarativeComponent component(&engine, testFileUrl("refreshExpressions.qml")); + QDeclarativeComponent component2(&engine, testFileUrl("refreshExpressionsRootContext.qml")); QDeclarativeContext context(engine.rootContext()); QDeclarativeContext context2(engine.rootContext()); @@ -648,7 +638,7 @@ void tst_qdeclarativecontext::refreshExpressionsRootContext() void tst_qdeclarativecontext::qtbug_22535() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_22535.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_22535.qml")); QDeclarativeContext context(engine.rootContext()); QObject *o = component.create(&context); diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 1908e6bae1..a8c8508891 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -4,9 +4,11 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ testtypes.cpp \ - ../../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp HEADERS += testtypes.h \ - ../../shared/testhttpserver.h + ../../shared/testhttpserver.h \ + ../../shared/util.h INCLUDEPATH += ../../shared # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 251b89dd87..8a028ae039 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -61,17 +61,8 @@ QML. This does not include static QML language issues. Static QML language issues are covered in qmllanguage */ -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativeecmascript : public QObject +class tst_qdeclarativeecmascript : public QDeclarativeDataTest { Q_OBJECT public: @@ -249,12 +240,16 @@ private: QDeclarativeEngine engine; }; -void tst_qdeclarativeecmascript::initTestCase() { registerTypes(); } +void tst_qdeclarativeecmascript::initTestCase() +{ + QDeclarativeDataTest::initTestCase(); + registerTypes(); +} void tst_qdeclarativeecmascript::assignBasicTypes() { { - QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignBasicTypes.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3); @@ -282,7 +277,7 @@ void tst_qdeclarativeecmascript::assignBasicTypes() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignBasicTypes.2.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3); @@ -314,7 +309,7 @@ void tst_qdeclarativeecmascript::assignBasicTypes() void tst_qdeclarativeecmascript::idShortcutInvalidates() { { - QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml")); + QDeclarativeComponent component(&engine, testFileUrl("idShortcutInvalidates.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->objectProperty() != 0); @@ -324,7 +319,7 @@ void tst_qdeclarativeecmascript::idShortcutInvalidates() } { - QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("idShortcutInvalidates.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->objectProperty() != 0); @@ -337,14 +332,14 @@ void tst_qdeclarativeecmascript::idShortcutInvalidates() void tst_qdeclarativeecmascript::boolPropertiesEvaluateAsBool() { { - QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("boolPropertiesEvaluateAsBool.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->stringProperty(), QLatin1String("pass")); delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("boolPropertiesEvaluateAsBool.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->stringProperty(), QLatin1String("pass")); @@ -355,7 +350,7 @@ void tst_qdeclarativeecmascript::boolPropertiesEvaluateAsBool() void tst_qdeclarativeecmascript::signalAssignment() { { - QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalAssignment.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->string(), QString()); @@ -365,7 +360,7 @@ void tst_qdeclarativeecmascript::signalAssignment() } { - QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalAssignment.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->string(), QString()); @@ -378,7 +373,7 @@ void tst_qdeclarativeecmascript::signalAssignment() void tst_qdeclarativeecmascript::methods() { { - QDeclarativeComponent component(&engine, TEST_FILE("methods.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("methods.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->methodCalled(), false); @@ -390,7 +385,7 @@ void tst_qdeclarativeecmascript::methods() } { - QDeclarativeComponent component(&engine, TEST_FILE("methods.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("methods.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->methodCalled(), false); @@ -402,7 +397,7 @@ void tst_qdeclarativeecmascript::methods() } { - QDeclarativeComponent component(&engine, TEST_FILE("methods.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("methods.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test").toInt(), 19); @@ -410,7 +405,7 @@ void tst_qdeclarativeecmascript::methods() } { - QDeclarativeComponent component(&engine, TEST_FILE("methods.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("methods.4.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test").toInt(), 19); @@ -420,7 +415,7 @@ void tst_qdeclarativeecmascript::methods() } { - QDeclarativeComponent component(&engine, TEST_FILE("methods.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("methods.5.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test").toInt(), 9); @@ -430,7 +425,7 @@ void tst_qdeclarativeecmascript::methods() void tst_qdeclarativeecmascript::bindingLoop() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingLoop.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingLoop.qml")); QString warning = component.url().toString() + ":5:9: QML MyQmlObject: Binding loop detected for property \"stringProperty\""; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); QObject *object = component.create(); @@ -639,7 +634,7 @@ void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval() void tst_qdeclarativeecmascript::deferredProperties() { - QDeclarativeComponent component(&engine, TEST_FILE("deferredProperties.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deferredProperties.qml")); MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); @@ -662,7 +657,7 @@ void tst_qdeclarativeecmascript::deferredProperties() // Check errors on deferred properties are correctly emitted void tst_qdeclarativeecmascript::deferredPropertiesErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("deferredPropertiesErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deferredPropertiesErrors.qml")); MyDeferredObject *object = qobject_cast<MyDeferredObject *>(component.create()); QVERIFY(object != 0); @@ -680,7 +675,7 @@ void tst_qdeclarativeecmascript::deferredPropertiesErrors() void tst_qdeclarativeecmascript::extensionObjects() { - QDeclarativeComponent component(&engine, TEST_FILE("extensionObjects.qml")); + QDeclarativeComponent component(&engine, testFileUrl("extensionObjects.qml")); MyExtendedObject *object = qobject_cast<MyExtendedObject *>(component.create()); QVERIFY(object != 0); @@ -705,7 +700,7 @@ void tst_qdeclarativeecmascript::extensionObjects() void tst_qdeclarativeecmascript::overrideExtensionProperties() { - QDeclarativeComponent component(&engine, TEST_FILE("extensionObjectsPropertyOverride.qml")); + QDeclarativeComponent component(&engine, testFileUrl("extensionObjectsPropertyOverride.qml")); OverrideDefaultPropertyObject *object = qobject_cast<OverrideDefaultPropertyObject *>(component.create()); QVERIFY(object != 0); @@ -718,7 +713,7 @@ void tst_qdeclarativeecmascript::overrideExtensionProperties() void tst_qdeclarativeecmascript::attachedProperties() { { - QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.qml")); + QDeclarativeComponent component(&engine, testFileUrl("attachedProperty.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("a").toInt(), 19); @@ -729,7 +724,7 @@ void tst_qdeclarativeecmascript::attachedProperties() } { - QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("attachedProperty.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("a").toInt(), 26); @@ -741,7 +736,7 @@ void tst_qdeclarativeecmascript::attachedProperties() } { - QDeclarativeComponent component(&engine, TEST_FILE("writeAttachedProperty.qml")); + QDeclarativeComponent component(&engine, testFileUrl("writeAttachedProperty.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -760,7 +755,7 @@ void tst_qdeclarativeecmascript::enums() { // Existent enums { - QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -779,7 +774,7 @@ void tst_qdeclarativeecmascript::enums() } // Non-existent enums { - QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.2.qml")); QString warning1 = component.url().toString() + ":5: Unable to assign [undefined] to int"; QString warning2 = component.url().toString() + ":6: Unable to assign [undefined] to int"; @@ -797,7 +792,7 @@ void tst_qdeclarativeecmascript::enums() void tst_qdeclarativeecmascript::valueTypeFunctions() { - QDeclarativeComponent component(&engine, TEST_FILE("valueTypeFunctions.qml")); + QDeclarativeComponent component(&engine, testFileUrl("valueTypeFunctions.qml")); MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create()); QVERIFY(obj != 0); QCOMPARE(obj->rectProperty(), QRect(0,0,100,100)); @@ -814,7 +809,7 @@ void tst_qdeclarativeecmascript::constantsOverrideBindings() { // From ECMAScript { - QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("constantsOverrideBindings.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -833,7 +828,7 @@ void tst_qdeclarativeecmascript::constantsOverrideBindings() // During construction { - QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("constantsOverrideBindings.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -849,7 +844,7 @@ void tst_qdeclarativeecmascript::constantsOverrideBindings() #if 0 // From C++ { - QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("constantsOverrideBindings.3.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -869,7 +864,7 @@ void tst_qdeclarativeecmascript::constantsOverrideBindings() // Using an alias { - QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("constantsOverrideBindings.4.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -890,7 +885,7 @@ the original binding to be disabled. void tst_qdeclarativeecmascript::outerBindingOverridesInnerBinding() { QDeclarativeComponent component(&engine, - TEST_FILE("outerBindingOverridesInnerBinding.qml")); + testFileUrl("outerBindingOverridesInnerBinding.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -918,7 +913,7 @@ Tests for a regression where this used to crash. */ void tst_qdeclarativeecmascript::nonExistentAttachedObject() { - QDeclarativeComponent component(&engine, TEST_FILE("nonExistentAttachedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nonExistentAttachedObject.qml")); QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -932,7 +927,7 @@ void tst_qdeclarativeecmascript::nonExistentAttachedObject() void tst_qdeclarativeecmascript::scope() { { - QDeclarativeComponent component(&engine, TEST_FILE("scope.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -951,7 +946,7 @@ void tst_qdeclarativeecmascript::scope() } { - QDeclarativeComponent component(&engine, TEST_FILE("scope.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -966,7 +961,7 @@ void tst_qdeclarativeecmascript::scope() } { - QDeclarativeComponent component(&engine, TEST_FILE("scope.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -979,7 +974,7 @@ void tst_qdeclarativeecmascript::scope() // Signal argument scope { - QDeclarativeComponent component(&engine, TEST_FILE("scope.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.4.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -995,7 +990,7 @@ void tst_qdeclarativeecmascript::scope() } { - QDeclarativeComponent component(&engine, TEST_FILE("scope.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.5.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1006,7 +1001,7 @@ void tst_qdeclarativeecmascript::scope() } { - QDeclarativeComponent component(&engine, TEST_FILE("scope.6.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scope.6.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1020,7 +1015,7 @@ void tst_qdeclarativeecmascript::scope() // importing context void tst_qdeclarativeecmascript::importScope() { - QDeclarativeComponent component(&engine, TEST_FILE("importScope.qml")); + QDeclarativeComponent component(&engine, testFileUrl("importScope.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -1035,7 +1030,7 @@ is essentially a test of QDeclarativeMetaType::copy() */ void tst_qdeclarativeecmascript::signalParameterTypes() { - QDeclarativeComponent component(&engine, TEST_FILE("signalParameterTypes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalParameterTypes.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -1056,7 +1051,7 @@ Test that two JS objects for the same QObject compare as equal. */ void tst_qdeclarativeecmascript::objectsCompareAsEqual() { - QDeclarativeComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectsCompareAsEqual.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1076,7 +1071,7 @@ Tests for a regression where the binding would not reevaluate. */ void tst_qdeclarativeecmascript::aliasPropertyAndBinding() { - QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasPropertyAndBinding.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1100,7 +1095,7 @@ void tst_qdeclarativeecmascript::aliasPropertyReset() QObject *object = 0; // test that a manual write (of undefined) to a resettable aliased property succeeds - QDeclarativeComponent c1(&engine, TEST_FILE("aliasreset/aliasPropertyReset.1.qml")); + QDeclarativeComponent c1(&engine, testFileUrl("aliasreset/aliasPropertyReset.1.qml")); object = c1.create(); QVERIFY(object != 0); QVERIFY(object->property("sourceComponentAlias").value<QDeclarativeComponent*>() != 0); @@ -1111,7 +1106,7 @@ void tst_qdeclarativeecmascript::aliasPropertyReset() delete object; // test that a manual write (of undefined) to a resettable alias property succeeds - QDeclarativeComponent c2(&engine, TEST_FILE("aliasreset/aliasPropertyReset.2.qml")); + QDeclarativeComponent c2(&engine, testFileUrl("aliasreset/aliasPropertyReset.2.qml")); object = c2.create(); QVERIFY(object != 0); QVERIFY(object->property("sourceComponentAlias").value<QDeclarativeComponent*>() != 0); @@ -1122,7 +1117,7 @@ void tst_qdeclarativeecmascript::aliasPropertyReset() delete object; // test that an alias to a bound property works correctly - QDeclarativeComponent c3(&engine, TEST_FILE("aliasreset/aliasPropertyReset.3.qml")); + QDeclarativeComponent c3(&engine, testFileUrl("aliasreset/aliasPropertyReset.3.qml")); object = c3.create(); QVERIFY(object != 0); QVERIFY(object->property("sourceComponentAlias").value<QDeclarativeComponent*>() != 0); @@ -1136,7 +1131,7 @@ void tst_qdeclarativeecmascript::aliasPropertyReset() // test that a manual write (of undefined) to a resettable alias property // whose aliased property's object has been deleted, does not crash. - QDeclarativeComponent c4(&engine, TEST_FILE("aliasreset/aliasPropertyReset.4.qml")); + QDeclarativeComponent c4(&engine, testFileUrl("aliasreset/aliasPropertyReset.4.qml")); object = c4.create(); QVERIFY(object != 0); QVERIFY(object->property("sourceComponentAlias").value<QDeclarativeComponent*>() != 0); @@ -1151,14 +1146,14 @@ void tst_qdeclarativeecmascript::aliasPropertyReset() delete object; // test that binding an alias property to an undefined value works correctly - QDeclarativeComponent c5(&engine, TEST_FILE("aliasreset/aliasPropertyReset.5.qml")); + QDeclarativeComponent c5(&engine, testFileUrl("aliasreset/aliasPropertyReset.5.qml")); object = c5.create(); QVERIFY(object != 0); QVERIFY(object->property("sourceComponentAlias").value<QDeclarativeComponent*>() == 0); // bound to undefined value. delete object; // test that a manual write (of undefined) to a non-resettable property fails properly - QUrl url = TEST_FILE("aliasreset/aliasPropertyReset.error.1.qml"); + QUrl url = testFileUrl("aliasreset/aliasPropertyReset.error.1.qml"); QString warning1 = url.toString() + QLatin1String(":15: Error: Cannot assign [undefined] to int"); QDeclarativeComponent e1(&engine, url); object = e1.create(); @@ -1191,7 +1186,7 @@ void tst_qdeclarativeecmascript::dynamicCreation() QFETCH(QString, method); QFETCH(QString, createdName); - QDeclarativeComponent component(&engine, TEST_FILE("dynamicCreation.qml")); + QDeclarativeComponent component(&engine, testFileUrl("dynamicCreation.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); @@ -1209,7 +1204,7 @@ void tst_qdeclarativeecmascript::dynamicCreation() void tst_qdeclarativeecmascript::dynamicDestruction() { { - QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("dynamicDeletion.qml")); QDeclarativeGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); QDeclarativeGuard<QObject> createdQmlObject = 0; @@ -1240,7 +1235,7 @@ void tst_qdeclarativeecmascript::dynamicDestruction() } { - QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("dynamicDeletion.2.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -1265,7 +1260,7 @@ void tst_qdeclarativeecmascript::dynamicDestruction() */ void tst_qdeclarativeecmascript::objectToString() { - QDeclarativeComponent component(&engine, TEST_FILE("declarativeToString.qml")); + QDeclarativeComponent component(&engine, testFileUrl("declarativeToString.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "testToString"); @@ -1280,7 +1275,7 @@ void tst_qdeclarativeecmascript::objectToString() */ void tst_qdeclarativeecmascript::objectHasOwnProperty() { - QUrl url = TEST_FILE("declarativeHasOwnProperty.qml"); + QUrl url = testFileUrl("declarativeHasOwnProperty.qml"); QString warning1 = url.toString() + ":59: TypeError: Cannot call method 'hasOwnProperty' of undefined"; QString warning2 = url.toString() + ":64: TypeError: Cannot call method 'hasOwnProperty' of undefined"; QString warning3 = url.toString() + ":69: TypeError: Cannot call method 'hasOwnProperty' of undefined"; @@ -1332,7 +1327,7 @@ This test is best run under valgrind to ensure no invalid memory access occur. void tst_qdeclarativeecmascript::selfDeletingBinding() { { - QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.qml")); + QDeclarativeComponent component(&engine, testFileUrl("selfDeletingBinding.qml")); QObject *object = component.create(); QVERIFY(object != 0); object->setProperty("triggerDelete", true); @@ -1340,7 +1335,7 @@ void tst_qdeclarativeecmascript::selfDeletingBinding() } { - QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("selfDeletingBinding.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); object->setProperty("triggerDelete", true); @@ -1357,7 +1352,7 @@ and no synthesiszed properties). */ void tst_qdeclarativeecmascript::extendedObjectPropertyLookup() { - QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml")); + QDeclarativeComponent component(&engine, testFileUrl("extendedObjectPropertyLookup.qml")); QObject *object = component.create(); QVERIFY(object != 0); delete object; @@ -1368,7 +1363,7 @@ Test that extended object properties can be accessed correctly. */ void tst_qdeclarativeecmascript::extendedObjectPropertyLookup2() { - QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("extendedObjectPropertyLookup2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1383,7 +1378,7 @@ Test file/lineNumbers for binding/Script errors. */ void tst_qdeclarativeecmascript::scriptErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptErrors.qml")); QString url = component.url().toString(); QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\""; @@ -1420,7 +1415,7 @@ Test file/lineNumbers for inline functions. */ void tst_qdeclarativeecmascript::functionErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("functionErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("functionErrors.qml")); QString url = component.url().toString(); QString warning = url + ":5: Error: Invalid write to global property \"a\""; @@ -1432,7 +1427,7 @@ void tst_qdeclarativeecmascript::functionErrors() delete object; // test that if an exception occurs while invoking js function from cpp, it is reported as expected. - QDeclarativeComponent componentTwo(&engine, TEST_FILE("scarceResourceFunctionFail.var.qml")); + QDeclarativeComponent componentTwo(&engine, testFileUrl("scarceResourceFunctionFail.var.qml")); url = componentTwo.url().toString(); object = componentTwo.create(); QVERIFY(object != 0); @@ -1451,7 +1446,7 @@ Test various errors that can occur when assigning a property from script */ void tst_qdeclarativeecmascript::propertyAssignmentErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("propertyAssignmentErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyAssignmentErrors.qml")); QString url = component.url().toString(); @@ -1470,7 +1465,7 @@ a signal script. */ void tst_qdeclarativeecmascript::signalTriggeredBindings() { - QDeclarativeComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalTriggeredBindings.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); @@ -1498,7 +1493,7 @@ Test that list properties can be iterated from ECMAScript */ void tst_qdeclarativeecmascript::listProperties() { - QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml")); + QDeclarativeComponent component(&engine, testFileUrl("listProperties.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); @@ -1512,7 +1507,7 @@ void tst_qdeclarativeecmascript::listProperties() void tst_qdeclarativeecmascript::exceptionClearsOnReeval() { - QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml")); + QDeclarativeComponent component(&engine, testFileUrl("exceptionClearsOnReeval.qml")); QString url = component.url().toString(); QString warning = url + ":4: TypeError: Cannot read property 'objectProperty' of null"; @@ -1535,7 +1530,7 @@ void tst_qdeclarativeecmascript::exceptionClearsOnReeval() void tst_qdeclarativeecmascript::exceptionSlotProducesWarning() { - QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml")); + QDeclarativeComponent component(&engine, testFileUrl("exceptionProducesWarning.qml")); QString url = component.url().toString(); QString warning = component.url().toString() + ":6: Error: JS exception"; @@ -1548,7 +1543,7 @@ void tst_qdeclarativeecmascript::exceptionSlotProducesWarning() void tst_qdeclarativeecmascript::exceptionBindingProducesWarning() { - QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("exceptionProducesWarning2.qml")); QString url = component.url().toString(); QString warning = component.url().toString() + ":5: Error: JS exception"; @@ -1569,7 +1564,7 @@ static void transientErrorsMsgHandler(QtMsgType, const char *) void tst_qdeclarativeecmascript::transientErrors() { { - QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("transientErrors.qml")); transientErrorsMsgCount = 0; QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler); @@ -1586,7 +1581,7 @@ void tst_qdeclarativeecmascript::transientErrors() // One binding erroring multiple times, but then resolving { - QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("transientErrors.2.qml")); transientErrorsMsgCount = 0; QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler); @@ -1605,7 +1600,7 @@ void tst_qdeclarativeecmascript::transientErrors() // Check that errors during shutdown are minimized void tst_qdeclarativeecmascript::shutdownErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("shutdownErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("shutdownErrors.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1620,7 +1615,7 @@ void tst_qdeclarativeecmascript::shutdownErrors() void tst_qdeclarativeecmascript::compositePropertyType() { - QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml")); + QDeclarativeComponent component(&engine, testFileUrl("compositePropertyType.qml")); QTest::ignoreMessage(QtDebugMsg, "hello world"); QObject *object = qobject_cast<QObject *>(component.create()); @@ -1630,7 +1625,7 @@ void tst_qdeclarativeecmascript::compositePropertyType() // QTBUG-5759 void tst_qdeclarativeecmascript::jsObject() { - QDeclarativeComponent component(&engine, TEST_FILE("jsObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("jsObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1642,7 +1637,7 @@ void tst_qdeclarativeecmascript::jsObject() void tst_qdeclarativeecmascript::undefinedResetsProperty() { { - QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml")); + QDeclarativeComponent component(&engine, testFileUrl("undefinedResetsProperty.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1659,7 +1654,7 @@ void tst_qdeclarativeecmascript::undefinedResetsProperty() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("undefinedResetsProperty.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1676,7 +1671,7 @@ void tst_qdeclarativeecmascript::undefinedResetsProperty() // Aliases to variant properties should work void tst_qdeclarativeecmascript::qtbug_22464() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_22464.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_22464.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1687,7 +1682,7 @@ void tst_qdeclarativeecmascript::qtbug_22464() void tst_qdeclarativeecmascript::qtbug_21580() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_21580.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_21580.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1700,7 +1695,7 @@ void tst_qdeclarativeecmascript::qtbug_21580() // QTBUG-6781 void tst_qdeclarativeecmascript::bug1() { - QDeclarativeComponent component(&engine, TEST_FILE("bug.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bug.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1731,7 +1726,7 @@ void tst_qdeclarativeecmascript::bug2() // Don't crash in createObject when the component has errors. void tst_qdeclarativeecmascript::dynamicCreationCrash() { - QDeclarativeComponent component(&engine, TEST_FILE("dynamicCreation.qml")); + QDeclarativeComponent component(&engine, testFileUrl("dynamicCreation.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); @@ -1752,7 +1747,7 @@ void tst_qdeclarativeecmascript::dynamicCreationOwnership() // allow the engine to go out of scope too. { QDeclarativeEngine dcoEngine; - QDeclarativeComponent component(&dcoEngine, TEST_FILE("dynamicCreationOwnership.qml")); + QDeclarativeComponent component(&dcoEngine, testFileUrl("dynamicCreationOwnership.qml")); QObject *object = component.create(); QVERIFY(object != 0); MyDynamicCreationDestructionObject *mdcdo = object->findChild<MyDynamicCreationDestructionObject*>("mdcdo"); @@ -1780,7 +1775,7 @@ void tst_qdeclarativeecmascript::dynamicCreationOwnership() //QTBUG-9367 void tst_qdeclarativeecmascript::regExpBug() { - QDeclarativeComponent component(&engine, TEST_FILE("regExp.qml")); + QDeclarativeComponent component(&engine, testFileUrl("regExp.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); QCOMPARE(object->regExp().pattern(), QLatin1String("[a-zA-z]")); @@ -2312,7 +2307,7 @@ void tst_qdeclarativeecmascript::callQtInvokables() // QTBUG-13047 (check that you can pass registered object types as args) void tst_qdeclarativeecmascript::invokableObjectArg() { - QDeclarativeComponent component(&engine, TEST_FILE("invokableObjectArg.qml")); + QDeclarativeComponent component(&engine, testFileUrl("invokableObjectArg.qml")); QObject *o = component.create(); QVERIFY(o); @@ -2326,7 +2321,7 @@ void tst_qdeclarativeecmascript::invokableObjectArg() // QTBUG-13047 (check that you can return registered object types from methods) void tst_qdeclarativeecmascript::invokableObjectRet() { - QDeclarativeComponent component(&engine, TEST_FILE("invokableObjectRet.qml")); + QDeclarativeComponent component(&engine, testFileUrl("invokableObjectRet.qml")); QObject *o = component.create(); QVERIFY(o); @@ -2337,7 +2332,7 @@ void tst_qdeclarativeecmascript::invokableObjectRet() // QTBUG-5675 void tst_qdeclarativeecmascript::listToVariant() { - QDeclarativeComponent component(&engine, TEST_FILE("listToVariant.qml")); + QDeclarativeComponent component(&engine, testFileUrl("listToVariant.qml")); MyQmlContainer container; @@ -2358,7 +2353,7 @@ void tst_qdeclarativeecmascript::listToVariant() Q_DECLARE_METATYPE(QDeclarativeListProperty<MyQmlObject>) void tst_qdeclarativeecmascript::listAssignment() { - QDeclarativeComponent component(&engine, TEST_FILE("listAssignment.qml")); + QDeclarativeComponent component(&engine, testFileUrl("listAssignment.qml")); QObject *obj = component.create(); QCOMPARE(obj->property("list1length").toInt(), 2); QDeclarativeListProperty<MyQmlObject> list1 = obj->property("list1").value<QDeclarativeListProperty<MyQmlObject> >(); @@ -2377,11 +2372,11 @@ void tst_qdeclarativeecmascript::multiEngineObject() QDeclarativeEngine e1; e1.rootContext()->setContextProperty("thing", &obj); - QDeclarativeComponent c1(&e1, TEST_FILE("multiEngineObject.qml")); + QDeclarativeComponent c1(&e1, testFileUrl("multiEngineObject.qml")); QDeclarativeEngine e2; e2.rootContext()->setContextProperty("thing", &obj); - QDeclarativeComponent c2(&e2, TEST_FILE("multiEngineObject.qml")); + QDeclarativeComponent c2(&e2, testFileUrl("multiEngineObject.qml")); QObject *o1 = c1.create(); QObject *o2 = c2.create(); @@ -2396,7 +2391,7 @@ void tst_qdeclarativeecmascript::multiEngineObject() // Test that references to QObjects are cleanup when the object is destroyed void tst_qdeclarativeecmascript::deletedObject() { - QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deletedObject.qml")); QObject *object = component.create(); @@ -2410,7 +2405,7 @@ void tst_qdeclarativeecmascript::deletedObject() void tst_qdeclarativeecmascript::attachedPropertyScope() { - QDeclarativeComponent component(&engine, TEST_FILE("attachedPropertyScope.qml")); + QDeclarativeComponent component(&engine, testFileUrl("attachedPropertyScope.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -2431,7 +2426,7 @@ void tst_qdeclarativeecmascript::attachedPropertyScope() void tst_qdeclarativeecmascript::scriptConnect() { { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2444,7 +2439,7 @@ void tst_qdeclarativeecmascript::scriptConnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2457,7 +2452,7 @@ void tst_qdeclarativeecmascript::scriptConnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.3.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2470,7 +2465,7 @@ void tst_qdeclarativeecmascript::scriptConnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.4.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2483,7 +2478,7 @@ void tst_qdeclarativeecmascript::scriptConnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.5.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2496,7 +2491,7 @@ void tst_qdeclarativeecmascript::scriptConnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptConnect.6.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptConnect.6.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2512,7 +2507,7 @@ void tst_qdeclarativeecmascript::scriptConnect() void tst_qdeclarativeecmascript::scriptDisconnect() { { - QDeclarativeComponent component(&engine, TEST_FILE("scriptDisconnect.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptDisconnect.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2531,7 +2526,7 @@ void tst_qdeclarativeecmascript::scriptDisconnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptDisconnect.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptDisconnect.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2550,7 +2545,7 @@ void tst_qdeclarativeecmascript::scriptDisconnect() } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptDisconnect.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptDisconnect.3.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2568,7 +2563,7 @@ void tst_qdeclarativeecmascript::scriptDisconnect() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("scriptDisconnect.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptDisconnect.4.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2606,7 +2601,7 @@ void tst_qdeclarativeecmascript::ownership() context->setContextObject(&own); { - QDeclarativeComponent component(&engine, TEST_FILE("ownership.qml")); + QDeclarativeComponent component(&engine, testFileUrl("ownership.qml")); QVERIFY(own.object != 0); @@ -2624,7 +2619,7 @@ void tst_qdeclarativeecmascript::ownership() own.object = new QObject(&own); { - QDeclarativeComponent component(&engine, TEST_FILE("ownership.qml")); + QDeclarativeComponent component(&engine, testFileUrl("ownership.qml")); QVERIFY(own.object != 0); @@ -2747,7 +2742,7 @@ void tst_qdeclarativeecmascript::qlistqobjectMethods() QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); context->setContextObject(&obj); - QDeclarativeComponent component(&engine, TEST_FILE("qlistqobjectMethods.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qlistqobjectMethods.qml")); QObject *object = component.create(context); @@ -2761,7 +2756,7 @@ void tst_qdeclarativeecmascript::qlistqobjectMethods() // QTBUG-9205 void tst_qdeclarativeecmascript::strictlyEquals() { - QDeclarativeComponent component(&engine, TEST_FILE("strictlyEquals.qml")); + QDeclarativeComponent component(&engine, testFileUrl("strictlyEquals.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -2780,7 +2775,7 @@ void tst_qdeclarativeecmascript::strictlyEquals() void tst_qdeclarativeecmascript::compiled() { - QDeclarativeComponent component(&engine, TEST_FILE("compiled.qml")); + QDeclarativeComponent component(&engine, testFileUrl("compiled.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -2820,7 +2815,7 @@ void tst_qdeclarativeecmascript::compiled() // Test that numbers assigned in bindings as strings work consistently void tst_qdeclarativeecmascript::numberAssignment() { - QDeclarativeComponent component(&engine, TEST_FILE("numberAssignment.qml")); + QDeclarativeComponent component(&engine, testFileUrl("numberAssignment.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -2846,7 +2841,7 @@ void tst_qdeclarativeecmascript::numberAssignment() void tst_qdeclarativeecmascript::propertySplicing() { - QDeclarativeComponent component(&engine, TEST_FILE("propertySplicing.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertySplicing.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -2859,7 +2854,7 @@ void tst_qdeclarativeecmascript::propertySplicing() // QTBUG-16683 void tst_qdeclarativeecmascript::signalWithUnknownTypes() { - QDeclarativeComponent component(&engine, TEST_FILE("signalWithUnknownTypes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalWithUnknownTypes.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -2907,7 +2902,7 @@ void tst_qdeclarativeecmascript::signalWithJSValueInVariant() QFETCH(QString, expression); QFETCH(QString, compare); - QDeclarativeComponent component(&engine, TEST_FILE("signalWithJSValueInVariant.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalWithJSValueInVariant.qml")); QScopedPointer<MyQmlObject> object(qobject_cast<MyQmlObject *>(component.create())); QVERIFY(object != 0); @@ -2931,7 +2926,7 @@ void tst_qdeclarativeecmascript::signalWithJSValueInVariant_twoEngines() QFETCH(QString, expression); QFETCH(QString, compare); - QDeclarativeComponent component(&engine, TEST_FILE("signalWithJSValueInVariant.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalWithJSValueInVariant.qml")); QScopedPointer<MyQmlObject> object(qobject_cast<MyQmlObject *>(component.create())); QVERIFY(object != 0); @@ -2957,7 +2952,7 @@ void tst_qdeclarativeecmascript::signalWithQJSValue() QFETCH(QString, expression); QFETCH(QString, compare); - QDeclarativeComponent component(&engine, TEST_FILE("signalWithQJSValue.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalWithQJSValue.qml")); QScopedPointer<MyQmlObject> object(qobject_cast<MyQmlObject *>(component.create())); QVERIFY(object != 0); @@ -2986,7 +2981,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() QTest::addColumn<QVariantList>("readBackExpectedValues"); QTest::newRow("qobject, register + read + method") - << TEST_FILE("moduleapi/qobjectModuleApi.qml") + << testFileUrl("moduleapi/qobjectModuleApi.qml") << QString() << QStringList() << (QStringList() << "existingUriTest" << "qobjectTest" << "qobjectMethodTest" @@ -2998,7 +2993,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("script, register + read") - << TEST_FILE("moduleapi/scriptModuleApi.qml") + << testFileUrl("moduleapi/scriptModuleApi.qml") << QString() << QStringList() << (QStringList() << "scriptTest") @@ -3009,7 +3004,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("qobject, caching + read") - << TEST_FILE("moduleapi/qobjectModuleApiCaching.qml") + << testFileUrl("moduleapi/qobjectModuleApiCaching.qml") << QString() << QStringList() << (QStringList() << "existingUriTest" << "qobjectParentedTest") @@ -3020,7 +3015,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("script, caching + read") - << TEST_FILE("moduleapi/scriptModuleApiCaching.qml") + << testFileUrl("moduleapi/scriptModuleApiCaching.qml") << QString() << QStringList() << (QStringList() << "scriptTest") @@ -3031,9 +3026,9 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("qobject, writing + readonly constraints") - << TEST_FILE("moduleapi/qobjectModuleApiWriting.qml") + << testFileUrl("moduleapi/qobjectModuleApiWriting.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("moduleapi/qobjectModuleApiWriting.qml").toLocalFile() + QLatin1String(":14: Error: Cannot assign to read-only property \"qobjectTestProperty\""))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("moduleapi/qobjectModuleApiWriting.qml").toLocalFile() + QLatin1String(":14: Error: Cannot assign to read-only property \"qobjectTestProperty\""))) << (QStringList() << "readOnlyProperty" << "writableProperty") << (QVariantList() << 20 << 50) << (QStringList() << "firstProperty" << "writableProperty") @@ -3042,9 +3037,9 @@ void tst_qdeclarativeecmascript::moduleApi_data() << (QVariantList() << 20 << 30); QTest::newRow("script, writing + readonly constraints") - << TEST_FILE("moduleapi/scriptModuleApiWriting.qml") + << testFileUrl("moduleapi/scriptModuleApiWriting.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("moduleapi/scriptModuleApiWriting.qml").toLocalFile() + QLatin1String(":21: Error: Cannot assign to read-only property \"scriptTestProperty\""))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("moduleapi/scriptModuleApiWriting.qml").toLocalFile() + QLatin1String(":21: Error: Cannot assign to read-only property \"scriptTestProperty\""))) << (QStringList() << "readBack" << "unchanged") << (QVariantList() << 13 << 42) << (QStringList() << "firstProperty" << "secondProperty") @@ -3053,7 +3048,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << (QVariantList() << 30 << 42); QTest::newRow("qobject module API enum values in JS") - << TEST_FILE("moduleapi/qobjectModuleApiEnums.qml") + << testFileUrl("moduleapi/qobjectModuleApiEnums.qml") << QString() << QStringList() << (QStringList() << "enumValue" << "enumMethod") @@ -3064,7 +3059,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("qobject, invalid major version fail") - << TEST_FILE("moduleapi/moduleApiMajorVersionFail.qml") + << testFileUrl("moduleapi/moduleApiMajorVersionFail.qml") << QString("QDeclarativeComponent: Component is not ready") << QStringList() << QStringList() @@ -3075,7 +3070,7 @@ void tst_qdeclarativeecmascript::moduleApi_data() << QVariantList(); QTest::newRow("qobject, invalid minor version fail") - << TEST_FILE("moduleapi/moduleApiMinorVersionFail.qml") + << testFileUrl("moduleapi/moduleApiMinorVersionFail.qml") << QString("QDeclarativeComponent: Component is not ready") << QStringList() << QStringList() @@ -3131,7 +3126,7 @@ void tst_qdeclarativeecmascript::importScripts_data() QTest::addColumn<QVariantList>("propertyValues"); QTest::newRow("basic functionality") - << TEST_FILE("jsimport/testImport.qml") + << testFileUrl("jsimport/testImport.qml") << QString() << QStringList() << (QStringList() << QLatin1String("importedScriptStringValue") @@ -3144,71 +3139,71 @@ void tst_qdeclarativeecmascript::importScripts_data() << QVariant(2)); QTest::newRow("import scoping") - << TEST_FILE("jsimport/testImportScoping.qml") + << testFileUrl("jsimport/testImportScoping.qml") << QString() << QStringList() << (QStringList() << QLatin1String("componentError")) << (QVariantList() << QVariant(5)); QTest::newRow("parent scope shouldn't be inherited by import with imports") - << TEST_FILE("jsimportfail/failOne.qml") + << testFileUrl("jsimportfail/failOne.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/failOne.qml").toLocalFile() + QLatin1String(":6: TypeError: Cannot call method 'greetingString' of undefined"))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("jsimportfail/failOne.qml").toLocalFile() + QLatin1String(":6: TypeError: Cannot call method 'greetingString' of undefined"))) << (QStringList() << QLatin1String("importScriptFunctionValue")) << (QVariantList() << QVariant(QString())); QTest::newRow("javascript imports in an import should be private to the import scope") - << TEST_FILE("jsimportfail/failTwo.qml") + << testFileUrl("jsimportfail/failTwo.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/failTwo.qml").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: ImportOneJs"))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("jsimportfail/failTwo.qml").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: ImportOneJs"))) << (QStringList() << QLatin1String("importScriptFunctionValue")) << (QVariantList() << QVariant(QString())); QTest::newRow("module imports in an import should be private to the import scope") - << TEST_FILE("jsimportfail/failThree.qml") + << testFileUrl("jsimportfail/failThree.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/failThree.qml").toLocalFile() + QLatin1String(":7: TypeError: Cannot read property 'JsQtTest' of undefined"))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("jsimportfail/failThree.qml").toLocalFile() + QLatin1String(":7: TypeError: Cannot read property 'JsQtTest' of undefined"))) << (QStringList() << QLatin1String("importedModuleAttachedPropertyValue")) << (QVariantList() << QVariant(false)); QTest::newRow("typenames in an import should be private to the import scope") - << TEST_FILE("jsimportfail/failFour.qml") + << testFileUrl("jsimportfail/failFour.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/failFour.qml").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: JsQtTest"))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("jsimportfail/failFour.qml").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: JsQtTest"))) << (QStringList() << QLatin1String("importedModuleEnumValue")) << (QVariantList() << QVariant(0)); QTest::newRow("import with imports has it's own activation scope") - << TEST_FILE("jsimportfail/failFive.qml") + << testFileUrl("jsimportfail/failFive.qml") << QString() - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/importWithImports.js").toLocalFile() + QLatin1String(":8: ReferenceError: Can't find variable: Component")) - << QString(QLatin1String("file://") + TEST_FILE("jsimportfail/importPragmaLibrary.js").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: Component"))) + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("jsimportfail/importWithImports.js").toLocalFile() + QLatin1String(":8: ReferenceError: Can't find variable: Component")) + << QString(QLatin1String("file://") + testFileUrl("jsimportfail/importPragmaLibrary.js").toLocalFile() + QLatin1String(":6: ReferenceError: Can't find variable: Component"))) << (QStringList() << QLatin1String("componentError")) << (QVariantList() << QVariant(0)); QTest::newRow("import pragma library script") - << TEST_FILE("jsimport/testImportPragmaLibrary.qml") + << testFileUrl("jsimport/testImportPragmaLibrary.qml") << QString() << QStringList() << (QStringList() << QLatin1String("testValue")) << (QVariantList() << QVariant(31)); QTest::newRow("pragma library imports shouldn't inherit parent imports or scope") - << TEST_FILE("jsimportfail/testImportPragmaLibrary.qml") + << testFileUrl("jsimportfail/testImportPragmaLibrary.qml") << QString() << QStringList() << (QStringList() << QLatin1String("testValue")) << (QVariantList() << QVariant(0)); QTest::newRow("import pragma library script which has an import") - << TEST_FILE("jsimport/testImportPragmaLibraryWithImports.qml") + << testFileUrl("jsimport/testImportPragmaLibraryWithImports.qml") << QString() << QStringList() << (QStringList() << QLatin1String("testValue")) << (QVariantList() << QVariant(55)); QTest::newRow("import pragma library script which has a pragma library import") - << TEST_FILE("jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml") + << testFileUrl("jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml") << QString() << QStringList() << (QStringList() << QLatin1String("testValue")) @@ -3259,7 +3254,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() /* property var semantics */ // test that scarce resources are handled properly in signal invocation - QDeclarativeComponent varComponentTen(&engine, TEST_FILE("scarceResourceSignal.var.qml")); + QDeclarativeComponent varComponentTen(&engine, testFileUrl("scarceResourceSignal.var.qml")); object = varComponentTen.create(); srsc = object->findChild<QObject*>("srsc"); QVERIFY(srsc); @@ -3281,7 +3276,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() delete object; // test that scarce resources are handled properly from js functions in qml files - QDeclarativeComponent varComponentEleven(&engine, TEST_FILE("scarceResourceFunction.var.qml")); + QDeclarativeComponent varComponentEleven(&engine, testFileUrl("scarceResourceFunction.var.qml")); object = varComponentEleven.create(); QVERIFY(object != 0); QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid @@ -3300,7 +3295,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() delete object; // test that if an exception occurs while invoking js function from cpp, that the resources are released. - QDeclarativeComponent varComponentTwelve(&engine, TEST_FILE("scarceResourceFunctionFail.var.qml")); + QDeclarativeComponent varComponentTwelve(&engine, testFileUrl("scarceResourceFunctionFail.var.qml")); object = varComponentTwelve.create(); QVERIFY(object != 0); QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid @@ -3318,7 +3313,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() // test that if an Item which has JS ownership but has a scarce resource property is garbage collected, // that the scarce resource is removed from the engine's list of scarce resources to clean up. - QDeclarativeComponent varComponentThirteen(&engine, TEST_FILE("scarceResourceObjectGc.var.qml")); + QDeclarativeComponent varComponentThirteen(&engine, testFileUrl("scarceResourceObjectGc.var.qml")); object = varComponentThirteen.create(); QVERIFY(object != 0); QVERIFY(!object->property("varProperty").isValid()); // not assigned yet @@ -3331,7 +3326,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() /* property variant semantics */ // test that scarce resources are handled properly in signal invocation - QDeclarativeComponent variantComponentTen(&engine, TEST_FILE("scarceResourceSignal.variant.qml")); + QDeclarativeComponent variantComponentTen(&engine, testFileUrl("scarceResourceSignal.variant.qml")); object = variantComponentTen.create(); QVERIFY(object != 0); srsc = object->findChild<QObject*>("srsc"); @@ -3354,7 +3349,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() delete object; // test that scarce resources are handled properly from js functions in qml files - QDeclarativeComponent variantComponentEleven(&engine, TEST_FILE("scarceResourceFunction.variant.qml")); + QDeclarativeComponent variantComponentEleven(&engine, testFileUrl("scarceResourceFunction.variant.qml")); object = variantComponentEleven.create(); QVERIFY(object != 0); QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid @@ -3373,7 +3368,7 @@ void tst_qdeclarativeecmascript::scarceResources_other() delete object; // test that if an exception occurs while invoking js function from cpp, that the resources are released. - QDeclarativeComponent variantComponentTwelve(&engine, TEST_FILE("scarceResourceFunctionFail.variant.qml")); + QDeclarativeComponent variantComponentTwelve(&engine, testFileUrl("scarceResourceFunctionFail.variant.qml")); object = variantComponentTwelve.create(); QVERIFY(object != 0); QVERIFY(!object->property("scarceResourceCopy").isValid()); // not yet assigned, so should not be valid @@ -3410,7 +3405,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // resource should NOT be detached prior to deletion of the object instance, // unless the resource is destroyed explicitly. QTest::newRow("var: import scarce resource copy directly") - << TEST_FILE("scarceResourceCopy.var.qml") + << testFileUrl("scarceResourceCopy.var.qml") << true << false // won't be detached, because assigned to property and not explicitly released << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3419,7 +3414,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QStringList(); QTest::newRow("var: import scarce resource copy from JS") - << TEST_FILE("scarceResourceCopyFromJs.var.qml") + << testFileUrl("scarceResourceCopyFromJs.var.qml") << true << false // won't be detached, because assigned to property and not explicitly released << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3428,7 +3423,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QStringList(); QTest::newRow("var: import released scarce resource copy from JS") - << TEST_FILE("scarceResourceDestroyedCopy.var.qml") + << testFileUrl("scarceResourceDestroyedCopy.var.qml") << true << true // explicitly released, so it will be detached << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3439,7 +3434,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // in the following three cases, no other copy should exist in memory, // and so it should be detached (unless explicitly preserved). QTest::newRow("var: import auto-release SR from JS in binding side-effect") - << TEST_FILE("scarceResourceTest.var.qml") + << testFileUrl("scarceResourceTest.var.qml") << true << true // auto released, so it will be detached << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3447,7 +3442,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant(100)) << QStringList(); QTest::newRow("var: import explicit-preserve SR from JS in binding side-effect") - << TEST_FILE("scarceResourceTestPreserve.var.qml") + << testFileUrl("scarceResourceTestPreserve.var.qml") << true << false // won't be detached because we explicitly preserve it << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3455,7 +3450,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant(100)) << QStringList(); QTest::newRow("var: import explicit-preserve SR from JS in binding side-effect") - << TEST_FILE("scarceResourceTestMultiple.var.qml") + << testFileUrl("scarceResourceTestMultiple.var.qml") << true << true // will be detached because all resources were released manually or automatically. << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3466,7 +3461,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // In the following three cases, test that scarce resources are handled // correctly for imports. QTest::newRow("var: import with no binding") - << TEST_FILE("scarceResourceCopyImportNoBinding.var.qml") + << testFileUrl("scarceResourceCopyImportNoBinding.var.qml") << false // cannot check detach status. << false << QStringList() @@ -3474,7 +3469,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QList<QVariant>() << QStringList(); QTest::newRow("var: import with binding without explicit preserve") - << TEST_FILE("scarceResourceCopyImportNoBinding.var.qml") + << testFileUrl("scarceResourceCopyImportNoBinding.var.qml") << false << false << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3482,7 +3477,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant()) << QStringList(); QTest::newRow("var: import with explicit release after binding evaluation") - << TEST_FILE("scarceResourceCopyImport.var.qml") + << testFileUrl("scarceResourceCopyImport.var.qml") << false << false << (QStringList() << QLatin1String("scarceResourceImportedCopy") << QLatin1String("scarceResourceAssignedCopyOne") << QLatin1String("scarceResourceAssignedCopyTwo") << QLatin1String("arePropertiesEqual")) @@ -3490,7 +3485,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant() << QVariant() << QVariant() << QVariant(true)) << QStringList(); QTest::newRow("var: import with different js objects") - << TEST_FILE("scarceResourceCopyImportDifferent.var.qml") + << testFileUrl("scarceResourceCopyImportDifferent.var.qml") << false << false << (QStringList() << QLatin1String("scarceResourceAssignedCopyOne") << QLatin1String("scarceResourceAssignedCopyTwo") << QLatin1String("arePropertiesEqual")) @@ -3498,7 +3493,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant() << QVariant(origPixmap) << QVariant(false)) << QStringList(); QTest::newRow("var: import with different js objects and explicit release") - << TEST_FILE("scarceResourceMultipleDifferentNoBinding.var.qml") + << testFileUrl("scarceResourceMultipleDifferentNoBinding.var.qml") << false << false << (QStringList() << QLatin1String("resourceOne") << QLatin1String("resourceTwo")) @@ -3506,7 +3501,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant(origPixmap) << QVariant()) << QStringList(); QTest::newRow("var: import with same js objects and explicit release") - << TEST_FILE("scarceResourceMultipleSameNoBinding.var.qml") + << testFileUrl("scarceResourceMultipleSameNoBinding.var.qml") << false << false << (QStringList() << QLatin1String("resourceOne") << QLatin1String("resourceTwo")) @@ -3514,7 +3509,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant() << QVariant()) << QStringList(); QTest::newRow("var: binding with same js objects and explicit release") - << TEST_FILE("scarceResourceMultipleSameWithBinding.var.qml") + << testFileUrl("scarceResourceMultipleSameWithBinding.var.qml") << false << false << (QStringList() << QLatin1String("resourceOne") << QLatin1String("resourceTwo")) @@ -3530,7 +3525,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // resource should NOT be detached prior to deletion of the object instance, // unless the resource is destroyed explicitly. QTest::newRow("variant: import scarce resource copy directly") - << TEST_FILE("scarceResourceCopy.variant.qml") + << testFileUrl("scarceResourceCopy.variant.qml") << true << false // won't be detached, because assigned to property and not explicitly released << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3539,7 +3534,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QStringList(); QTest::newRow("variant: import scarce resource copy from JS") - << TEST_FILE("scarceResourceCopyFromJs.variant.qml") + << testFileUrl("scarceResourceCopyFromJs.variant.qml") << true << false // won't be detached, because assigned to property and not explicitly released << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3548,7 +3543,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QStringList(); QTest::newRow("variant: import released scarce resource copy from JS") - << TEST_FILE("scarceResourceDestroyedCopy.variant.qml") + << testFileUrl("scarceResourceDestroyedCopy.variant.qml") << true << true // explicitly released, so it will be detached << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3559,7 +3554,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // in the following three cases, no other copy should exist in memory, // and so it should be detached (unless explicitly preserved). QTest::newRow("variant: import auto-release SR from JS in binding side-effect") - << TEST_FILE("scarceResourceTest.variant.qml") + << testFileUrl("scarceResourceTest.variant.qml") << true << true // auto released, so it will be detached << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3567,7 +3562,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant(100)) << QStringList(); QTest::newRow("variant: import explicit-preserve SR from JS in binding side-effect") - << TEST_FILE("scarceResourceTestPreserve.variant.qml") + << testFileUrl("scarceResourceTestPreserve.variant.qml") << true << false // won't be detached because we explicitly preserve it << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3575,7 +3570,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant(100)) << QStringList(); QTest::newRow("variant: import multiple scarce resources") - << TEST_FILE("scarceResourceTestMultiple.variant.qml") + << testFileUrl("scarceResourceTestMultiple.variant.qml") << true << true // will be detached because all resources were released manually or automatically. << (QStringList() << QLatin1String("scarceResourceTest")) @@ -3586,7 +3581,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() // In the following three cases, test that scarce resources are handled // correctly for imports. QTest::newRow("variant: import with no binding") - << TEST_FILE("scarceResourceCopyImportNoBinding.variant.qml") + << testFileUrl("scarceResourceCopyImportNoBinding.variant.qml") << false // cannot check detach status. << false << QStringList() @@ -3594,7 +3589,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << QList<QVariant>() << QStringList(); QTest::newRow("variant: import with binding without explicit preserve") - << TEST_FILE("scarceResourceCopyImportNoBinding.variant.qml") + << testFileUrl("scarceResourceCopyImportNoBinding.variant.qml") << false << false << (QStringList() << QLatin1String("scarceResourceCopy")) @@ -3602,7 +3597,7 @@ void tst_qdeclarativeecmascript::scarceResources_data() << (QList<QVariant>() << QVariant()) << QStringList(); QTest::newRow("variant: import with explicit release after binding evaluation") - << TEST_FILE("scarceResourceCopyImport.variant.qml") + << testFileUrl("scarceResourceCopyImport.variant.qml") << false << false << (QStringList() << QLatin1String("scarceResourceImportedCopy") << QLatin1String("scarceResourceAssignedCopyOne") << QLatin1String("scarceResourceAssignedCopyTwo")) @@ -3653,14 +3648,14 @@ void tst_qdeclarativeecmascript::scarceResources() void tst_qdeclarativeecmascript::propertyChangeSlots() { // ensure that allowable property names are allowed and onPropertyNameChanged slots are generated correctly. - QDeclarativeComponent component(&engine, TEST_FILE("changeslots/propertyChangeSlots.qml")); + QDeclarativeComponent component(&engine, testFileUrl("changeslots/propertyChangeSlots.qml")); QObject *object = component.create(); QVERIFY(object != 0); delete object; // ensure that invalid property names fail properly. QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); - QDeclarativeComponent e1(&engine, TEST_FILE("changeslots/propertyChangeSlotErrors.1.qml")); + QDeclarativeComponent e1(&engine, testFileUrl("changeslots/propertyChangeSlotErrors.1.qml")); QString expectedErrorString = e1.url().toString() + QLatin1String(":9:5: Cannot assign to non-existent property \"on_nameWithUnderscoreChanged\""); QCOMPARE(e1.errors().at(0).toString(), expectedErrorString); object = e1.create(); @@ -3668,7 +3663,7 @@ void tst_qdeclarativeecmascript::propertyChangeSlots() delete object; QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); - QDeclarativeComponent e2(&engine, TEST_FILE("changeslots/propertyChangeSlotErrors.2.qml")); + QDeclarativeComponent e2(&engine, testFileUrl("changeslots/propertyChangeSlotErrors.2.qml")); expectedErrorString = e2.url().toString() + QLatin1String(":9:5: Cannot assign to non-existent property \"on____nameWithUnderscoresChanged\""); QCOMPARE(e2.errors().at(0).toString(), expectedErrorString); object = e2.create(); @@ -3676,7 +3671,7 @@ void tst_qdeclarativeecmascript::propertyChangeSlots() delete object; QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); - QDeclarativeComponent e3(&engine, TEST_FILE("changeslots/propertyChangeSlotErrors.3.qml")); + QDeclarativeComponent e3(&engine, testFileUrl("changeslots/propertyChangeSlotErrors.3.qml")); expectedErrorString = e3.url().toString() + QLatin1String(":9:5: Cannot assign to non-existent property \"on$NameWithDollarsignChanged\""); QCOMPARE(e3.errors().at(0).toString(), expectedErrorString); object = e3.create(); @@ -3684,7 +3679,7 @@ void tst_qdeclarativeecmascript::propertyChangeSlots() delete object; QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); - QDeclarativeComponent e4(&engine, TEST_FILE("changeslots/propertyChangeSlotErrors.4.qml")); + QDeclarativeComponent e4(&engine, testFileUrl("changeslots/propertyChangeSlotErrors.4.qml")); expectedErrorString = e4.url().toString() + QLatin1String(":9:5: Cannot assign to non-existent property \"on_6NameWithUnderscoreNumberChanged\""); QCOMPARE(e4.errors().at(0).toString(), expectedErrorString); object = e4.create(); @@ -3697,15 +3692,15 @@ void tst_qdeclarativeecmascript::propertyVar_data() QTest::addColumn<QUrl>("qmlFile"); // valid - QTest::newRow("non-bindable object subproperty changed") << TEST_FILE("propertyVar.1.qml"); - QTest::newRow("non-bindable object changed") << TEST_FILE("propertyVar.2.qml"); - QTest::newRow("primitive changed") << TEST_FILE("propertyVar.3.qml"); - QTest::newRow("javascript array modification") << TEST_FILE("propertyVar.4.qml"); - QTest::newRow("javascript map modification") << TEST_FILE("propertyVar.5.qml"); - QTest::newRow("javascript array assignment") << TEST_FILE("propertyVar.6.qml"); - QTest::newRow("javascript map assignment") << TEST_FILE("propertyVar.7.qml"); - QTest::newRow("literal property assignment") << TEST_FILE("propertyVar.8.qml"); - QTest::newRow("qobject property assignment") << TEST_FILE("propertyVar.9.qml"); + QTest::newRow("non-bindable object subproperty changed") << testFileUrl("propertyVar.1.qml"); + QTest::newRow("non-bindable object changed") << testFileUrl("propertyVar.2.qml"); + QTest::newRow("primitive changed") << testFileUrl("propertyVar.3.qml"); + QTest::newRow("javascript array modification") << testFileUrl("propertyVar.4.qml"); + QTest::newRow("javascript map modification") << testFileUrl("propertyVar.5.qml"); + QTest::newRow("javascript array assignment") << testFileUrl("propertyVar.6.qml"); + QTest::newRow("javascript map assignment") << testFileUrl("propertyVar.7.qml"); + QTest::newRow("literal property assignment") << testFileUrl("propertyVar.8.qml"); + QTest::newRow("qobject property assignment") << testFileUrl("propertyVar.9.qml"); } void tst_qdeclarativeecmascript::propertyVar() @@ -3729,7 +3724,7 @@ void tst_qdeclarativeecmascript::propertyVarCpp() // ensure that writing to and reading from a var property from cpp works as required. // Literal values stored in var properties can be read and written as QVariants // of a specific type, whereas object values are read as QVariantMaps. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarCpp.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarCpp.qml")); object = component.create(); QVERIFY(object != 0); // assign int to property var that currently has int assigned @@ -3758,7 +3753,7 @@ void tst_qdeclarativeecmascript::propertyVarOwnership() { // Referenced JS objects are not collected { - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarOwnership.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarOwnership.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test").toBool(), false); @@ -3768,7 +3763,7 @@ void tst_qdeclarativeecmascript::propertyVarOwnership() } // Referenced JS objects are not collected { - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarOwnership.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarOwnership.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("test").toBool(), false); @@ -3778,7 +3773,7 @@ void tst_qdeclarativeecmascript::propertyVarOwnership() } // Qt objects are not collected until they've been dereferenced { - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarOwnership.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarOwnership.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -3802,7 +3797,7 @@ void tst_qdeclarativeecmascript::propertyVarOwnership() } // Self reference does not prevent Qt object collection { - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarOwnership.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarOwnership.4.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -3826,7 +3821,7 @@ void tst_qdeclarativeecmascript::propertyVarImplicitOwnership() // The childObject has a reference to a different QObject. We want to ensure // that the different item will not be cleaned up until required. IE, the childObject // has implicit ownership of the constructed QObject. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVarImplicitOwnership.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVarImplicitOwnership.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignCircular"); @@ -3851,7 +3846,7 @@ void tst_qdeclarativeecmascript::propertyVarImplicitOwnership() void tst_qdeclarativeecmascript::propertyVarReparent() { // ensure that nothing breaks if we re-parent objects - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.reparent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.reparent.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignVarProp"); @@ -3892,7 +3887,7 @@ void tst_qdeclarativeecmascript::propertyVarReparentNullContext() // sometimes reparenting can cause problems // (eg, if the ctxt is collected, varproperties are no longer available) // this test ensures that no crash occurs in that situation. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.reparent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.reparent.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignVarProp"); @@ -3927,7 +3922,7 @@ void tst_qdeclarativeecmascript::propertyVarReparentNullContext() void tst_qdeclarativeecmascript::propertyVarCircular() { // enforce behaviour regarding circular references - ensure qdvmemo deletion. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.circular.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.circular.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignCircular"); // cause assignment and gc @@ -3952,7 +3947,7 @@ void tst_qdeclarativeecmascript::propertyVarCircular2() { // track deletion of JS-owned parent item with Cpp-owned child // where the child has a var property referencing its parent. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.circular.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.circular.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignCircular"); @@ -3987,7 +3982,7 @@ void tst_qdeclarativeecmascript::propertyVarInheritance() // enforce behaviour regarding element inheritance - ensure handle disposal. // The particular component under test here has a chain of references. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.inherit.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.inherit.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignCircular"); // cause assignment and gc @@ -4029,7 +4024,7 @@ void tst_qdeclarativeecmascript::propertyVarInheritance2() // The particular component under test here does NOT have a chain of references; the // only link between rootObject and childObject is that rootObject is the parent of childObject. - QDeclarativeComponent component(&engine, TEST_FILE("propertyVar.circular.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("propertyVar.circular.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "assignCircular"); @@ -4060,7 +4055,7 @@ void tst_qdeclarativeecmascript::propertyVarInheritance2() // Ensure that QObject type conversion works on binding assignment void tst_qdeclarativeecmascript::elementAssign() { - QDeclarativeComponent component(&engine, TEST_FILE("elementAssign.qml")); + QDeclarativeComponent component(&engine, testFileUrl("elementAssign.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4073,7 +4068,7 @@ void tst_qdeclarativeecmascript::elementAssign() // QTBUG-12457 void tst_qdeclarativeecmascript::objectPassThroughSignals() { - QDeclarativeComponent component(&engine, TEST_FILE("objectsPassThroughSignals.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectsPassThroughSignals.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4086,7 +4081,7 @@ void tst_qdeclarativeecmascript::objectPassThroughSignals() // QTBUG-21626 void tst_qdeclarativeecmascript::objectConversion() { - QDeclarativeComponent component(&engine, TEST_FILE("objectConversion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectConversion.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4101,7 +4096,7 @@ void tst_qdeclarativeecmascript::objectConversion() // QTBUG-20242 void tst_qdeclarativeecmascript::booleanConversion() { - QDeclarativeComponent component(&engine, TEST_FILE("booleanConversion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("booleanConversion.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4126,7 +4121,7 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() { // Linear QObject reference QDeclarativeEngine hrmEngine; - QDeclarativeComponent component(&hrmEngine, TEST_FILE("handleReferenceManagement.object.1.qml")); + QDeclarativeComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.object.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); CircularReferenceObject *cro = object->findChild<CircularReferenceObject*>("cro"); @@ -4145,7 +4140,7 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() { // Circular QObject reference QDeclarativeEngine hrmEngine; - QDeclarativeComponent component(&hrmEngine, TEST_FILE("handleReferenceManagement.object.2.qml")); + QDeclarativeComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.object.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); CircularReferenceObject *cro = object->findChild<CircularReferenceObject*>("cro"); @@ -4164,7 +4159,7 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() { // Linear handle reference QDeclarativeEngine hrmEngine; - QDeclarativeComponent component(&hrmEngine, TEST_FILE("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.handle.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); CircularReferenceHandle *crh = object->findChild<CircularReferenceHandle*>("crh"); @@ -4192,7 +4187,7 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() { // Circular handle reference QDeclarativeEngine hrmEngine; - QDeclarativeComponent component(&hrmEngine, TEST_FILE("handleReferenceManagement.handle.2.qml")); + QDeclarativeComponent component(&hrmEngine, testFileUrl("handleReferenceManagement.handle.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); CircularReferenceHandle *crh = object->findChild<CircularReferenceHandle*>("crh"); @@ -4224,8 +4219,8 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() // multiple engine interaction - linear reference QDeclarativeEngine hrmEngine1; QDeclarativeEngine hrmEngine2; - QDeclarativeComponent component1(&hrmEngine1, TEST_FILE("handleReferenceManagement.handle.1.qml")); - QDeclarativeComponent component2(&hrmEngine2, TEST_FILE("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component1(&hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component2(&hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); QObject *object1 = component1.create(); QObject *object2 = component2.create(); QVERIFY(object1 != 0); @@ -4268,8 +4263,8 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() // multiple engine interaction - circular reference QDeclarativeEngine hrmEngine1; QDeclarativeEngine hrmEngine2; - QDeclarativeComponent component1(&hrmEngine1, TEST_FILE("handleReferenceManagement.handle.1.qml")); - QDeclarativeComponent component2(&hrmEngine2, TEST_FILE("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component1(&hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component2(&hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); QObject *object1 = component1.create(); QObject *object2 = component2.create(); QVERIFY(object1 != 0); @@ -4321,8 +4316,8 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() // multiple engine interaction - linear reference with engine deletion QDeclarativeEngine *hrmEngine1 = new QDeclarativeEngine; QDeclarativeEngine *hrmEngine2 = new QDeclarativeEngine; - QDeclarativeComponent component1(hrmEngine1, TEST_FILE("handleReferenceManagement.handle.1.qml")); - QDeclarativeComponent component2(hrmEngine2, TEST_FILE("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component1(hrmEngine1, testFileUrl("handleReferenceManagement.handle.1.qml")); + QDeclarativeComponent component2(hrmEngine2, testFileUrl("handleReferenceManagement.handle.1.qml")); QObject *object1 = component1.create(); QObject *object2 = component2.create(); QVERIFY(object1 != 0); @@ -4372,13 +4367,13 @@ void tst_qdeclarativeecmascript::handleReferenceManagement() void tst_qdeclarativeecmascript::stringArg() { - QDeclarativeComponent component(&engine, TEST_FILE("stringArg.qml")); + QDeclarativeComponent component(&engine, testFileUrl("stringArg.qml")); QObject *object = component.create(); QVERIFY(object != 0); QMetaObject::invokeMethod(object, "success"); QVERIFY(object->property("returnValue").toBool()); - QString w1 = TEST_FILE("stringArg.qml").toString() + QLatin1String(":45: Error: String.arg(): Invalid arguments"); + QString w1 = testFileUrl("stringArg.qml").toString() + QLatin1String(":45: Error: String.arg(): Invalid arguments"); QTest::ignoreMessage(QtWarningMsg, w1.toAscii().constData()); QMetaObject::invokeMethod(object, "failure"); QVERIFY(object->property("returnValue").toBool()); @@ -4388,7 +4383,7 @@ void tst_qdeclarativeecmascript::stringArg() void tst_qdeclarativeecmascript::readonlyDeclaration() { - QDeclarativeComponent component(&engine, TEST_FILE("readonlyDeclaration.qml")); + QDeclarativeComponent component(&engine, testFileUrl("readonlyDeclaration.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4406,7 +4401,7 @@ Q_DECLARE_METATYPE(QList<QUrl>) void tst_qdeclarativeecmascript::sequenceConversionRead() { { - QUrl qmlFile = TEST_FILE("sequenceConversion.read.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.read.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4457,7 +4452,7 @@ void tst_qdeclarativeecmascript::sequenceConversionRead() } { - QUrl qmlFile = TEST_FILE("sequenceConversion.read.error.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.read.error.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4486,7 +4481,7 @@ void tst_qdeclarativeecmascript::sequenceConversionRead() void tst_qdeclarativeecmascript::sequenceConversionWrite() { { - QUrl qmlFile = TEST_FILE("sequenceConversion.write.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.write.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4509,7 +4504,7 @@ void tst_qdeclarativeecmascript::sequenceConversionWrite() } { - QUrl qmlFile = TEST_FILE("sequenceConversion.write.error.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.write.error.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4532,7 +4527,7 @@ void tst_qdeclarativeecmascript::sequenceConversionWrite() void tst_qdeclarativeecmascript::sequenceConversionArray() { // ensure that in JS the returned sequences act just like normal JS Arrays. - QUrl qmlFile = TEST_FILE("sequenceConversion.array.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.array.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4551,7 +4546,7 @@ void tst_qdeclarativeecmascript::sequenceConversionThreads() { // ensure that sequence conversion operations work correctly in a worker thread // and that serialisation between the main and worker thread succeeds. - QUrl qmlFile = TEST_FILE("sequenceConversion.threads.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.threads.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4590,7 +4585,7 @@ void tst_qdeclarativeecmascript::sequenceConversionThreads() void tst_qdeclarativeecmascript::sequenceConversionBindings() { { - QUrl qmlFile = TEST_FILE("sequenceConversion.bindings.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.bindings.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4603,7 +4598,7 @@ void tst_qdeclarativeecmascript::sequenceConversionBindings() } { - QUrl qmlFile = TEST_FILE("sequenceConversion.bindings.error.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.bindings.error.qml"); QString warning = QString(QLatin1String("%1:17: Unable to assign QList<int> to QList<bool>")).arg(qmlFile.toString()); QTest::ignoreMessage(QtWarningMsg, warning.toAscii().constData()); QDeclarativeComponent component(&engine, qmlFile); @@ -4615,7 +4610,7 @@ void tst_qdeclarativeecmascript::sequenceConversionBindings() void tst_qdeclarativeecmascript::sequenceConversionCopy() { - QUrl qmlFile = TEST_FILE("sequenceConversion.copy.qml"); + QUrl qmlFile = testFileUrl("sequenceConversion.copy.qml"); QDeclarativeComponent component(&engine, qmlFile); QObject *object = component.create(); QVERIFY(object != 0); @@ -4632,7 +4627,7 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() { // test binding array to sequence type property { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.1.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1 << 2)); @@ -4646,7 +4641,7 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() // test binding literal to sequence type property { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.2.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1)); @@ -4660,19 +4655,19 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() // test binding single value to sequence type property { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.3.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1)); QCOMPARE(object->qrealListProperty(), (QList<qreal>() << 1.1)); QCOMPARE(object->boolListProperty(), (QList<bool>() << false)); - QCOMPARE(object->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")))); + QCOMPARE(object->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")))); delete object; } // test assigning array to sequence type property in js function { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.4.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1 << 2)); @@ -4686,7 +4681,7 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() // test assigning literal to sequence type property in js function { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.5.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1)); @@ -4700,19 +4695,19 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() // test assigning single value to sequence type property in js function { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.6.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.6.qml")); MySequenceConversionObject *object = qobject_cast<MySequenceConversionObject *>(component.create()); QVERIFY(object != 0); QCOMPARE(object->intListProperty(), (QList<int>() << 1)); QCOMPARE(object->qrealListProperty(), (QList<qreal>() << 1.1)); QCOMPARE(object->boolListProperty(), (QList<bool>() << false)); - QCOMPARE(object->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")))); + QCOMPARE(object->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")))); delete object; } // test QList<QUrl> literal assignment and binding assignment causes url resolution when required { - QDeclarativeComponent component(&engine, TEST_FILE("assignSequenceTypes.7.qml")); + QDeclarativeComponent component(&engine, testFileUrl("assignSequenceTypes.7.qml")); QObject *object = component.create(); QVERIFY(object != 0); MySequenceConversionObject *msco1 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco1")); @@ -4721,11 +4716,11 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() MySequenceConversionObject *msco4 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco4")); MySequenceConversionObject *msco5 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco5")); QVERIFY(msco1 != 0 && msco2 != 0 && msco3 != 0 && msco4 != 0 && msco5 != 0); - QCOMPARE(msco1->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")))); - QCOMPARE(msco2->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")))); - QCOMPARE(msco3->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")) << QUrl(TEST_FILE("example2.html")))); - QCOMPARE(msco4->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")) << QUrl(TEST_FILE("example2.html")))); - QCOMPARE(msco5->urlListProperty(), (QList<QUrl>() << QUrl(TEST_FILE("example.html")) << QUrl(TEST_FILE("example2.html")))); + QCOMPARE(msco1->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")))); + QCOMPARE(msco2->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")))); + QCOMPARE(msco3->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")) << QUrl(testFileUrl("example2.html")))); + QCOMPARE(msco4->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")) << QUrl(testFileUrl("example2.html")))); + QCOMPARE(msco5->urlListProperty(), (QList<QUrl>() << QUrl(testFileUrl("example.html")) << QUrl(testFileUrl("example2.html")))); delete object; } } @@ -4734,7 +4729,7 @@ void tst_qdeclarativeecmascript::assignSequenceTypes() // Regressed with: df1788b4dbbb2826ae63f26bdf166342595343f4 void tst_qdeclarativeecmascript::nullObjectBinding() { - QDeclarativeComponent component(&engine, TEST_FILE("nullObjectBinding.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nullObjectBinding.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4748,7 +4743,7 @@ void tst_qdeclarativeecmascript::nullObjectBinding() void tst_qdeclarativeecmascript::deletedEngine() { QDeclarativeEngine *engine = new QDeclarativeEngine; - QDeclarativeComponent component(engine, TEST_FILE("deletedEngine.qml")); + QDeclarativeComponent component(engine, testFileUrl("deletedEngine.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4769,7 +4764,7 @@ void tst_qdeclarativeecmascript::deletedEngine() // Test the crashing part of QTBUG-9705 void tst_qdeclarativeecmascript::libraryScriptAssert() { - QDeclarativeComponent component(&engine, TEST_FILE("libraryScriptAssert.qml")); + QDeclarativeComponent component(&engine, testFileUrl("libraryScriptAssert.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4779,7 +4774,7 @@ void tst_qdeclarativeecmascript::libraryScriptAssert() void tst_qdeclarativeecmascript::variantsAssignedUndefined() { - QDeclarativeComponent component(&engine, TEST_FILE("variantsAssignedUndefined.qml")); + QDeclarativeComponent component(&engine, testFileUrl("variantsAssignedUndefined.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -4798,7 +4793,7 @@ void tst_qdeclarativeecmascript::variantsAssignedUndefined() void tst_qdeclarativeecmascript::qtbug_9792() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_9792.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_9792.qml")); QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); @@ -4825,7 +4820,7 @@ void tst_qdeclarativeecmascript::qtbug_9792() // Verifies that QDeclarativeGuard<>s used in the vmemetaobject are cleaned correctly void tst_qdeclarativeecmascript::qtcreatorbug_1289() { - QDeclarativeComponent component(&engine, TEST_FILE("qtcreatorbug_1289.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtcreatorbug_1289.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -4847,7 +4842,7 @@ void tst_qdeclarativeecmascript::qtcreatorbug_1289() void tst_qdeclarativeecmascript::noSpuriousWarningsAtShutdown() { { - QDeclarativeComponent component(&engine, TEST_FILE("noSpuriousWarningsAtShutdown.qml")); + QDeclarativeComponent component(&engine, testFileUrl("noSpuriousWarningsAtShutdown.qml")); QObject *o = component.create(); @@ -4863,7 +4858,7 @@ void tst_qdeclarativeecmascript::noSpuriousWarningsAtShutdown() { - QDeclarativeComponent component(&engine, TEST_FILE("noSpuriousWarningsAtShutdown.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("noSpuriousWarningsAtShutdown.2.qml")); QObject *o = component.create(); @@ -4881,7 +4876,7 @@ void tst_qdeclarativeecmascript::noSpuriousWarningsAtShutdown() void tst_qdeclarativeecmascript::canAssignNullToQObject() { { - QDeclarativeComponent component(&engine, TEST_FILE("canAssignNullToQObject.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("canAssignNullToQObject.1.qml")); MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(o != 0); @@ -4896,7 +4891,7 @@ void tst_qdeclarativeecmascript::canAssignNullToQObject() } { - QDeclarativeComponent component(&engine, TEST_FILE("canAssignNullToQObject.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("canAssignNullToQObject.2.qml")); MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(o != 0); @@ -4909,7 +4904,7 @@ void tst_qdeclarativeecmascript::canAssignNullToQObject() void tst_qdeclarativeecmascript::functionAssignment_fromBinding() { - QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("functionAssignment.1.qml")); QString url = component.url().toString(); QString warning = url + ":4: Unable to assign a function to a property."; @@ -4927,7 +4922,7 @@ void tst_qdeclarativeecmascript::functionAssignment_fromJS() { QFETCH(QString, triggerProperty); - QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("functionAssignment.2.qml")); QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString())); MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create()); @@ -4959,7 +4954,7 @@ void tst_qdeclarativeecmascript::functionAssignment_fromJS_data() void tst_qdeclarativeecmascript::functionAssignmentfromJS_invalid() { - QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("functionAssignment.2.qml")); QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString())); MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create()); @@ -4983,7 +4978,7 @@ void tst_qdeclarativeecmascript::functionAssignmentfromJS_invalid() void tst_qdeclarativeecmascript::eval() { - QDeclarativeComponent component(&engine, TEST_FILE("eval.qml")); + QDeclarativeComponent component(&engine, testFileUrl("eval.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -4999,7 +4994,7 @@ void tst_qdeclarativeecmascript::eval() void tst_qdeclarativeecmascript::function() { - QDeclarativeComponent component(&engine, TEST_FILE("function.qml")); + QDeclarativeComponent component(&engine, testFileUrl("function.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5016,7 +5011,7 @@ void tst_qdeclarativeecmascript::include() { // Non-library relative include { - QDeclarativeComponent component(&engine, TEST_FILE("include.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5032,7 +5027,7 @@ void tst_qdeclarativeecmascript::include() // Library relative include { - QDeclarativeComponent component(&engine, TEST_FILE("include_shared.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include_shared.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5048,7 +5043,7 @@ void tst_qdeclarativeecmascript::include() // Callback { - QDeclarativeComponent component(&engine, TEST_FILE("include_callback.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include_callback.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5064,7 +5059,7 @@ void tst_qdeclarativeecmascript::include() // Including file with ".pragma library" { - QDeclarativeComponent component(&engine, TEST_FILE("include_pragma.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include_pragma.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test1").toInt(), 100); @@ -5076,9 +5071,9 @@ void tst_qdeclarativeecmascript::include() { TestHTTPServer server(8111); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); - QDeclarativeComponent component(&engine, TEST_FILE("include_remote.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include_remote.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5104,9 +5099,9 @@ void tst_qdeclarativeecmascript::include() { TestHTTPServer server(8111); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); - QDeclarativeComponent component(&engine, TEST_FILE("include_remote_missing.qml")); + QDeclarativeComponent component(&engine, testFileUrl("include_remote_missing.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5122,7 +5117,7 @@ void tst_qdeclarativeecmascript::include() void tst_qdeclarativeecmascript::signalHandlers() { - QDeclarativeComponent component(&engine, TEST_FILE("signalHandlers.qml")); + QDeclarativeComponent component(&engine, testFileUrl("signalHandlers.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5152,7 +5147,7 @@ void tst_qdeclarativeecmascript::signalHandlers() void tst_qdeclarativeecmascript::qtbug_10696() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_10696.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_10696.qml")); QObject *o = component.create(); QVERIFY(o != 0); delete o; @@ -5160,7 +5155,7 @@ void tst_qdeclarativeecmascript::qtbug_10696() void tst_qdeclarativeecmascript::qtbug_11606() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_11606.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_11606.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test").toBool(), true); @@ -5169,7 +5164,7 @@ void tst_qdeclarativeecmascript::qtbug_11606() void tst_qdeclarativeecmascript::qtbug_11600() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_11600.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_11600.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test").toBool(), true); @@ -5178,7 +5173,7 @@ void tst_qdeclarativeecmascript::qtbug_11600() void tst_qdeclarativeecmascript::qtbug_21864() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_21864.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_21864.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test").toBool(), true); @@ -5188,7 +5183,7 @@ void tst_qdeclarativeecmascript::qtbug_21864() // Reading and writing non-scriptable properties should fail void tst_qdeclarativeecmascript::nonscriptable() { - QDeclarativeComponent component(&engine, TEST_FILE("nonscriptable.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nonscriptable.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("readOk").toBool(), true); @@ -5199,7 +5194,7 @@ void tst_qdeclarativeecmascript::nonscriptable() // deleteLater() should not be callable from QML void tst_qdeclarativeecmascript::deleteLater() { - QDeclarativeComponent component(&engine, TEST_FILE("deleteLater.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deleteLater.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test").toBool(), true); @@ -5208,7 +5203,7 @@ void tst_qdeclarativeecmascript::deleteLater() void tst_qdeclarativeecmascript::in() { - QDeclarativeComponent component(&engine, TEST_FILE("in.qml")); + QDeclarativeComponent component(&engine, testFileUrl("in.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test1").toBool(), true); @@ -5218,7 +5213,7 @@ void tst_qdeclarativeecmascript::in() void tst_qdeclarativeecmascript::typeOf() { - QDeclarativeComponent component(&engine, TEST_FILE("typeOf.qml")); + QDeclarativeComponent component(&engine, testFileUrl("typeOf.qml")); // These warnings should not happen once QTBUG-21864 is fixed QString warning1 = component.url().toString() + QLatin1String(":16: Error: Cannot assign [undefined] to QString"); @@ -5246,7 +5241,7 @@ void tst_qdeclarativeecmascript::typeOf() void tst_qdeclarativeecmascript::sharedAttachedObject() { - QDeclarativeComponent component(&engine, TEST_FILE("sharedAttachedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sharedAttachedObject.qml")); QObject *o = component.create(); QVERIFY(o != 0); QCOMPARE(o->property("test1").toBool(), true); @@ -5257,7 +5252,7 @@ void tst_qdeclarativeecmascript::sharedAttachedObject() // QTBUG-13999 void tst_qdeclarativeecmascript::objectName() { - QDeclarativeComponent component(&engine, TEST_FILE("objectName.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectName.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5274,7 +5269,7 @@ void tst_qdeclarativeecmascript::objectName() void tst_qdeclarativeecmascript::writeRemovesBinding() { - QDeclarativeComponent component(&engine, TEST_FILE("writeRemovesBinding.qml")); + QDeclarativeComponent component(&engine, testFileUrl("writeRemovesBinding.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5286,7 +5281,7 @@ void tst_qdeclarativeecmascript::writeRemovesBinding() // Test bindings assigned to alias properties actually assign to the alias' target void tst_qdeclarativeecmascript::aliasBindingsAssignCorrectly() { - QDeclarativeComponent component(&engine, TEST_FILE("aliasBindingsAssignCorrectly.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasBindingsAssignCorrectly.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5299,7 +5294,7 @@ void tst_qdeclarativeecmascript::aliasBindingsAssignCorrectly() void tst_qdeclarativeecmascript::aliasBindingsOverrideTarget() { { - QDeclarativeComponent component(&engine, TEST_FILE("aliasBindingsOverrideTarget.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasBindingsOverrideTarget.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5309,7 +5304,7 @@ void tst_qdeclarativeecmascript::aliasBindingsOverrideTarget() } { - QDeclarativeComponent component(&engine, TEST_FILE("aliasBindingsOverrideTarget.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasBindingsOverrideTarget.2.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5319,7 +5314,7 @@ void tst_qdeclarativeecmascript::aliasBindingsOverrideTarget() } { - QDeclarativeComponent component(&engine, TEST_FILE("aliasBindingsOverrideTarget.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasBindingsOverrideTarget.3.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5333,7 +5328,7 @@ void tst_qdeclarativeecmascript::aliasBindingsOverrideTarget() void tst_qdeclarativeecmascript::aliasWritesOverrideBindings() { { - QDeclarativeComponent component(&engine, TEST_FILE("aliasWritesOverrideBindings.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasWritesOverrideBindings.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5343,7 +5338,7 @@ void tst_qdeclarativeecmascript::aliasWritesOverrideBindings() } { - QDeclarativeComponent component(&engine, TEST_FILE("aliasWritesOverrideBindings.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasWritesOverrideBindings.2.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5353,7 +5348,7 @@ void tst_qdeclarativeecmascript::aliasWritesOverrideBindings() } { - QDeclarativeComponent component(&engine, TEST_FILE("aliasWritesOverrideBindings.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasWritesOverrideBindings.3.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -5367,7 +5362,7 @@ void tst_qdeclarativeecmascript::aliasWritesOverrideBindings() // QTBUG-20200 void tst_qdeclarativeecmascript::aliasToCompositeElement() { - QDeclarativeComponent component(&engine, TEST_FILE("aliasToCompositeElement.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasToCompositeElement.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -5377,7 +5372,7 @@ void tst_qdeclarativeecmascript::aliasToCompositeElement() void tst_qdeclarativeecmascript::qtbug_20344() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_20344.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_20344.qml")); QString warning = component.url().toString() + ":5: Error: Exception thrown from within QObject slot"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -5391,7 +5386,7 @@ void tst_qdeclarativeecmascript::qtbug_20344() void tst_qdeclarativeecmascript::revisionErrors() { { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevisionErrors.qml")); QString url = component.url().toString(); QString warning1 = url + ":8: ReferenceError: Can't find variable: prop2"; @@ -5406,7 +5401,7 @@ void tst_qdeclarativeecmascript::revisionErrors() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevisionErrors2.qml")); QString url = component.url().toString(); // MyRevisionedSubclass 1.0 uses MyRevisionedClass revision 0 @@ -5428,7 +5423,7 @@ void tst_qdeclarativeecmascript::revisionErrors() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevisionErrors3.qml")); QString url = component.url().toString(); // MyRevisionedSubclass 1.1 uses MyRevisionedClass revision 1 @@ -5448,7 +5443,7 @@ void tst_qdeclarativeecmascript::revisionErrors() void tst_qdeclarativeecmascript::revision() { { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevision.qml")); QString url = component.url().toString(); MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create()); @@ -5456,7 +5451,7 @@ void tst_qdeclarativeecmascript::revision() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevision2.qml")); QString url = component.url().toString(); MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create()); @@ -5464,7 +5459,7 @@ void tst_qdeclarativeecmascript::revision() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevision3.qml")); QString url = component.url().toString(); MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create()); @@ -5473,7 +5468,7 @@ void tst_qdeclarativeecmascript::revision() } // Test that non-root classes can resolve revisioned methods { - QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("metaobjectRevision4.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -5484,7 +5479,7 @@ void tst_qdeclarativeecmascript::revision() void tst_qdeclarativeecmascript::realToInt() { - QDeclarativeComponent component(&engine, TEST_FILE("realToInt.qml")); + QDeclarativeComponent component(&engine, testFileUrl("realToInt.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); @@ -5497,7 +5492,7 @@ void tst_qdeclarativeecmascript::realToInt() void tst_qdeclarativeecmascript::urlProperty() { { - QDeclarativeComponent component(&engine, TEST_FILE("urlProperty.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("urlProperty.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); object->setStringProperty("http://qt-project.org"); @@ -5510,7 +5505,7 @@ void tst_qdeclarativeecmascript::urlProperty() void tst_qdeclarativeecmascript::dynamicString() { - QDeclarativeComponent component(&engine, TEST_FILE("dynamicString.qml")); + QDeclarativeComponent component(&engine, testFileUrl("dynamicString.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("stringProperty").toString(), @@ -5519,14 +5514,14 @@ void tst_qdeclarativeecmascript::dynamicString() void tst_qdeclarativeecmascript::automaticSemicolon() { - QDeclarativeComponent component(&engine, TEST_FILE("automaticSemicolon.qml")); + QDeclarativeComponent component(&engine, testFileUrl("automaticSemicolon.qml")); QObject *object = component.create(); QVERIFY(object != 0); } void tst_qdeclarativeecmascript::unaryExpression() { - QDeclarativeComponent component(&engine, TEST_FILE("unaryExpression.qml")); + QDeclarativeComponent component(&engine, testFileUrl("unaryExpression.qml")); QObject *object = component.create(); QVERIFY(object != 0); } @@ -5534,7 +5529,7 @@ void tst_qdeclarativeecmascript::unaryExpression() // Makes sure that a binding isn't double re-evaluated when it depends on the same variable twice void tst_qdeclarativeecmascript::doubleEvaluate() { - QDeclarativeComponent component(&engine, TEST_FILE("doubleEvaluate.qml")); + QDeclarativeComponent component(&engine, testFileUrl("doubleEvaluate.qml")); QObject *object = component.create(); QVERIFY(object != 0); WriteCounter *wc = qobject_cast<WriteCounter *>(object); @@ -5557,7 +5552,7 @@ static void captureMsgHandler(QtMsgType, const char *msg) void tst_qdeclarativeecmascript::nonNotifyable() { QV4Compiler::enableV4(false); - QDeclarativeComponent component(&engine, TEST_FILE("nonNotifyable.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nonNotifyable.qml")); QV4Compiler::enableV4(true); QtMsgHandler old = qInstallMsgHandler(captureMsgHandler); @@ -5583,7 +5578,7 @@ void tst_qdeclarativeecmascript::nonNotifyable() void tst_qdeclarativeecmascript::forInLoop() { - QDeclarativeComponent component(&engine, TEST_FILE("forInLoop.qml")); + QDeclarativeComponent component(&engine, testFileUrl("forInLoop.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -5603,7 +5598,7 @@ void tst_qdeclarativeecmascript::forInLoop() // An object the binding depends on is deleted while the binding is still running void tst_qdeclarativeecmascript::deleteWhileBindingRunning() { - QDeclarativeComponent component(&engine, TEST_FILE("deleteWhileBindingRunning.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deleteWhileBindingRunning.qml")); QObject *object = component.create(); QVERIFY(object != 0); delete object; @@ -5615,7 +5610,7 @@ void tst_qdeclarativeecmascript::qtbug_22679() object.setStringProperty(QLatin1String("Please work correctly")); engine.rootContext()->setContextProperty("contextProp", &object); - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_22679.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_22679.qml")); qRegisterMetaType<QList<QDeclarativeError> >("QList<QDeclarativeError>"); QSignalSpy warningsSpy(&engine, SIGNAL(warnings(QList<QDeclarativeError>))); @@ -5642,7 +5637,7 @@ void tst_qdeclarativeecmascript::qtbug_22843() fileName += QLatin1String(".library"); fileName += QLatin1String(".qml"); - QDeclarativeComponent component(&engine, TEST_FILE(fileName)); + QDeclarativeComponent component(&engine, testFileUrl(fileName)); QString url = component.url().toString(); QString warning1 = url.left(url.length()-3) + QLatin1String("js:4: SyntaxError: Unexpected token )"); QString warning2 = url + QLatin1String(":5: TypeError: Object [object Object] has no method 'func'"); @@ -5669,7 +5664,7 @@ void tst_qdeclarativeecmascript::qtbug_22843() void tst_qdeclarativeecmascript::switchStatement() { { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5692,7 +5687,7 @@ void tst_qdeclarativeecmascript::switchStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5715,7 +5710,7 @@ void tst_qdeclarativeecmascript::switchStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.3.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5738,7 +5733,7 @@ void tst_qdeclarativeecmascript::switchStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.4.qml")); QString warning = component.url().toString() + ":4: Unable to assign [undefined] to int"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -5766,7 +5761,7 @@ void tst_qdeclarativeecmascript::switchStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.5.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5789,7 +5784,7 @@ void tst_qdeclarativeecmascript::switchStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.6.qml")); + QDeclarativeComponent component(&engine, testFileUrl("switchStatement.6.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5815,7 +5810,7 @@ void tst_qdeclarativeecmascript::switchStatement() void tst_qdeclarativeecmascript::withStatement() { { - QDeclarativeComponent component(&engine, TEST_FILE("withStatement.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("withStatement.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5826,7 +5821,7 @@ void tst_qdeclarativeecmascript::withStatement() void tst_qdeclarativeecmascript::tryStatement() { { - QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("tryStatement.1.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5834,7 +5829,7 @@ void tst_qdeclarativeecmascript::tryStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("tryStatement.2.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5842,7 +5837,7 @@ void tst_qdeclarativeecmascript::tryStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("tryStatement.3.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); @@ -5850,7 +5845,7 @@ void tst_qdeclarativeecmascript::tryStatement() } { - QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("tryStatement.4.qml")); MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create()); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index 11f6beadf0..5d0bb98376 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeerror -SOURCES += tst_qdeclarativeerror.cpp +SOURCES += tst_qdeclarativeerror.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp index 8fab5e5e50..3f204de2bd 100644 --- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp +++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include "../../shared/util.h" -class tst_qdeclarativeerror : public QObject +class tst_qdeclarativeerror : public QDeclarativeDataTest { Q_OBJECT private slots: @@ -208,7 +208,7 @@ void tst_qdeclarativeerror::debug() } { - QUrl url(QUrl::fromLocalFile(TESTDATA("")).resolved(QUrl("test.txt"))); + QUrl url(dataDirectoryUrl().resolved(QUrl("test.txt"))); QDeclarativeError error; error.setUrl(url); error.setDescription("An Error"); @@ -222,7 +222,7 @@ void tst_qdeclarativeerror::debug() } { - QUrl url(QUrl::fromLocalFile(TESTDATA("")).resolved(QUrl("foo.txt"))); + QUrl url(dataDirectoryUrl().resolved(QUrl("foo.txt"))); QDeclarativeError error; error.setUrl(url); error.setDescription("An Error"); diff --git a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro index 8807e7a2e2..d9c2da603b 100644 --- a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro +++ b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeexpression macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeexpression.cpp +SOURCES += tst_qdeclarativeexpression.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp index f7699e2bac..9257885082 100644 --- a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp +++ b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp @@ -46,7 +46,7 @@ #include <QtDeclarative/qdeclarativescriptstring.h> #include "../../shared/util.h" -class tst_qdeclarativeexpression : public QObject +class tst_qdeclarativeexpression : public QDeclarativeDataTest { Q_OBJECT public: @@ -83,7 +83,7 @@ void tst_qdeclarativeexpression::scriptString() qmlRegisterType<TestObject>("Test", 1, 0, "TestObject"); QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("scriptString.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("scriptString.qml")); TestObject *testObj = qobject_cast<TestObject*>(c.create()); QVERIFY(testObj != 0); diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index b59d39f629..5f337161b9 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativefolderlistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativefolderlistmodel.cpp +SOURCES += tst_qdeclarativefolderlistmodel.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index f85a6f14b6..41f15f91b3 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -53,7 +53,7 @@ const int FileNameRole = Qt::UserRole+1; const int FilePathRole = Qt::UserRole+2; enum SortField { Unsorted, Name, Time, Size, Type }; -class tst_qdeclarativefolderlistmodel : public QObject +class tst_qdeclarativefolderlistmodel : public QDeclarativeDataTest { Q_OBJECT public: @@ -98,16 +98,16 @@ void tst_qdeclarativefolderlistmodel::checkNoErrors(const QDeclarativeComponent& void tst_qdeclarativefolderlistmodel::basicProperties() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("basic.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("basic.qml")); checkNoErrors(component); QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create()); QVERIFY(flm != 0); - flm->setProperty("folder",QUrl::fromLocalFile(TESTDATA(""))); + flm->setProperty("folder", dataDirectoryUrl()); QTRY_COMPARE(flm->property("count").toInt(),4); // wait for refresh - QCOMPARE(flm->property("folder").toUrl(), QUrl::fromLocalFile(TESTDATA(""))); - QCOMPARE(flm->property("parentFolder").toUrl(), QUrl::fromLocalFile(QDir(TESTDATA("..")).canonicalPath())); + QCOMPARE(flm->property("folder").toUrl(), dataDirectoryUrl()); + QCOMPARE(flm->property("parentFolder").toUrl(), QUrl::fromLocalFile(QDir(directory()).canonicalPath())); QCOMPARE(flm->property("sortField").toInt(), int(Name)); QCOMPARE(flm->property("nameFilters").toStringList(), QStringList() << "*.qml"); QCOMPARE(flm->property("sortReversed").toBool(), false); @@ -124,7 +124,7 @@ void tst_qdeclarativefolderlistmodel::basicProperties() void tst_qdeclarativefolderlistmodel::resetFiltering() { // see QTBUG-17837 - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("resetFiltering.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("resetFiltering.qml")); checkNoErrors(component); QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create()); @@ -133,19 +133,19 @@ void tst_qdeclarativefolderlistmodel::resetFiltering() connect(flm, SIGNAL(rowsRemoved(const QModelIndex&,int,int)), this, SLOT(removed(const QModelIndex&,int,int))); - flm->setProperty("folder",QUrl::fromLocalFile(TESTDATA("resetfiltering"))); + flm->setProperty("folder", testFileUrl("resetfiltering")); QTRY_COMPARE(flm->property("count").toInt(),1); // should just be "test.txt" visible int count = flm->rowCount(); QCOMPARE(removeStart, 0); QCOMPARE(removeEnd, count-1); - flm->setProperty("folder",QUrl::fromLocalFile(TESTDATA("resetfiltering/innerdir"))); + flm->setProperty("folder", testFileUrl("resetfiltering/innerdir")); QTRY_COMPARE(flm->property("count").toInt(),1); // should just be "test2.txt" visible count = flm->rowCount(); QCOMPARE(removeStart, 0); QCOMPARE(removeEnd, count-1); - flm->setProperty("folder",QUrl::fromLocalFile(TESTDATA("resetfiltering"))); + flm->setProperty("folder", testFileUrl("resetfiltering")); QTRY_COMPARE(flm->property("count").toInt(),1); // should just be "test.txt" visible count = flm->rowCount(); QCOMPARE(removeStart, 0); @@ -154,13 +154,13 @@ void tst_qdeclarativefolderlistmodel::resetFiltering() void tst_qdeclarativefolderlistmodel::refresh() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("basic.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("basic.qml")); checkNoErrors(component); QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create()); QVERIFY(flm != 0); - flm->setProperty("folder",QUrl::fromLocalFile(TESTDATA(""))); + flm->setProperty("folder", dataDirectoryUrl()); QTRY_COMPARE(flm->property("count").toInt(),4); // wait for refresh int count = flm->rowCount(); diff --git a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro index 11725b40bc..947b16010b 100644 --- a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro +++ b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro @@ -3,8 +3,11 @@ TARGET = tst_qdeclarativeincubator macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeincubator.cpp \ - testtypes.cpp -HEADERS += testtypes.h + testtypes.cpp \ + ../../shared/util.cpp + +HEADERS += testtypes.h \ + ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index 599b5d21b1..151f7880c8 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -53,17 +53,7 @@ #include <QDeclarativeIncubator> #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativeincubator : public QObject +class tst_qdeclarativeincubator : public QDeclarativeDataTest { Q_OBJECT public: @@ -101,7 +91,7 @@ private: QVERIFY(!component.isError()); \ QVERIFY(component.errors().isEmpty()); \ } else { \ - QFile file(TESTDATA(errorfile)); \ + QFile file(QDeclarativeDataTest::instance()->testFile(errorfile)); \ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ file.close(); \ @@ -123,6 +113,7 @@ private: void tst_qdeclarativeincubator::initTestCase() { + QDeclarativeDataTest::initTestCase(); registerTypes(); engine.setIncubationController(&controller); } @@ -151,7 +142,7 @@ void tst_qdeclarativeincubator::objectDeleted() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("objectDeleted.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectDeleted.qml")); QVERIFY(component.isReady()); QDeclarativeIncubator incubator; @@ -184,7 +175,7 @@ void tst_qdeclarativeincubator::clear() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("clear.qml")); + QDeclarativeComponent component(&engine, testFileUrl("clear.qml")); QVERIFY(component.isReady()); // Clear in null state @@ -252,7 +243,7 @@ void tst_qdeclarativeincubator::noIncubationController() // All incubators should behave synchronously when there is no controller QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("noIncubationController.qml")); + QDeclarativeComponent component(&engine, testFileUrl("noIncubationController.qml")); QVERIFY(component.isReady()); @@ -286,7 +277,7 @@ void tst_qdeclarativeincubator::noIncubationController() void tst_qdeclarativeincubator::forceCompletion() { - QDeclarativeComponent component(&engine, TEST_FILE("forceCompletion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("forceCompletion.qml")); QVERIFY(component.isReady()); { @@ -364,7 +355,7 @@ void tst_qdeclarativeincubator::forceCompletion() void tst_qdeclarativeincubator::setInitialState() { - QDeclarativeComponent component(&engine, TEST_FILE("setInitialState.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setInitialState.qml")); QVERIFY(component.isReady()); struct MyIncubator : public QDeclarativeIncubator @@ -409,7 +400,7 @@ void tst_qdeclarativeincubator::clearDuringCompletion() CompletionRegisteringType::clearMe(); SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("clearDuringCompletion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("clearDuringCompletion.qml")); QVERIFY(component.isReady()); QDeclarativeIncubator incubator; @@ -437,7 +428,7 @@ void tst_qdeclarativeincubator::clearDuringCompletion() void tst_qdeclarativeincubator::objectDeletionAfterInit() { - QDeclarativeComponent component(&engine, TEST_FILE("clear.qml")); + QDeclarativeComponent component(&engine, testFileUrl("clear.qml")); QVERIFY(component.isReady()); struct MyIncubator : public QDeclarativeIncubator @@ -493,7 +484,7 @@ public: void start() { incubator = new MyIncubator(QDeclarativeIncubator::Synchronous, this); - component = new QDeclarativeComponent(engine, TEST_FILE("recursiveClear.1.qml")); + component = new QDeclarativeComponent(engine, QDeclarativeDataTest::instance()->testFileUrl("recursiveClear.1.qml")); component->create(*incubator); } @@ -505,7 +496,7 @@ public slots: void switchIt() { component->deleteLater(); incubator->clear(); - component = new QDeclarativeComponent(engine, TEST_FILE("recursiveClear.2.qml")); + component = new QDeclarativeComponent(engine, QDeclarativeDataTest::instance()->testFileUrl("recursiveClear.2.qml")); component->create(*incubator); } }; @@ -531,7 +522,7 @@ void tst_qdeclarativeincubator::statusChanged() }; { - QDeclarativeComponent component(&engine, TEST_FILE("statusChanged.qml")); + QDeclarativeComponent component(&engine, testFileUrl("statusChanged.qml")); QVERIFY(component.isReady()); MyIncubator incubator(QDeclarativeIncubator::Synchronous); @@ -545,7 +536,7 @@ void tst_qdeclarativeincubator::statusChanged() } { - QDeclarativeComponent component(&engine, TEST_FILE("statusChanged.qml")); + QDeclarativeComponent component(&engine, testFileUrl("statusChanged.qml")); QVERIFY(component.isReady()); MyIncubator incubator(QDeclarativeIncubator::Asynchronous); @@ -567,7 +558,7 @@ void tst_qdeclarativeincubator::statusChanged() } { - QDeclarativeComponent component2(&engine, TEST_FILE("statusChanged.nested.qml")); + QDeclarativeComponent component2(&engine, testFileUrl("statusChanged.nested.qml")); QVERIFY(component2.isReady()); MyIncubator incubator(QDeclarativeIncubator::Asynchronous); @@ -594,7 +585,7 @@ void tst_qdeclarativeincubator::asynchronousIfNested() { // Asynchronous if nested within a finalized context behaves synchronously { - QDeclarativeComponent component(&engine, TEST_FILE("asynchronousIfNested.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("asynchronousIfNested.1.qml")); QVERIFY(component.isReady()); QObject *object = component.create(); @@ -616,7 +607,7 @@ void tst_qdeclarativeincubator::asynchronousIfNested() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("asynchronousIfNested.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("asynchronousIfNested.2.qml")); QVERIFY(component.isReady()); QDeclarativeIncubator incubator; @@ -661,7 +652,7 @@ void tst_qdeclarativeincubator::asynchronousIfNested() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("asynchronousIfNested.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("asynchronousIfNested.3.qml")); QVERIFY(component.isReady()); struct CallbackData { @@ -671,7 +662,7 @@ void tst_qdeclarativeincubator::asynchronousIfNested() static void callback(CallbackRegisteringType *o, void *data) { CallbackData *d = (CallbackData *)data; - QDeclarativeComponent c(d->engine, TEST_FILE("asynchronousIfNested.1.qml")); + QDeclarativeComponent c(d->engine, QDeclarativeDataTest::instance()->testFileUrl("asynchronousIfNested.1.qml")); if (!c.isReady()) return; QDeclarativeIncubator incubator(QDeclarativeIncubator::AsynchronousIfNested); @@ -700,7 +691,7 @@ void tst_qdeclarativeincubator::asynchronousIfNested() void tst_qdeclarativeincubator::nestedComponent() { - QDeclarativeComponent component(&engine, TEST_FILE("nestedComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nestedComponent.qml")); QVERIFY(component.isReady()); QObject *object = component.create(); @@ -735,7 +726,7 @@ void tst_qdeclarativeincubator::chainedAsynchronousIfNested() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("chainedAsynchronousIfNested.qml")); + QDeclarativeComponent component(&engine, testFileUrl("chainedAsynchronousIfNested.qml")); QVERIFY(component.isReady()); QDeclarativeIncubator incubator(QDeclarativeIncubator::Asynchronous); @@ -819,10 +810,10 @@ void tst_qdeclarativeincubator::chainedAsynchronousIfNestedOnCompleted() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("chainInCompletion.qml")); + QDeclarativeComponent component(&engine, testFileUrl("chainInCompletion.qml")); QVERIFY(component.isReady()); - QDeclarativeComponent c1(&engine, TEST_FILE("chainedAsynchronousIfNested.qml")); + QDeclarativeComponent c1(&engine, testFileUrl("chainedAsynchronousIfNested.qml")); QVERIFY(c1.isReady()); struct MyIncubator : public QDeclarativeIncubator { @@ -962,7 +953,7 @@ void tst_qdeclarativeincubator::selfDelete() }; { - QDeclarativeComponent component(&engine, TEST_FILE("selfDelete.qml")); + QDeclarativeComponent component(&engine, testFileUrl("selfDelete.qml")); #define DELETE_TEST(status, mode) { \ bool done = false; \ @@ -984,7 +975,7 @@ void tst_qdeclarativeincubator::selfDelete() { SelfRegisteringType::clearMe(); - QDeclarativeComponent component(&engine, TEST_FILE("objectDeleted.qml")); + QDeclarativeComponent component(&engine, testFileUrl("objectDeleted.qml")); QVERIFY(component.isReady()); bool done = false; @@ -1019,7 +1010,7 @@ void tst_qdeclarativeincubator::selfDelete() void tst_qdeclarativeincubator::contextDelete() { QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); - QDeclarativeComponent component(&engine, TEST_FILE("contextDelete.qml")); + QDeclarativeComponent component(&engine, testFileUrl("contextDelete.qml")); QDeclarativeIncubator incubator; component.create(incubator, context); diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index bd8d963f3f..8d09720670 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeinfo macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeinfo.cpp +SOURCES += tst_qdeclarativeinfo.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index d4e3df2ffb..8fdd810037 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -47,7 +47,7 @@ #include <qdeclarativeinfo.h> #include "../../shared/util.h" -class tst_qdeclarativeinfo : public QObject +class tst_qdeclarativeinfo : public QDeclarativeDataTest { Q_OBJECT public: @@ -67,14 +67,9 @@ private: QDeclarativeEngine engine; }; -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - void tst_qdeclarativeinfo::qmlObject() { - QDeclarativeComponent component(&engine, TEST_FILE("qmlObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qmlObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -93,7 +88,7 @@ void tst_qdeclarativeinfo::qmlObject() void tst_qdeclarativeinfo::nestedQmlObject() { - QDeclarativeComponent component(&engine, TEST_FILE("nestedQmlObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nestedQmlObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -107,14 +102,14 @@ void tst_qdeclarativeinfo::nestedQmlObject() QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); qmlInfo(nested) << "Outer Object"; - message = TEST_FILE("NestedObject.qml").toString() + ":6:14: QML QtObject: Inner Object"; + message = testFileUrl("NestedObject.qml").toString() + ":6:14: QML QtObject: Inner Object"; QTest::ignoreMessage(QtWarningMsg, qPrintable(message)); qmlInfo(nested2) << "Inner Object"; } void tst_qdeclarativeinfo::nestedComponent() { - QDeclarativeComponent component(&engine, TEST_FILE("NestedComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("NestedComponent.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index ae3aa9d287..460bbfea5e 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelistmodel.cpp +SOURCES += tst_qdeclarativelistmodel.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 1de2a2868e..0455fdeadd 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -81,7 +81,7 @@ static bool isValidErrorMessage(const QString &msg, bool dynamicRoleTest) return valid; } -class tst_qdeclarativelistmodel : public QObject +class tst_qdeclarativelistmodel : public QDeclarativeDataTest { Q_OBJECT public: @@ -622,7 +622,7 @@ void tst_qdeclarativelistmodel::dynamic_worker() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("model.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -673,7 +673,7 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("model.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -704,7 +704,7 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync() void tst_qdeclarativelistmodel::enumerate() { QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("enumerate.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("enumerate.qml")); QVERIFY(!component.isError()); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item != 0); @@ -950,7 +950,7 @@ void tst_qdeclarativelistmodel::get_worker() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("model.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -1102,7 +1102,7 @@ void tst_qdeclarativelistmodel::get_nested_data() void tst_qdeclarativelistmodel::crash_model_with_multiple_roles() { QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("multipleroles.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("multipleroles.qml")); QObject *rootItem = component.create(); QVERIFY(component.errorString().isEmpty()); QVERIFY(rootItem != 0); @@ -1119,7 +1119,7 @@ void tst_qdeclarativelistmodel::crash_model_with_multiple_roles() void tst_qdeclarativelistmodel::set_model_cache() { QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("setmodelcachelist.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("setmodelcachelist.qml")); QObject *model = component.create(); QVERIFY2(component.errorString().isEmpty(), QTest::toString(component.errorString())); QVERIFY(model != 0); @@ -1271,7 +1271,7 @@ void tst_qdeclarativelistmodel::property_changes_worker() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8()); QQuickItem *item = createWorkerTest(&engine, &component, &model); QVERIFY(item != 0); @@ -1362,7 +1362,7 @@ void tst_qdeclarativelistmodel::signal_handlers() QFETCH(bool, dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("signalhandlers.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("signalhandlers.qml")); QObject *model = component.create(); QDeclarativeListModel *lm = qobject_cast<QDeclarativeListModel *>(model); QVERIFY(lm != 0); @@ -1389,7 +1389,7 @@ void tst_qdeclarativelistmodel::worker_sync() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("workersync.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("workersync.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -1454,7 +1454,7 @@ void tst_qdeclarativelistmodel::worker_remove_element() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("workerremoveelement.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("workerremoveelement.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -1495,7 +1495,7 @@ void tst_qdeclarativelistmodel::worker_remove_list() QDeclarativeListModel model; model.setDynamicRoles(dynamicRoles); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, QUrl::fromLocalFile(TESTDATA("workerremovelist.qml"))); + QDeclarativeComponent component(&eng, testFileUrl("workerremovelist.qml")); QQuickItem *item = createWorkerTest(&eng, &component, &model); QVERIFY(item != 0); @@ -1577,7 +1577,7 @@ void tst_qdeclarativelistmodel::dynamic_role() QDeclarativeListModel model; model.setDynamicRoles(true); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QQuickItem *item = createWorkerTest(&engine, &component, &model); QVERIFY(item != 0); diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 5020c02f43..37778aab5b 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelistreference macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelistreference.cpp +SOURCES += tst_qdeclarativelistreference.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index e09db2c9c7..3031d68b42 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -51,17 +51,7 @@ #include <QDebug> #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativelistreference : public QObject +class tst_qdeclarativelistreference : public QDeclarativeDataTest { Q_OBJECT public: @@ -105,6 +95,7 @@ public: void tst_qdeclarativelistreference::initTestCase() { + QDeclarativeDataTest::initTestCase(); qmlRegisterType<TestType>(); } @@ -540,7 +531,7 @@ void tst_qdeclarativelistreference::qmlmetaproperty() void tst_qdeclarativelistreference::engineTypes() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("engineTypes.qml")); QObject *o = component.create(); QVERIFY(o); @@ -563,7 +554,7 @@ void tst_qdeclarativelistreference::engineTypes() void tst_qdeclarativelistreference::variantToList() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml")); + QDeclarativeComponent component(&engine, testFileUrl("variantToList.qml")); QObject *o = component.create(); QVERIFY(o); diff --git a/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro b/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro index 05ce0fec6a..c01bacf832 100644 --- a/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro +++ b/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelocale macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelocale.cpp +SOURCES += tst_qdeclarativelocale.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp index d49122c889..9495e57ee5 100644 --- a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp +++ b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp @@ -47,7 +47,7 @@ #include <qcolor.h> #include "../../shared/util.h" -class tst_qdeclarativelocale : public QObject +class tst_qdeclarativelocale : public QDeclarativeDataTest { Q_OBJECT public: @@ -118,7 +118,7 @@ private: void tst_qdeclarativelocale::defaultLocale() { - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -183,7 +183,7 @@ void tst_qdeclarativelocale::properties() QFETCH(QByteArray, property); QFETCH(QVariant, value); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -227,7 +227,7 @@ void tst_qdeclarativelocale::currencySymbol() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -287,7 +287,7 @@ void tst_qdeclarativelocale::monthName() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -324,7 +324,7 @@ void tst_qdeclarativelocale::standaloneMonthName() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -361,7 +361,7 @@ void tst_qdeclarativelocale::dayName() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -397,7 +397,7 @@ void tst_qdeclarativelocale::standaloneDayName() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -437,7 +437,7 @@ void tst_qdeclarativelocale::weekDays() { QFETCH(QString, locale); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -474,7 +474,7 @@ void tst_qdeclarativelocale::dateTimeFormat() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -503,7 +503,7 @@ void tst_qdeclarativelocale::dateFormat() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -532,7 +532,7 @@ void tst_qdeclarativelocale::timeFormat() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("functions.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("functions.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -561,7 +561,7 @@ void tst_qdeclarativelocale::dateToLocaleString() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -622,7 +622,7 @@ void tst_qdeclarativelocale::dateToLocaleStringFormatted() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -653,7 +653,7 @@ void tst_qdeclarativelocale::dateToLocaleDateString() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -714,7 +714,7 @@ void tst_qdeclarativelocale::dateToLocaleDateStringFormatted() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -745,7 +745,7 @@ void tst_qdeclarativelocale::dateToLocaleTimeString() QFETCH(QString, locale); QFETCH(int, param); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -806,7 +806,7 @@ void tst_qdeclarativelocale::dateToLocaleTimeStringFormatted() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -848,7 +848,7 @@ void tst_qdeclarativelocale::dateFromLocaleString() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -892,7 +892,7 @@ void tst_qdeclarativelocale::dateFromLocaleDateString() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -936,7 +936,7 @@ void tst_qdeclarativelocale::dateFromLocaleTimeString() QFETCH(QString, locale); QFETCH(QString, format); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("date.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("date.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -981,7 +981,7 @@ void tst_qdeclarativelocale::numberToLocaleString() QFETCH(char, format); QFETCH(int, prec); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("number.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("number.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -1022,7 +1022,7 @@ void tst_qdeclarativelocale::numberToLocaleCurrencyString() QFETCH(QString, locale); QFETCH(QString, symbol); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("number.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("number.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -1062,7 +1062,7 @@ void tst_qdeclarativelocale::numberFromLocaleString() QFETCH(QString, locale); QFETCH(double, number); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("number.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("number.qml")); QObject *obj = c.create(); QVERIFY(obj); @@ -1083,7 +1083,7 @@ void tst_qdeclarativelocale::numberFromLocaleString() void tst_qdeclarativelocale::numberConstToLocaleString() { - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("number.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("number.qml")); QObject *obj = c.create(); QVERIFY(obj); diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 1530eb9d36..c51918d13a 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -51,15 +51,13 @@ #define SERVER_PORT 14450 -class tst_qdeclarativemoduleplugin : public QObject +class tst_qdeclarativemoduleplugin : public QDeclarativeDataTest { Q_OBJECT public: - tst_qdeclarativemoduleplugin() - { - } private slots: + virtual void initTestCase(); void importsPlugin(); void importsPlugin2(); void importsPlugin21(); @@ -72,8 +70,19 @@ private slots: void versionNotInstalled_data(); void implicitQmldir(); void implicitQmldir_data(); + +private: + QString m_importsDirectory; }; +void tst_qdeclarativemoduleplugin::initTestCase() +{ + QDeclarativeDataTest::initTestCase(); + m_importsDirectory = directory() + QStringLiteral("/imports"); + QVERIFY2(QFileInfo(m_importsDirectory).isDir(), + qPrintable(QString::fromLatin1("Imports directory '%1' does not exist.").arg(m_importsDirectory))); +} + #define VERIFY_ERRORS(errorfile) \ if (!errorfile) { \ if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \ @@ -81,7 +90,7 @@ private slots: QVERIFY(!component.isError()); \ QVERIFY(component.errors().isEmpty()); \ } else { \ - QString verify_errors_file_name = TESTDATA(errorfile); \ + QString verify_errors_file_name = testFile(errorfile); \ QFile file(verify_errors_file_name); \ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ @@ -101,7 +110,7 @@ private slots: qWarning() << "Expected:" << expected << "Actual:" << actual; \ } \ if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\ - QFile file(TESTDATA(errorfile)); \ + QFile file(testFile(errorfile)); \ QVERIFY(file.open(QIODevice::WriteOnly)); \ for (int ii = 0; ii < actual.count(); ++ii) { \ file.write(actual.at(ii)); file.write("\n"); \ @@ -112,40 +121,13 @@ private slots: } \ } -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -QString IMPORTSDIR() -{ - // Try to find it relative to the binary. - QDir appDir(QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("imports")); - if (appDir.exists()) { - return appDir.absolutePath(); - } - - // Else try to find it in the source tree - QDir sourceDir(QFileInfo(__FILE__).absoluteDir().filePath(QLatin1String("imports"))); - if (sourceDir.exists()) { - return sourceDir.absolutePath(); - } - - qWarning("requested importsPath could not be found (looked at: %s, %s)", - qPrintable(appDir.path()), - qPrintable(sourceDir.path()) - ); - - return QString(); -} - void tst_qdeclarativemoduleplugin::importsPlugin() { QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin created"); QTest::ignoreMessage(QtWarningMsg, "import worked"); - QDeclarativeComponent component(&engine, TEST_FILE("works.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works.qml"))); foreach (QDeclarativeError err, component.errors()) qWarning() << err; VERIFY_ERRORS(0); @@ -158,10 +140,10 @@ void tst_qdeclarativemoduleplugin::importsPlugin() void tst_qdeclarativemoduleplugin::importsPlugin2() { QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin2 created"); QTest::ignoreMessage(QtWarningMsg, "import2 worked"); - QDeclarativeComponent component(&engine, TEST_FILE("works2.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works2.qml"))); foreach (QDeclarativeError err, component.errors()) qWarning() << err; VERIFY_ERRORS(0); @@ -174,10 +156,10 @@ void tst_qdeclarativemoduleplugin::importsPlugin2() void tst_qdeclarativemoduleplugin::importsPlugin21() { QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin2.1 created"); QTest::ignoreMessage(QtWarningMsg, "import2.1 worked"); - QDeclarativeComponent component(&engine, TEST_FILE("works21.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("works21.qml"))); foreach (QDeclarativeError err, component.errors()) qWarning() << err; VERIFY_ERRORS(0); @@ -190,9 +172,9 @@ void tst_qdeclarativemoduleplugin::importsPlugin21() void tst_qdeclarativemoduleplugin::incorrectPluginCase() { QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); - QDeclarativeComponent component(&engine, TEST_FILE("incorrectCase.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("incorrectCase.qml"))); QList<QDeclarativeError> errors = component.errors(); QCOMPARE(errors.count(), 1); @@ -203,7 +185,7 @@ void tst_qdeclarativemoduleplugin::incorrectPluginCase() #elif defined(Q_OS_WIN32) QString libname = "PluGin.dll"; #endif - QString expectedError = QLatin1String("plugin cannot be loaded for module \"com.nokia.WrongCase\": File name case mismatch for \"") + QDir(IMPORTSDIR()).filePath("com/nokia/WrongCase/" + libname) + QLatin1String("\""); + QString expectedError = QLatin1String("plugin cannot be loaded for module \"com.nokia.WrongCase\": File name case mismatch for \"") + QDir(m_importsDirectory).filePath("com/nokia/WrongCase/" + libname) + QLatin1String("\""); #else QString expectedError = QLatin1String("module \"com.nokia.WrongCase\" plugin \"PluGin\" not found"); #endif @@ -213,7 +195,7 @@ void tst_qdeclarativemoduleplugin::incorrectPluginCase() void tst_qdeclarativemoduleplugin::importPluginWithQmlFile() { - QString path = IMPORTSDIR(); + QString path = m_importsDirectory; // QTBUG-16885: adding an import path with a lower-case "c:" causes assert failure // (this only happens if the plugin includes pure QML files) @@ -225,7 +207,7 @@ void tst_qdeclarativemoduleplugin::importPluginWithQmlFile() QDeclarativeEngine engine; engine.addImportPath(path); - QDeclarativeComponent component(&engine, TEST_FILE("pluginWithQmlFile.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("pluginWithQmlFile.qml"))); foreach (QDeclarativeError err, component.errors()) qWarning() << err; VERIFY_ERRORS(0); @@ -238,7 +220,7 @@ void tst_qdeclarativemoduleplugin::remoteImportWithQuotedUrl() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(IMPORTSDIR()); + server.serveDirectory(m_importsDirectory); QDeclarativeEngine engine; QDeclarativeComponent component(&engine); @@ -259,10 +241,10 @@ void tst_qdeclarativemoduleplugin::remoteImportWithUnquotedUri() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(IMPORTSDIR()); + server.serveDirectory(m_importsDirectory); QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); QDeclarativeComponent component(&engine); component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); @@ -279,25 +261,26 @@ void tst_qdeclarativemoduleplugin::remoteImportWithUnquotedUri() } // QTBUG-17324 + void tst_qdeclarativemoduleplugin::importsMixedQmlCppPlugin() { QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); { - QDeclarativeComponent component(&engine, TEST_FILE("importsMixedQmlCppPlugin.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("importsMixedQmlCppPlugin.qml"))); QObject *o = component.create(); - QVERIFY(o != 0); + QVERIFY2(o != 0, QDeclarativeDataTest::msgComponentError(component, &engine)); QCOMPARE(o->property("test").toBool(), true); delete o; } { - QDeclarativeComponent component(&engine, TEST_FILE("importsMixedQmlCppPlugin.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl(QStringLiteral("importsMixedQmlCppPlugin.2.qml"))); QObject *o = component.create(); - QVERIFY(o != 0); + QVERIFY2(o != 0, QDeclarativeDataTest::msgComponentError(component, &engine)); QCOMPARE(o->property("test").toBool(), true); QCOMPARE(o->property("test2").toBool(), true); delete o; @@ -321,9 +304,9 @@ void tst_qdeclarativemoduleplugin::versionNotInstalled() QFETCH(QString, errorFile); QDeclarativeEngine engine; - engine.addImportPath(IMPORTSDIR()); + engine.addImportPath(m_importsDirectory); - QDeclarativeComponent component(&engine, TEST_FILE(file)); + QDeclarativeComponent component(&engine, testFileUrl(file)); VERIFY_ERRORS(errorFile.toLatin1().constData()); } @@ -347,15 +330,15 @@ void tst_qdeclarativemoduleplugin::implicitQmldir() QFETCH(QString, file); QFETCH(QString, errorFile); - QString importPath = TESTDATA(directory); + QString importPath = testFile(directory); QString fileName = directory + QDir::separator() + file; QString errorFileName = directory + QDir::separator() + errorFile; - QUrl testFileUrl = TEST_FILE(fileName); + QUrl testUrl = testFileUrl(fileName); QDeclarativeEngine engine; engine.addImportPath(importPath); - QDeclarativeComponent component(&engine, testFileUrl); + QDeclarativeComponent component(&engine, testUrl); QList<QDeclarativeError> errors = component.errors(); VERIFY_ERRORS(errorFileName.toLatin1().constData()); QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index bec727f05f..551d8eac5d 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,9 +1,11 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -HEADERS = ../../shared/testhttpserver.h +HEADERS = ../../shared/testhttpserver.h \ + ../../shared/util.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ - ../../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index 310fa94214..bf81e1c357 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeproperty macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeproperty.cpp +SOURCES += tst_qdeclarativeproperty.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index b1aad3a34b..0160b30b2a 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -49,11 +49,6 @@ #include <QtCore/qdir.h> #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - class MyQmlObject : public QObject { Q_OBJECT @@ -97,7 +92,7 @@ private: QML_DECLARE_TYPE(MyContainer); QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES) -class tst_qdeclarativeproperty : public QObject +class tst_qdeclarativeproperty : public QDeclarativeDataTest { Q_OBJECT public: @@ -1000,7 +995,7 @@ void tst_qdeclarativeproperty::read() QVERIFY(qvariant_cast<QObject *>(v) == o.qmlObject()); } { - QDeclarativeComponent component(&engine, TEST_FILE("readSynthesizedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("readSynthesizedObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1015,7 +1010,7 @@ void tst_qdeclarativeproperty::read() QCOMPARE(qvariant_cast<QObject *>(v)->property("b").toInt(), 19); } { // static - QDeclarativeComponent component(&engine, TEST_FILE("readSynthesizedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("readSynthesizedObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1370,7 +1365,7 @@ void tst_qdeclarativeproperty::crashOnValueProperty() // QTBUG-13719 void tst_qdeclarativeproperty::aliasPropertyBindings() { - QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyBindings.qml")); + QDeclarativeComponent component(&engine, testFileUrl("aliasPropertyBindings.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1479,8 +1474,8 @@ void tst_qdeclarativeproperty::copy() void tst_qdeclarativeproperty::noContext() { - QDeclarativeComponent compA(&engine, TEST_FILE("NoContextTypeA.qml")); - QDeclarativeComponent compB(&engine, TEST_FILE("NoContextTypeB.qml")); + QDeclarativeComponent compA(&engine, testFileUrl("NoContextTypeA.qml")); + QDeclarativeComponent compB(&engine, testFileUrl("NoContextTypeB.qml")); QObject *a = compA.create(); QVERIFY(a != 0); @@ -1495,6 +1490,7 @@ void tst_qdeclarativeproperty::noContext() void tst_qdeclarativeproperty::initTestCase() { + QDeclarativeDataTest::initTestCase(); qmlRegisterType<MyQmlObject>("Test",1,0,"MyQmlObject"); qmlRegisterType<PropertyObject>("Test",1,0,"PropertyObject"); qmlRegisterType<MyContainer>("Test",1,0,"MyContainer"); diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 9428746dc1..8b40936d9b 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt -SOURCES += tst_qdeclarativeqt.cpp +SOURCES += tst_qdeclarativeqt.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 6171800ade..dae2f90389 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -54,7 +54,7 @@ #include <QSignalSpy> #include "../../shared/util.h" -class tst_qdeclarativeqt : public QObject +class tst_qdeclarativeqt : public QDeclarativeDataTest { Q_OBJECT public: @@ -95,14 +95,9 @@ private: QDeclarativeEngine engine; }; -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - void tst_qdeclarativeqt::enums() { - QDeclarativeComponent component(&engine, TEST_FILE("enums.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -116,7 +111,7 @@ void tst_qdeclarativeqt::enums() void tst_qdeclarativeqt::rgba() { - QDeclarativeComponent component(&engine, TEST_FILE("rgba.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rgba.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.rgba(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.rgba(): Invalid arguments"; @@ -139,7 +134,7 @@ void tst_qdeclarativeqt::rgba() void tst_qdeclarativeqt::hsla() { - QDeclarativeComponent component(&engine, TEST_FILE("hsla.qml")); + QDeclarativeComponent component(&engine, testFileUrl("hsla.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.hsla(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.hsla(): Invalid arguments"; @@ -161,7 +156,7 @@ void tst_qdeclarativeqt::hsla() void tst_qdeclarativeqt::rect() { - QDeclarativeComponent component(&engine, TEST_FILE("rect.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rect.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.rect(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.rect(): Invalid arguments"; @@ -182,7 +177,7 @@ void tst_qdeclarativeqt::rect() void tst_qdeclarativeqt::point() { - QDeclarativeComponent component(&engine, TEST_FILE("point.qml")); + QDeclarativeComponent component(&engine, testFileUrl("point.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.point(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.point(): Invalid arguments"; @@ -202,7 +197,7 @@ void tst_qdeclarativeqt::point() void tst_qdeclarativeqt::size() { - QDeclarativeComponent component(&engine, TEST_FILE("size.qml")); + QDeclarativeComponent component(&engine, testFileUrl("size.qml")); QString warning1 = component.url().toString() + ":7: Error: Qt.size(): Invalid arguments"; QString warning2 = component.url().toString() + ":8: Error: Qt.size(): Invalid arguments"; @@ -223,7 +218,7 @@ void tst_qdeclarativeqt::size() void tst_qdeclarativeqt::vector() { - QDeclarativeComponent component(&engine, TEST_FILE("vector.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.vector(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.vector(): Invalid arguments"; @@ -243,7 +238,7 @@ void tst_qdeclarativeqt::vector() void tst_qdeclarativeqt::vector4d() { - QDeclarativeComponent component(&engine, TEST_FILE("vector4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector4.qml")); QString warning1 = component.url().toString() + ":6: Error: Qt.vector4d(): Invalid arguments"; QString warning2 = component.url().toString() + ":7: Error: Qt.vector4d(): Invalid arguments"; @@ -263,7 +258,7 @@ void tst_qdeclarativeqt::vector4d() void tst_qdeclarativeqt::lighter() { - QDeclarativeComponent component(&engine, TEST_FILE("lighter.qml")); + QDeclarativeComponent component(&engine, testFileUrl("lighter.qml")); QString warning1 = component.url().toString() + ":5: Error: Qt.lighter(): Invalid arguments"; QString warning2 = component.url().toString() + ":10: Error: Qt.lighter(): Invalid arguments"; @@ -285,7 +280,7 @@ void tst_qdeclarativeqt::lighter() void tst_qdeclarativeqt::darker() { - QDeclarativeComponent component(&engine, TEST_FILE("darker.qml")); + QDeclarativeComponent component(&engine, testFileUrl("darker.qml")); QString warning1 = component.url().toString() + ":5: Error: Qt.darker(): Invalid arguments"; QString warning2 = component.url().toString() + ":10: Error: Qt.darker(): Invalid arguments"; @@ -307,7 +302,7 @@ void tst_qdeclarativeqt::darker() void tst_qdeclarativeqt::tint() { - QDeclarativeComponent component(&engine, TEST_FILE("tint.qml")); + QDeclarativeComponent component(&engine, testFileUrl("tint.qml")); QString warning1 = component.url().toString() + ":7: Error: Qt.tint(): Invalid arguments"; QString warning2 = component.url().toString() + ":8: Error: Qt.tint(): Invalid arguments"; @@ -347,7 +342,7 @@ void tst_qdeclarativeqt::openUrlExternally() QDesktopServices::setUrlHandler("test", &handler, "noteCall"); QDesktopServices::setUrlHandler("file", &handler, "noteCall"); - QDeclarativeComponent component(&engine, TEST_FILE("openUrlExternally.qml")); + QDeclarativeComponent component(&engine, testFileUrl("openUrlExternally.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(handler.called,1); @@ -356,7 +351,7 @@ void tst_qdeclarativeqt::openUrlExternally() object->setProperty("testFile", true); QCOMPARE(handler.called,2); - QCOMPARE(handler.last, TEST_FILE("test.html")); + QCOMPARE(handler.last, testFileUrl("test.html")); QDesktopServices::unsetUrlHandler("test"); QDesktopServices::unsetUrlHandler("file"); @@ -369,7 +364,7 @@ void tst_qdeclarativeqt::openUrlExternally_pragmaLibrary() QDesktopServices::setUrlHandler("test", &handler, "noteCall"); QDesktopServices::setUrlHandler("file", &handler, "noteCall"); - QDeclarativeComponent component(&engine, TEST_FILE("openUrlExternally_lib.qml")); + QDeclarativeComponent component(&engine, testFileUrl("openUrlExternally_lib.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(handler.called,1); @@ -378,7 +373,7 @@ void tst_qdeclarativeqt::openUrlExternally_pragmaLibrary() object->setProperty("testFile", true); QCOMPARE(handler.called,2); - QCOMPARE(handler.last, TEST_FILE("test.html")); + QCOMPARE(handler.last, testFileUrl("test.html")); QDesktopServices::unsetUrlHandler("test"); QDesktopServices::unsetUrlHandler("file"); @@ -386,7 +381,7 @@ void tst_qdeclarativeqt::openUrlExternally_pragmaLibrary() void tst_qdeclarativeqt::md5() { - QDeclarativeComponent component(&engine, TEST_FILE("md5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("md5.qml")); QString warning1 = component.url().toString() + ":4: Error: Qt.md5(): Invalid arguments"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); @@ -401,7 +396,7 @@ void tst_qdeclarativeqt::md5() void tst_qdeclarativeqt::createComponent() { - QDeclarativeComponent component(&engine, TEST_FILE("createComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("createComponent.qml")); QString warning1 = component.url().toString() + ":9: Error: Qt.createComponent(): Invalid arguments"; QString warning2 = component.url().toString() + ":10: Error: Qt.createComponent(): Invalid arguments"; @@ -412,7 +407,7 @@ void tst_qdeclarativeqt::createComponent() QVERIFY(object != 0); QCOMPARE(object->property("absoluteUrl").toString(), QString("http://www.example.com/test.qml")); - QCOMPARE(object->property("relativeUrl").toString(), TEST_FILE("createComponentData.qml").toString()); + QCOMPARE(object->property("relativeUrl").toString(), testFileUrl("createComponentData.qml").toString()); delete object; } @@ -420,7 +415,7 @@ void tst_qdeclarativeqt::createComponent() void tst_qdeclarativeqt::createComponent_pragmaLibrary() { // Currently, just loading createComponent_lib.qml causes crash on some platforms - QDeclarativeComponent component(&engine, TEST_FILE("createComponent_lib.qml")); + QDeclarativeComponent component(&engine, testFileUrl("createComponent_lib.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("status").toInt(), int(QDeclarativeComponent::Ready)); @@ -430,14 +425,14 @@ void tst_qdeclarativeqt::createComponent_pragmaLibrary() void tst_qdeclarativeqt::createQmlObject() { - QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("createQmlObject.qml")); QString warning1 = component.url().toString() + ":7: Error: Qt.createQmlObject(): Invalid arguments"; - QString warning2 = component.url().toString()+ ":10: Error: Qt.createQmlObject(): failed to create object: \n " + TEST_FILE("inline").toString() + ":2:10: Blah is not a type"; - 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 warning2 = component.url().toString()+ ":10: Error: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("inline").toString() + ":2:10: Blah is not a type"; + QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("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 warning6 = "RunTimeError: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("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)); @@ -460,9 +455,9 @@ void tst_qdeclarativeqt::createQmlObject() void tst_qdeclarativeqt::console() { - QUrl testFileUrl = TEST_FILE("console.qml"); - QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testFileUrl.toString()).arg(34); - QString testTrace = QString(QLatin1String("onCompleted (%1:%2:%3)\n")).arg(testFileUrl.toString()).arg(31).arg(17); + QUrl testUrl = testFileUrl("console.qml"); + QString testException = QString(QLatin1String("%1:%2: ReferenceError: Can't find variable: exception")).arg(testUrl.toString()).arg(34); + QString testTrace = QString(QLatin1String("onCompleted (%1:%2:%3)\n")).arg(testUrl.toString()).arg(31).arg(17); QTest::ignoreMessage(QtDebugMsg, qPrintable(testTrace)); QTest::ignoreMessage(QtDebugMsg, "Profiling started."); QTest::ignoreMessage(QtDebugMsg, "Profiling ended."); @@ -487,7 +482,7 @@ void tst_qdeclarativeqt::console() QTest::ignoreMessage(QtWarningMsg, qPrintable(testException)); - QDeclarativeComponent component(&engine, testFileUrl); + QDeclarativeComponent component(&engine, testUrl); QObject *object = component.create(); QVERIFY(object != 0); delete object; @@ -507,7 +502,7 @@ void tst_qdeclarativeqt::dateTimeConversion() QDateTime dateTime6(QDate(2008,2,24), QTime(14,15,38,200)); QDeclarativeEngine eng; - QDeclarativeComponent component(&eng, TEST_FILE("dateTimeConversion.qml")); + QDeclarativeComponent component(&eng, testFileUrl("dateTimeConversion.qml")); QObject *obj = component.create(); QCOMPARE(obj->property("qdate").toDate(), date); @@ -536,7 +531,7 @@ void tst_qdeclarativeqt::dateTimeFormatting() eng.rootContext()->setContextProperty("qtime", time); eng.rootContext()->setContextProperty("qdatetime", dateTime); - QDeclarativeComponent component(&eng, TEST_FILE("formatting.qml")); + QDeclarativeComponent component(&eng, testFileUrl("formatting.qml")); QStringList warnings; warnings << component.url().toString() + ":37: Error: Qt.formatDate(): Invalid date format" @@ -609,7 +604,7 @@ void tst_qdeclarativeqt::dateTimeFormattingVariants() QDeclarativeEngine eng; eng.rootContext()->setContextProperty("qvariant", variant); - QDeclarativeComponent component(&eng, TEST_FILE("formatting.qml")); + QDeclarativeComponent component(&eng, testFileUrl("formatting.qml")); QStringList warnings; warnings << component.url().toString() + ":37: Error: Qt.formatDate(): Invalid date format" @@ -683,7 +678,7 @@ void tst_qdeclarativeqt::dateTimeFormattingVariants_data() void tst_qdeclarativeqt::isQtObject() { - QDeclarativeComponent component(&engine, TEST_FILE("isQtObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("isQtObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -698,7 +693,7 @@ void tst_qdeclarativeqt::isQtObject() void tst_qdeclarativeqt::btoa() { - QDeclarativeComponent component(&engine, TEST_FILE("btoa.qml")); + QDeclarativeComponent component(&engine, testFileUrl("btoa.qml")); QString warning1 = component.url().toString() + ":4: Error: Qt.btoa(): Invalid arguments"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); @@ -713,7 +708,7 @@ void tst_qdeclarativeqt::btoa() void tst_qdeclarativeqt::atob() { - QDeclarativeComponent component(&engine, TEST_FILE("atob.qml")); + QDeclarativeComponent component(&engine, testFileUrl("atob.qml")); QString warning1 = component.url().toString() + ":4: Error: Qt.atob(): Invalid arguments"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); @@ -728,7 +723,7 @@ void tst_qdeclarativeqt::atob() void tst_qdeclarativeqt::fontFamilies() { - QDeclarativeComponent component(&engine, TEST_FILE("fontFamilies.qml")); + QDeclarativeComponent component(&engine, testFileUrl("fontFamilies.qml")); QString warning1 = component.url().toString() + ":4: Error: Qt.fontFamilies(): Invalid arguments"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); @@ -744,7 +739,7 @@ void tst_qdeclarativeqt::fontFamilies() void tst_qdeclarativeqt::quit() { - QDeclarativeComponent component(&engine, TEST_FILE("quit.qml")); + QDeclarativeComponent component(&engine, testFileUrl("quit.qml")); QSignalSpy spy(&engine, SIGNAL(quit())); QObject *object = component.create(); @@ -756,7 +751,7 @@ void tst_qdeclarativeqt::quit() void tst_qdeclarativeqt::resolvedUrl() { - QDeclarativeComponent component(&engine, TEST_FILE("resolvedUrl.qml")); + QDeclarativeComponent component(&engine, testFileUrl("resolvedUrl.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 8b8c19c44c..d3195df074 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativesqldatabase macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativesqldatabase.cpp +SOURCES += tst_qdeclarativesqldatabase.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp index 1a6b08cb79..750d3ba715 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp +++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp @@ -55,7 +55,7 @@ #include <QtCore/qfile.h> #include "../../shared/util.h" -class tst_qdeclarativesqldatabase : public QObject +class tst_qdeclarativesqldatabase : public QDeclarativeDataTest { Q_OBJECT public: @@ -104,6 +104,7 @@ void removeRecursive(const QString& dirname) void tst_qdeclarativesqldatabase::initTestCase() { + QDeclarativeDataTest::initTestCase(); removeRecursive(dbDir()); QDir().mkpath(dbDir()); } @@ -204,7 +205,7 @@ void tst_qdeclarativesqldatabase::testQml() engine->setOfflineStoragePath(dbDir()); QDeclarativeComponent component(engine); - component.setData(qml.toUtf8(), QUrl::fromLocalFile(TESTDATA("empty.qml"))); // just a file for relative local imports + component.setData(qml.toUtf8(), testFileUrl("empty.qml")); // just a file for relative local imports QVERIFY(!component.isError()); QQuickText *text = qobject_cast<QQuickText*>(component.create()); QVERIFY(text != 0); diff --git a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro index 488395ea52..5b40df8898 100644 --- a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro +++ b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativetranslation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativetranslation.cpp +SOURCES += tst_qdeclarativetranslation.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h RESOURCES += data/translation.qrc testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp index da84167148..12079b1432 100644 --- a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp +++ b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp @@ -45,7 +45,7 @@ #include <QTranslator> #include "../../shared/util.h" -class tst_qdeclarativetranslation : public QObject +class tst_qdeclarativetranslation : public QDeclarativeDataTest { Q_OBJECT public: @@ -57,19 +57,14 @@ private slots: void translationInQrc(); }; -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - void tst_qdeclarativetranslation::translation() { QTranslator translator; - translator.load(QLatin1String("qml_fr"), TESTDATA("")); + translator.load(QLatin1String("qml_fr"), dataDirectory()); QCoreApplication::installTranslator(&translator); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("translation.qml")); + QDeclarativeComponent component(&engine, testFileUrl("translation.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -89,11 +84,11 @@ void tst_qdeclarativetranslation::translation() void tst_qdeclarativetranslation::idTranslation() { QTranslator translator; - translator.load(QLatin1String("qmlid_fr"),TESTDATA("")); + translator.load(QLatin1String("qmlid_fr"), dataDirectory()); QCoreApplication::installTranslator(&translator); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("idtranslation.qml")); + QDeclarativeComponent component(&engine, testFileUrl("idtranslation.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index d7097de835..a240f30684 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -2,10 +2,12 @@ CONFIG += testcase TARGET = tst_qdeclarativevaluetypes macx:CONFIG -= app_bundle -HEADERS += testtypes.h +HEADERS += testtypes.h \ + ../../shared/util.h SOURCES += tst_qdeclarativevaluetypes.cpp \ - testtypes.cpp + testtypes.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index c6880b96ce..aa96ffec11 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE extern int qt_defaultDpi(); QT_END_NAMESPACE -class tst_qdeclarativevaluetypes : public QObject +class tst_qdeclarativevaluetypes : public QDeclarativeDataTest { Q_OBJECT public: @@ -100,18 +100,14 @@ private: void tst_qdeclarativevaluetypes::initTestCase() { + QDeclarativeDataTest::initTestCase(); registerTypes(); } -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - void tst_qdeclarativevaluetypes::point() { { - QDeclarativeComponent component(&engine, TEST_FILE("point_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("point_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -123,7 +119,7 @@ void tst_qdeclarativevaluetypes::point() } { - QDeclarativeComponent component(&engine, TEST_FILE("point_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("point_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -133,7 +129,7 @@ void tst_qdeclarativevaluetypes::point() } { - QDeclarativeComponent component(&engine, TEST_FILE("point_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("point_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -156,7 +152,7 @@ void tst_qdeclarativevaluetypes::point() void tst_qdeclarativevaluetypes::pointf() { { - QDeclarativeComponent component(&engine, TEST_FILE("pointf_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("pointf_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -168,7 +164,7 @@ void tst_qdeclarativevaluetypes::pointf() } { - QDeclarativeComponent component(&engine, TEST_FILE("pointf_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("pointf_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -178,7 +174,7 @@ void tst_qdeclarativevaluetypes::pointf() } { - QDeclarativeComponent component(&engine, TEST_FILE("pointf_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("pointf_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -201,7 +197,7 @@ void tst_qdeclarativevaluetypes::pointf() void tst_qdeclarativevaluetypes::size() { { - QDeclarativeComponent component(&engine, TEST_FILE("size_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("size_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -213,7 +209,7 @@ void tst_qdeclarativevaluetypes::size() } { - QDeclarativeComponent component(&engine, TEST_FILE("size_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("size_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -223,7 +219,7 @@ void tst_qdeclarativevaluetypes::size() } { - QDeclarativeComponent component(&engine, TEST_FILE("size_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("size_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -246,7 +242,7 @@ void tst_qdeclarativevaluetypes::size() void tst_qdeclarativevaluetypes::sizef() { { - QDeclarativeComponent component(&engine, TEST_FILE("sizef_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizef_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -258,7 +254,7 @@ void tst_qdeclarativevaluetypes::sizef() } { - QDeclarativeComponent component(&engine, TEST_FILE("sizef_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizef_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -268,7 +264,7 @@ void tst_qdeclarativevaluetypes::sizef() } { - QDeclarativeComponent component(&engine, TEST_FILE("sizef_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizef_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -290,7 +286,7 @@ void tst_qdeclarativevaluetypes::sizef() void tst_qdeclarativevaluetypes::variant() { - QDeclarativeComponent component(&engine, TEST_FILE("variant_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("variant_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -304,7 +300,7 @@ void tst_qdeclarativevaluetypes::variant() void tst_qdeclarativevaluetypes::sizereadonly() { { - QDeclarativeComponent component(&engine, TEST_FILE("sizereadonly_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizereadonly_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -316,25 +312,25 @@ void tst_qdeclarativevaluetypes::sizereadonly() } { - QDeclarativeComponent component(&engine, TEST_FILE("sizereadonly_writeerror.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizereadonly_writeerror.qml")); QVERIFY(component.isError()); QCOMPARE(component.errors().at(0).description(), QLatin1String("Invalid property assignment: \"sizereadonly\" is a read-only property")); } { - QDeclarativeComponent component(&engine, TEST_FILE("sizereadonly_writeerror2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizereadonly_writeerror2.qml")); QVERIFY(component.isError()); QCOMPARE(component.errors().at(0).description(), QLatin1String("Invalid property assignment: \"sizereadonly\" is a read-only property")); } { - QDeclarativeComponent component(&engine, TEST_FILE("sizereadonly_writeerror3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizereadonly_writeerror3.qml")); QVERIFY(component.isError()); QCOMPARE(component.errors().at(0).description(), QLatin1String("Invalid property assignment: \"sizereadonly\" is a read-only property")); } { - QDeclarativeComponent component(&engine, TEST_FILE("sizereadonly_writeerror4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("sizereadonly_writeerror4.qml")); QObject *object = component.create(); QVERIFY(object); @@ -348,7 +344,7 @@ void tst_qdeclarativevaluetypes::sizereadonly() void tst_qdeclarativevaluetypes::rect() { { - QDeclarativeComponent component(&engine, TEST_FILE("rect_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rect_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -362,7 +358,7 @@ void tst_qdeclarativevaluetypes::rect() } { - QDeclarativeComponent component(&engine, TEST_FILE("rect_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rect_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -372,7 +368,7 @@ void tst_qdeclarativevaluetypes::rect() } { - QDeclarativeComponent component(&engine, TEST_FILE("rect_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rect_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -395,7 +391,7 @@ void tst_qdeclarativevaluetypes::rect() void tst_qdeclarativevaluetypes::rectf() { { - QDeclarativeComponent component(&engine, TEST_FILE("rectf_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rectf_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -409,7 +405,7 @@ void tst_qdeclarativevaluetypes::rectf() } { - QDeclarativeComponent component(&engine, TEST_FILE("rectf_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rectf_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -419,7 +415,7 @@ void tst_qdeclarativevaluetypes::rectf() } { - QDeclarativeComponent component(&engine, TEST_FILE("rectf_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("rectf_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -442,7 +438,7 @@ void tst_qdeclarativevaluetypes::rectf() void tst_qdeclarativevaluetypes::vector2d() { { - QDeclarativeComponent component(&engine, TEST_FILE("vector2d_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector2d_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -454,7 +450,7 @@ void tst_qdeclarativevaluetypes::vector2d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector2d_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector2d_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -464,7 +460,7 @@ void tst_qdeclarativevaluetypes::vector2d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector2d_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector2d_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -485,7 +481,7 @@ void tst_qdeclarativevaluetypes::vector2d() void tst_qdeclarativevaluetypes::vector3d() { { - QDeclarativeComponent component(&engine, TEST_FILE("vector3d_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector3d_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -498,7 +494,7 @@ void tst_qdeclarativevaluetypes::vector3d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector3d_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector3d_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -508,7 +504,7 @@ void tst_qdeclarativevaluetypes::vector3d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector3d_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector3d_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -530,7 +526,7 @@ void tst_qdeclarativevaluetypes::vector3d() void tst_qdeclarativevaluetypes::vector4d() { { - QDeclarativeComponent component(&engine, TEST_FILE("vector4d_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector4d_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -544,7 +540,7 @@ void tst_qdeclarativevaluetypes::vector4d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector4d_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector4d_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -554,7 +550,7 @@ void tst_qdeclarativevaluetypes::vector4d() } { - QDeclarativeComponent component(&engine, TEST_FILE("vector4d_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("vector4d_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -575,7 +571,7 @@ void tst_qdeclarativevaluetypes::vector4d() void tst_qdeclarativevaluetypes::quaternion() { { - QDeclarativeComponent component(&engine, TEST_FILE("quaternion_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("quaternion_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -589,7 +585,7 @@ void tst_qdeclarativevaluetypes::quaternion() } { - QDeclarativeComponent component(&engine, TEST_FILE("quaternion_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("quaternion_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -599,7 +595,7 @@ void tst_qdeclarativevaluetypes::quaternion() } { - QDeclarativeComponent component(&engine, TEST_FILE("quaternion_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("quaternion_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -620,7 +616,7 @@ void tst_qdeclarativevaluetypes::quaternion() void tst_qdeclarativevaluetypes::matrix4x4() { { - QDeclarativeComponent component(&engine, TEST_FILE("matrix4x4_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("matrix4x4_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -650,7 +646,7 @@ void tst_qdeclarativevaluetypes::matrix4x4() } { - QDeclarativeComponent component(&engine, TEST_FILE("matrix4x4_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("matrix4x4_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -663,7 +659,7 @@ void tst_qdeclarativevaluetypes::matrix4x4() } { - QDeclarativeComponent component(&engine, TEST_FILE("matrix4x4_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("matrix4x4_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -684,7 +680,7 @@ void tst_qdeclarativevaluetypes::matrix4x4() void tst_qdeclarativevaluetypes::font() { { - QDeclarativeComponent component(&engine, TEST_FILE("font_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -707,7 +703,7 @@ void tst_qdeclarativevaluetypes::font() } { - QDeclarativeComponent component(&engine, TEST_FILE("font_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -740,7 +736,7 @@ void tst_qdeclarativevaluetypes::font() // Test pixelSize { - QDeclarativeComponent component(&engine, TEST_FILE("font_write.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_write.2.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -751,7 +747,7 @@ void tst_qdeclarativevaluetypes::font() // Test pixelSize and pointSize { - QDeclarativeComponent component(&engine, TEST_FILE("font_write.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_write.3.qml")); QTest::ignoreMessage(QtWarningMsg, "Both point size and pixel size set. Using pixel size. "); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -761,7 +757,7 @@ void tst_qdeclarativevaluetypes::font() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("font_write.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_write.4.qml")); QTest::ignoreMessage(QtWarningMsg, "Both point size and pixel size set. Using pixel size. "); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -771,7 +767,7 @@ void tst_qdeclarativevaluetypes::font() delete object; } { - QDeclarativeComponent component(&engine, TEST_FILE("font_write.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_write.5.qml")); QObject *object = qobject_cast<QObject *>(component.create()); QVERIFY(object != 0); MyTypeObject *object1 = object->findChild<MyTypeObject *>("object1"); @@ -786,7 +782,7 @@ void tst_qdeclarativevaluetypes::font() } { - QDeclarativeComponent component(&engine, TEST_FILE("font_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("font_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -807,7 +803,7 @@ void tst_qdeclarativevaluetypes::font() void tst_qdeclarativevaluetypes::color() { { - QDeclarativeComponent component(&engine, TEST_FILE("color_read.qml")); + QDeclarativeComponent component(&engine, testFileUrl("color_read.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -826,7 +822,7 @@ void tst_qdeclarativevaluetypes::color() } { - QDeclarativeComponent component(&engine, TEST_FILE("color_write.qml")); + QDeclarativeComponent component(&engine, testFileUrl("color_write.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -841,7 +837,7 @@ void tst_qdeclarativevaluetypes::color() } { - QDeclarativeComponent component(&engine, TEST_FILE("color_compare.qml")); + QDeclarativeComponent component(&engine, testFileUrl("color_compare.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QString colorString("#33e199"); @@ -874,7 +870,7 @@ void tst_qdeclarativevaluetypes::color() // Test bindings can write to value types void tst_qdeclarativevaluetypes::bindingAssignment() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingAssignment.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingAssignment.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -890,7 +886,7 @@ void tst_qdeclarativevaluetypes::bindingAssignment() // Test bindings can read from value types void tst_qdeclarativevaluetypes::bindingRead() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingRead.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingRead.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -906,7 +902,7 @@ void tst_qdeclarativevaluetypes::bindingRead() // Test static values can assign to value types void tst_qdeclarativevaluetypes::staticAssignment() { - QDeclarativeComponent component(&engine, TEST_FILE("staticAssignment.qml")); + QDeclarativeComponent component(&engine, testFileUrl("staticAssignment.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -918,7 +914,7 @@ void tst_qdeclarativevaluetypes::staticAssignment() // Test scripts can read/write value types void tst_qdeclarativevaluetypes::scriptAccess() { - QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptAccess.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -933,7 +929,7 @@ void tst_qdeclarativevaluetypes::scriptAccess() void tst_qdeclarativevaluetypes::autoBindingRemoval() { { - QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.qml")); + QDeclarativeComponent component(&engine, testFileUrl("autoBindingRemoval.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -956,7 +952,7 @@ void tst_qdeclarativevaluetypes::autoBindingRemoval() /* { - QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("autoBindingRemoval.2.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -978,7 +974,7 @@ void tst_qdeclarativevaluetypes::autoBindingRemoval() } { - QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("autoBindingRemoval.3.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -1002,7 +998,7 @@ void tst_qdeclarativevaluetypes::autoBindingRemoval() // Test that property value sources assign to value types void tst_qdeclarativevaluetypes::valueSources() { - QDeclarativeComponent component(&engine, TEST_FILE("valueSources.qml")); + QDeclarativeComponent component(&engine, testFileUrl("valueSources.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -1025,7 +1021,7 @@ static void checkNoErrors(QDeclarativeComponent& component) // Test that property value interceptors can be applied to value types void tst_qdeclarativevaluetypes::valueInterceptors() { - QDeclarativeComponent component(&engine, TEST_FILE("valueInterceptors.qml")); + QDeclarativeComponent component(&engine, testFileUrl("valueInterceptors.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); checkNoErrors(component); QVERIFY(object != 0); @@ -1042,7 +1038,7 @@ void tst_qdeclarativevaluetypes::valueInterceptors() // Test that you can't assign a binding to the "root" value type, and a sub-property void tst_qdeclarativevaluetypes::bindingConflict() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingConflict.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingConflict.qml")); QCOMPARE(component.isError(), true); } @@ -1059,7 +1055,7 @@ void tst_qdeclarativevaluetypes::bindingConflict() // doesn't crash void tst_qdeclarativevaluetypes::deletedObject() { - QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml")); + QDeclarativeComponent component(&engine, testFileUrl("deletedObject.qml")); QTest::ignoreMessage(QtDebugMsg, "Test: 2"); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -1077,7 +1073,7 @@ void tst_qdeclarativevaluetypes::deletedObject() // Test that value types can be assigned to another value type property in a binding void tst_qdeclarativevaluetypes::bindingVariantCopy() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingVariantCopy.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingVariantCopy.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -1089,7 +1085,7 @@ void tst_qdeclarativevaluetypes::bindingVariantCopy() // Test that value types can be assigned to another value type property in script void tst_qdeclarativevaluetypes::scriptVariantCopy() { - QDeclarativeComponent component(&engine, TEST_FILE("scriptVariantCopy.qml")); + QDeclarativeComponent component(&engine, testFileUrl("scriptVariantCopy.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); @@ -1125,7 +1121,7 @@ void tst_qdeclarativevaluetypes::cppClasses() void tst_qdeclarativevaluetypes::enums() { { - QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.1.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->font().capitalization() == QFont::AllUppercase); @@ -1133,7 +1129,7 @@ void tst_qdeclarativevaluetypes::enums() } { - QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.2.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->font().capitalization() == QFont::AllUppercase); @@ -1141,7 +1137,7 @@ void tst_qdeclarativevaluetypes::enums() } { - QDeclarativeComponent component(&engine, TEST_FILE("enums.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.3.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->font().capitalization() == QFont::AllUppercase); @@ -1149,7 +1145,7 @@ void tst_qdeclarativevaluetypes::enums() } { - QDeclarativeComponent component(&engine, TEST_FILE("enums.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.4.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->font().capitalization() == QFont::AllUppercase); @@ -1157,7 +1153,7 @@ void tst_qdeclarativevaluetypes::enums() } { - QDeclarativeComponent component(&engine, TEST_FILE("enums.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("enums.5.qml")); MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create()); QVERIFY(object != 0); QVERIFY(object->font().capitalization() == QFont::AllUppercase); @@ -1170,7 +1166,7 @@ void tst_qdeclarativevaluetypes::enums() void tst_qdeclarativevaluetypes::conflictingBindings() { { - QDeclarativeComponent component(&engine, TEST_FILE("conflicting.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("conflicting.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1188,7 +1184,7 @@ void tst_qdeclarativevaluetypes::conflictingBindings() } { - QDeclarativeComponent component(&engine, TEST_FILE("conflicting.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("conflicting.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1206,7 +1202,7 @@ void tst_qdeclarativevaluetypes::conflictingBindings() } { - QDeclarativeComponent component(&engine, TEST_FILE("conflicting.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("conflicting.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1226,7 +1222,7 @@ void tst_qdeclarativevaluetypes::conflictingBindings() void tst_qdeclarativevaluetypes::returnValues() { - QDeclarativeComponent component(&engine, TEST_FILE("returnValues.qml")); + QDeclarativeComponent component(&engine, testFileUrl("returnValues.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1239,7 +1235,7 @@ void tst_qdeclarativevaluetypes::returnValues() void tst_qdeclarativevaluetypes::varAssignment() { - QDeclarativeComponent component(&engine, TEST_FILE("varAssignment.qml")); + QDeclarativeComponent component(&engine, testFileUrl("varAssignment.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1254,7 +1250,7 @@ void tst_qdeclarativevaluetypes::varAssignment() void tst_qdeclarativevaluetypes::bindingsSpliceCorrectly() { { - QDeclarativeComponent component(&engine, TEST_FILE("bindingsSpliceCorrectly.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingsSpliceCorrectly.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1264,7 +1260,7 @@ void tst_qdeclarativevaluetypes::bindingsSpliceCorrectly() } { - QDeclarativeComponent component(&engine, TEST_FILE("bindingsSpliceCorrectly.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingsSpliceCorrectly.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1275,7 +1271,7 @@ void tst_qdeclarativevaluetypes::bindingsSpliceCorrectly() { - QDeclarativeComponent component(&engine, TEST_FILE("bindingsSpliceCorrectly.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingsSpliceCorrectly.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1285,7 +1281,7 @@ void tst_qdeclarativevaluetypes::bindingsSpliceCorrectly() } { - QDeclarativeComponent component(&engine, TEST_FILE("bindingsSpliceCorrectly.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingsSpliceCorrectly.4.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1295,7 +1291,7 @@ void tst_qdeclarativevaluetypes::bindingsSpliceCorrectly() } { - QDeclarativeComponent component(&engine, TEST_FILE("bindingsSpliceCorrectly.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("bindingsSpliceCorrectly.5.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index 6eaaf577b4..584bcd672f 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeworkerscript macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeworkerscript.cpp +SOURCES += tst_qdeclarativeworkerscript.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index 7dccbb35a0..1a9f10fe49 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -52,13 +52,7 @@ #include <private/qdeclarativeengine_p.h> #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - - -class tst_QDeclarativeWorkerScript : public QObject +class tst_QDeclarativeWorkerScript : public QDeclarativeDataTest { Q_OBJECT public: @@ -93,7 +87,7 @@ private: void tst_QDeclarativeWorkerScript::source() { - QDeclarativeComponent component(&m_engine, TESTDATA("worker.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); const QMetaObject *mo = worker->metaObject(); @@ -103,7 +97,7 @@ void tst_QDeclarativeWorkerScript::source() waitForEchoMessage(worker); QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).value<QVariant>(), value); - QUrl source = QUrl::fromLocalFile(TESTDATA("script_fixed_return.js")); + QUrl source = testFileUrl("script_fixed_return.js"); worker->setSource(source); QCOMPARE(worker->source(), source); QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value))); @@ -118,7 +112,7 @@ void tst_QDeclarativeWorkerScript::messaging() { QFETCH(QVariant, value); - QDeclarativeComponent component(&m_engine, TESTDATA("worker.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -155,7 +149,7 @@ void tst_QDeclarativeWorkerScript::messaging_sendQObjectList() // instances. If objects are sent in a list, they will be sent as 'undefined' // js values. - QDeclarativeComponent component(&m_engine, TESTDATA("worker.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -176,7 +170,7 @@ void tst_QDeclarativeWorkerScript::messaging_sendQObjectList() void tst_QDeclarativeWorkerScript::messaging_sendJsObject() { - QDeclarativeComponent component(&m_engine, TESTDATA("worker.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -203,7 +197,7 @@ void tst_QDeclarativeWorkerScript::messaging_sendJsObject() void tst_QDeclarativeWorkerScript::messaging_sendExternalObject() { - QDeclarativeComponent component(&m_engine, TESTDATA("externalObjectWorker.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("externalObjectWorker.qml")); QObject *obj = component.create(); QVERIFY(obj); QMetaObject::invokeMethod(obj, "testExternalObject"); @@ -215,7 +209,7 @@ void tst_QDeclarativeWorkerScript::script_with_pragma() { QVariant value(100); - QDeclarativeComponent component(&m_engine, TESTDATA("worker_pragma.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker_pragma.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -231,7 +225,7 @@ void tst_QDeclarativeWorkerScript::script_with_pragma() void tst_QDeclarativeWorkerScript::script_included() { - QDeclarativeComponent component(&m_engine, TESTDATA("worker_include.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker_include.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -256,14 +250,14 @@ static void qdeclarativeworkerscript_warningsHandler(QtMsgType type, const char void tst_QDeclarativeWorkerScript::scriptError_onLoad() { - QDeclarativeComponent component(&m_engine, TESTDATA("worker_error_onLoad.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker_error_onLoad.qml")); QtMsgHandler previousMsgHandler = qInstallMsgHandler(qdeclarativeworkerscript_warningsHandler); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); QTRY_COMPARE(qdeclarativeworkerscript_lastWarning, - TEST_FILE("script_error_onLoad.js").toString() + QLatin1String(":3: SyntaxError: Unexpected identifier")); + testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3: SyntaxError: Unexpected identifier")); qInstallMsgHandler(previousMsgHandler); qApp->processEvents(); @@ -272,7 +266,7 @@ void tst_QDeclarativeWorkerScript::scriptError_onLoad() void tst_QDeclarativeWorkerScript::scriptError_onCall() { - QDeclarativeComponent component(&m_engine, TESTDATA("worker_error_onCall.qml")); + QDeclarativeComponent component(&m_engine, testFileUrl("worker_error_onCall.qml")); QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create()); QVERIFY(worker != 0); @@ -281,7 +275,7 @@ void tst_QDeclarativeWorkerScript::scriptError_onCall() QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value))); QTRY_COMPARE(qdeclarativeworkerscript_lastWarning, - TEST_FILE("script_error_onCall.js").toString() + QLatin1String(":4: ReferenceError: Can't find variable: getData")); + testFileUrl("script_error_onCall.js").toString() + QLatin1String(":4: ReferenceError: Can't find variable: getData")); qInstallMsgHandler(previousMsgHandler); qApp->processEvents(); @@ -294,7 +288,7 @@ void tst_QDeclarativeWorkerScript::stressDispose() { for (int ii = 0; ii < 100; ++ii) { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TESTDATA("stressDispose.qml")); + QDeclarativeComponent component(&engine, testFileUrl("stressDispose.qml")); QObject *o = component.create(); QVERIFY(o); delete o; diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 5715f3c114..fd6a19d6c2 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -3,10 +3,12 @@ TARGET = tst_qdeclarativexmlhttprequest macx:CONFIG -= app_bundle INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h SOURCES += tst_qdeclarativexmlhttprequest.cpp \ - ../../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp index abefa30108..d93285eef7 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp @@ -50,7 +50,7 @@ #define SERVER_PORT 14445 -class tst_qdeclarativexmlhttprequest : public QObject +class tst_qdeclarativexmlhttprequest : public QDeclarativeDataTest { Q_OBJECT public: @@ -121,15 +121,10 @@ private: QDeclarativeEngine engine; }; -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - // Test that the dom exception codes are correct void tst_qdeclarativexmlhttprequest::domExceptionCodes() { - QDeclarativeComponent component(&engine, TEST_FILE("domExceptionCodes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("domExceptionCodes.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -171,10 +166,10 @@ void tst_qdeclarativexmlhttprequest::callbackException() QFETCH(QString, which); QFETCH(int, line); - QString expect = TEST_FILE("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback"; + QString expect = testFileUrl("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback"; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); - QDeclarativeComponent component(&engine, TEST_FILE("callbackException.qml")); + QDeclarativeComponent component(&engine, testFileUrl("callbackException.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "testdocument.html"); @@ -190,7 +185,7 @@ void tst_qdeclarativexmlhttprequest::callbackException() // ### WebKit does not do this, but it seems to fit the standard and QML better void tst_qdeclarativexmlhttprequest::staticStateValues() { - QDeclarativeComponent component(&engine, TEST_FILE("staticStateValues.qml")); + QDeclarativeComponent component(&engine, testFileUrl("staticStateValues.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -206,7 +201,7 @@ void tst_qdeclarativexmlhttprequest::staticStateValues() // Test that the state value properties on instances have the correct values. void tst_qdeclarativexmlhttprequest::instanceStateValues() { - QDeclarativeComponent component(&engine, TEST_FILE("instanceStateValues.qml")); + QDeclarativeComponent component(&engine, testFileUrl("instanceStateValues.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -222,7 +217,7 @@ void tst_qdeclarativexmlhttprequest::instanceStateValues() // Test calling constructor void tst_qdeclarativexmlhttprequest::constructor() { - QDeclarativeComponent component(&engine, TEST_FILE("constructor.qml")); + QDeclarativeComponent component(&engine, testFileUrl("constructor.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -235,7 +230,7 @@ void tst_qdeclarativexmlhttprequest::constructor() // Test that all the properties are set correctly before any request is sent void tst_qdeclarativexmlhttprequest::defaultState() { - QDeclarativeComponent component(&engine, TEST_FILE("defaultState.qml")); + QDeclarativeComponent component(&engine, testFileUrl("defaultState.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -259,9 +254,9 @@ void tst_qdeclarativexmlhttprequest::open() if (remote) { server.reset(new TestHTTPServer(SERVER_PORT)); QVERIFY(server->isValid()); - QVERIFY(server->wait(TEST_FILE("open_network.expect"), - TEST_FILE("open_network.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server->wait(testFileUrl("open_network.expect"), + testFileUrl("open_network.reply"), + testFileUrl("testdocument.html"))); } QDeclarativeComponent component(&engine, qmlFile); @@ -288,18 +283,18 @@ void tst_qdeclarativexmlhttprequest::open_data() QTest::addColumn<QString>("url"); QTest::addColumn<bool>("remote"); - QTest::newRow("Relative url)") << TEST_FILE("open.qml") << "testdocument.html" << false; - QTest::newRow("Absolute url)") << TEST_FILE("open.qml") << TEST_FILE("testdocument.html").toString() << false; - QTest::newRow("Absolute network url)") << TEST_FILE("open.qml") << "http://127.0.0.1:14445/testdocument.html" << true; + QTest::newRow("Relative url)") << testFileUrl("open.qml") << "testdocument.html" << false; + QTest::newRow("Absolute url)") << testFileUrl("open.qml") << testFileUrl("testdocument.html").toString() << false; + QTest::newRow("Absolute network url)") << testFileUrl("open.qml") << "http://127.0.0.1:14445/testdocument.html" << true; // ### Check that the username/password were sent to the server - QTest::newRow("User/pass") << TEST_FILE("open_user.qml") << "http://127.0.0.1:14445/testdocument.html" << true; + QTest::newRow("User/pass") << testFileUrl("open_user.qml") << "http://127.0.0.1:14445/testdocument.html" << true; } // Test that calling XMLHttpRequest.open() with an invalid method raises an exception void tst_qdeclarativexmlhttprequest::open_invalid_method() { - QDeclarativeComponent component(&engine, TEST_FILE("open_invalid_method.qml")); + QDeclarativeComponent component(&engine, testFileUrl("open_invalid_method.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -311,7 +306,7 @@ void tst_qdeclarativexmlhttprequest::open_invalid_method() // Test that calling XMLHttpRequest.open() with sync raises an exception void tst_qdeclarativexmlhttprequest::open_sync() { - QDeclarativeComponent component(&engine, TEST_FILE("open_sync.qml")); + QDeclarativeComponent component(&engine, testFileUrl("open_sync.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -324,7 +319,7 @@ void tst_qdeclarativexmlhttprequest::open_sync() void tst_qdeclarativexmlhttprequest::open_arg_count() { { - QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("open_arg_count.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -334,7 +329,7 @@ void tst_qdeclarativexmlhttprequest::open_arg_count() } { - QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("open_arg_count.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -349,11 +344,11 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("setRequestHeader.expect"), - TEST_FILE("setRequestHeader.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("setRequestHeader.expect"), + testFileUrl("setRequestHeader.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -369,11 +364,11 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_caseInsensitive() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("setRequestHeader.expect"), - TEST_FILE("setRequestHeader.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("setRequestHeader.expect"), + testFileUrl("setRequestHeader.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_caseInsensitive.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader_caseInsensitive.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -386,7 +381,7 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_caseInsensitive() // Test setting headers before open() throws exception void tst_qdeclarativexmlhttprequest::setRequestHeader_unsent() { - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader_unsent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -430,11 +425,11 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_illegalName() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("open_network.expect"), - TEST_FILE("open_network.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("open_network.expect"), + testFileUrl("open_network.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_illegalName.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader_illegalName.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -458,11 +453,11 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_sent() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("open_network.expect"), - TEST_FILE("open_network.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("open_network.expect"), + testFileUrl("open_network.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_sent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader_sent.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -478,7 +473,7 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_sent() // Invalid arg count throws exception void tst_qdeclarativexmlhttprequest::setRequestHeader_args() { - QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_args.qml")); + QDeclarativeComponent component(&engine, testFileUrl("setRequestHeader_args.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -490,7 +485,7 @@ void tst_qdeclarativexmlhttprequest::setRequestHeader_args() // Test that calling send() in UNSENT state throws an exception void tst_qdeclarativexmlhttprequest::send_unsent() { - QDeclarativeComponent component(&engine, TEST_FILE("send_unsent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("send_unsent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -502,7 +497,7 @@ void tst_qdeclarativexmlhttprequest::send_unsent() // Test attempting to resend a sent request throws an exception void tst_qdeclarativexmlhttprequest::send_alreadySent() { - QDeclarativeComponent component(&engine, TEST_FILE("send_alreadySent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("send_alreadySent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -518,11 +513,11 @@ void tst_qdeclarativexmlhttprequest::send_ignoreData() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("send_ignoreData_GET.expect"), - TEST_FILE("send_ignoreData.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("send_ignoreData_GET.expect"), + testFileUrl("send_ignoreData.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml")); + QDeclarativeComponent component(&engine, testFileUrl("send_ignoreData.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("reqType", "GET"); @@ -537,11 +532,11 @@ void tst_qdeclarativexmlhttprequest::send_ignoreData() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("send_ignoreData_HEAD.expect"), - TEST_FILE("send_ignoreData.reply"), + QVERIFY(server.wait(testFileUrl("send_ignoreData_HEAD.expect"), + testFileUrl("send_ignoreData.reply"), QUrl())); - QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml")); + QDeclarativeComponent component(&engine, testFileUrl("send_ignoreData.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("reqType", "HEAD"); @@ -556,11 +551,11 @@ void tst_qdeclarativexmlhttprequest::send_ignoreData() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("send_ignoreData_DELETE.expect"), - TEST_FILE("send_ignoreData.reply"), + QVERIFY(server.wait(testFileUrl("send_ignoreData_DELETE.expect"), + testFileUrl("send_ignoreData.reply"), QUrl())); - QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml")); + QDeclarativeComponent component(&engine, testFileUrl("send_ignoreData.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("reqType", "DELETE"); @@ -581,11 +576,11 @@ void tst_qdeclarativexmlhttprequest::send_withdata() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE(file_expected), - TEST_FILE("send_data.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl(file_expected), + testFileUrl("send_data.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE(file_qml)); + QDeclarativeComponent component(&engine, testFileUrl(file_qml)); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -613,7 +608,7 @@ void tst_qdeclarativexmlhttprequest::send_withdata_data() // Test abort() has no effect in unsent state void tst_qdeclarativexmlhttprequest::abort_unsent() { - QDeclarativeComponent component(&engine, TEST_FILE("abort_unsent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("abort_unsent.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "testdocument.html"); @@ -634,7 +629,7 @@ void tst_qdeclarativexmlhttprequest::abort_unsent() // Test abort() cancels an open (but unsent) request void tst_qdeclarativexmlhttprequest::abort_opened() { - QDeclarativeComponent component(&engine, TEST_FILE("abort_opened.qml")); + QDeclarativeComponent component(&engine, testFileUrl("abort_opened.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "testdocument.html"); @@ -657,11 +652,11 @@ void tst_qdeclarativexmlhttprequest::abort() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("abort.expect"), - TEST_FILE("abort.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("abort.expect"), + testFileUrl("abort.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("abort.qml")); + QDeclarativeComponent component(&engine, testFileUrl("abort.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("urlDummy", "http://127.0.0.1:14449/testdocument.html"); @@ -683,12 +678,12 @@ void tst_qdeclarativexmlhttprequest::getResponseHeader() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), - TEST_FILE("getResponseHeader.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("getResponseHeader.expect"), + testFileUrl("getResponseHeader.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getResponseHeader.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -719,7 +714,7 @@ void tst_qdeclarativexmlhttprequest::getResponseHeader() // Test getResponseHeader throws an exception in an invalid state void tst_qdeclarativexmlhttprequest::getResponseHeader_unsent() { - QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getResponseHeader_unsent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -731,7 +726,7 @@ void tst_qdeclarativexmlhttprequest::getResponseHeader_unsent() // Test getResponseHeader throws an exception in an invalid state void tst_qdeclarativexmlhttprequest::getResponseHeader_sent() { - QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getResponseHeader_sent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -743,7 +738,7 @@ void tst_qdeclarativexmlhttprequest::getResponseHeader_sent() // Invalid arg count throws exception void tst_qdeclarativexmlhttprequest::getResponseHeader_args() { - QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_args.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getResponseHeader_args.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -758,11 +753,11 @@ void tst_qdeclarativexmlhttprequest::getAllResponseHeaders() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), - TEST_FILE("getResponseHeader.reply"), - TEST_FILE("testdocument.html"))); + QVERIFY(server.wait(testFileUrl("getResponseHeader.expect"), + testFileUrl("getResponseHeader.reply"), + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getAllResponseHeaders.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -787,7 +782,7 @@ void tst_qdeclarativexmlhttprequest::getAllResponseHeaders() // Test getAllResponseHeaders throws an exception in an invalid state void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_unsent() { - QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getAllResponseHeaders_unsent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -799,7 +794,7 @@ void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_unsent() // Test getAllResponseHeaders throws an exception in an invalid state void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_sent() { - QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getAllResponseHeaders_sent.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -811,7 +806,7 @@ void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_sent() // Invalid arg count throws exception void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_args() { - QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml")); + QDeclarativeComponent component(&engine, testFileUrl("getAllResponseHeaders_args.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -827,11 +822,11 @@ void tst_qdeclarativexmlhttprequest::status() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("status.expect"), + QVERIFY(server.wait(testFileUrl("status.expect"), replyUrl, - TEST_FILE("testdocument.html"))); + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("status.qml")); + QDeclarativeComponent component(&engine, testFileUrl("status.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -856,9 +851,9 @@ void tst_qdeclarativexmlhttprequest::status_data() QTest::addColumn<QUrl>("replyUrl"); QTest::addColumn<int>("status"); - QTest::newRow("OK") << TEST_FILE("status.200.reply") << 200; - QTest::newRow("Not Found") << TEST_FILE("status.404.reply") << 404; - QTest::newRow("Bad Request") << TEST_FILE("status.400.reply") << 400; + QTest::newRow("OK") << testFileUrl("status.200.reply") << 200; + QTest::newRow("Not Found") << testFileUrl("status.404.reply") << 404; + QTest::newRow("Bad Request") << testFileUrl("status.400.reply") << 400; } void tst_qdeclarativexmlhttprequest::statusText() @@ -868,11 +863,11 @@ void tst_qdeclarativexmlhttprequest::statusText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("status.expect"), + QVERIFY(server.wait(testFileUrl("status.expect"), replyUrl, - TEST_FILE("testdocument.html"))); + testFileUrl("testdocument.html"))); - QDeclarativeComponent component(&engine, TEST_FILE("statusText.qml")); + QDeclarativeComponent component(&engine, testFileUrl("statusText.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -897,9 +892,9 @@ void tst_qdeclarativexmlhttprequest::statusText_data() QTest::addColumn<QUrl>("replyUrl"); QTest::addColumn<QString>("statusText"); - QTest::newRow("OK") << TEST_FILE("status.200.reply") << "OK"; - QTest::newRow("Not Found") << TEST_FILE("status.404.reply") << "Document not found"; - QTest::newRow("Bad Request") << TEST_FILE("status.400.reply") << "Bad request"; + QTest::newRow("OK") << testFileUrl("status.200.reply") << "OK"; + QTest::newRow("Not Found") << testFileUrl("status.404.reply") << "Document not found"; + QTest::newRow("Bad Request") << testFileUrl("status.400.reply") << "Bad request"; } void tst_qdeclarativexmlhttprequest::responseText() @@ -910,11 +905,11 @@ void tst_qdeclarativexmlhttprequest::responseText() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - QVERIFY(server.wait(TEST_FILE("status.expect"), + QVERIFY(server.wait(testFileUrl("status.expect"), replyUrl, bodyUrl)); - QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml")); + QDeclarativeComponent component(&engine, testFileUrl("responseText.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/testdocument.html"); @@ -940,10 +935,10 @@ void tst_qdeclarativexmlhttprequest::responseText_data() QTest::addColumn<QUrl>("bodyUrl"); QTest::addColumn<QString>("responseText"); - QTest::newRow("OK") << TEST_FILE("status.200.reply") << TEST_FILE("testdocument.html") << "QML Rocks!\n"; - QTest::newRow("empty body") << TEST_FILE("status.200.reply") << QUrl() << ""; - QTest::newRow("Not Found") << TEST_FILE("status.404.reply") << TEST_FILE("testdocument.html") << ""; - QTest::newRow("Bad Request") << TEST_FILE("status.404.reply") << TEST_FILE("testdocument.html") << ""; + QTest::newRow("OK") << testFileUrl("status.200.reply") << testFileUrl("testdocument.html") << "QML Rocks!\n"; + QTest::newRow("empty body") << testFileUrl("status.200.reply") << QUrl() << ""; + QTest::newRow("Not Found") << testFileUrl("status.404.reply") << testFileUrl("testdocument.html") << ""; + QTest::newRow("Bad Request") << testFileUrl("status.404.reply") << testFileUrl("testdocument.html") << ""; } void tst_qdeclarativexmlhttprequest::nonUtf8() @@ -952,7 +947,7 @@ void tst_qdeclarativexmlhttprequest::nonUtf8() QFETCH(QString, responseText); QFETCH(QString, xmlRootNodeValue); - QDeclarativeComponent component(&engine, TEST_FILE("utf16.qml")); + QDeclarativeComponent component(&engine, testFileUrl("utf16.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -991,7 +986,7 @@ void tst_qdeclarativexmlhttprequest::nonUtf8_data() // throws an exception void tst_qdeclarativexmlhttprequest::invalidMethodUsage() { - QDeclarativeComponent component(&engine, TEST_FILE("invalidMethodUsage.qml")); + QDeclarativeComponent component(&engine, testFileUrl("invalidMethodUsage.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1018,9 +1013,9 @@ void tst_qdeclarativexmlhttprequest::redirects() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirecttarget.html"); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); - QDeclarativeComponent component(&engine, TEST_FILE("redirects.qml")); + QDeclarativeComponent component(&engine, testFileUrl("redirects.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/redirect.html"); @@ -1037,9 +1032,9 @@ void tst_qdeclarativexmlhttprequest::redirects() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirectmissing.html"); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); - QDeclarativeComponent component(&engine, TEST_FILE("redirectError.qml")); + QDeclarativeComponent component(&engine, testFileUrl("redirectError.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/redirect.html"); @@ -1056,9 +1051,9 @@ void tst_qdeclarativexmlhttprequest::redirects() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirect.html"); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); - QDeclarativeComponent component(&engine, TEST_FILE("redirectRecur.qml")); + QDeclarativeComponent component(&engine, testFileUrl("redirectRecur.qml")); QObject *object = component.beginCreate(engine.rootContext()); QVERIFY(object != 0); object->setProperty("url", "http://127.0.0.1:14445/redirect.html"); @@ -1079,7 +1074,7 @@ void tst_qdeclarativexmlhttprequest::redirects() void tst_qdeclarativexmlhttprequest::responseXML_invalid() { - QDeclarativeComponent component(&engine, TEST_FILE("responseXML_invalid.qml")); + QDeclarativeComponent component(&engine, testFileUrl("responseXML_invalid.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1093,7 +1088,7 @@ void tst_qdeclarativexmlhttprequest::responseXML_invalid() // Test the Document DOM element void tst_qdeclarativexmlhttprequest::document() { - QDeclarativeComponent component(&engine, TEST_FILE("document.qml")); + QDeclarativeComponent component(&engine, testFileUrl("document.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1107,7 +1102,7 @@ void tst_qdeclarativexmlhttprequest::document() // Test the Element DOM element void tst_qdeclarativexmlhttprequest::element() { - QDeclarativeComponent component(&engine, TEST_FILE("element.qml")); + QDeclarativeComponent component(&engine, testFileUrl("element.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1121,7 +1116,7 @@ void tst_qdeclarativexmlhttprequest::element() // Test the Attr DOM element void tst_qdeclarativexmlhttprequest::attr() { - QDeclarativeComponent component(&engine, TEST_FILE("attr.qml")); + QDeclarativeComponent component(&engine, testFileUrl("attr.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1135,7 +1130,7 @@ void tst_qdeclarativexmlhttprequest::attr() // Test the Text DOM element void tst_qdeclarativexmlhttprequest::text() { - QDeclarativeComponent component(&engine, TEST_FILE("text.qml")); + QDeclarativeComponent component(&engine, testFileUrl("text.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -1149,7 +1144,7 @@ void tst_qdeclarativexmlhttprequest::text() // Test the CDataSection DOM element void tst_qdeclarativexmlhttprequest::cdata() { - QDeclarativeComponent component(&engine, TEST_FILE("cdata.qml")); + QDeclarativeComponent component(&engine, testFileUrl("cdata.qml")); QObject *object = component.create(); QVERIFY(object != 0); diff --git a/tests/auto/declarative/v4/tst_v4.cpp b/tests/auto/declarative/v4/tst_v4.cpp index 791610d541..46b4488b4d 100644 --- a/tests/auto/declarative/v4/tst_v4.cpp +++ b/tests/auto/declarative/v4/tst_v4.cpp @@ -51,17 +51,7 @@ #include "../../shared/util.h" #include "testtypes.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_v4 : public QObject +class tst_v4 : public QDeclarativeDataTest { Q_OBJECT public: @@ -86,6 +76,7 @@ private: void tst_v4::initTestCase() { + QDeclarativeDataTest::initTestCase(); registerTypes(); } @@ -102,7 +93,7 @@ void tst_v4::qtscript() QFETCH(QString, file); QV4Compiler::enableBindingsTest(true); - QDeclarativeComponent component(&engine, TEST_FILE(file)); + QDeclarativeComponent component(&engine, testFileUrl(file)); v4ErrorsMsgCount = 0; QtMsgHandler old = qInstallMsgHandler(v4ErrorsMsgHandler); @@ -132,7 +123,7 @@ void tst_v4::qtscript_data() void tst_v4::unnecessaryReeval() { - QDeclarativeComponent component(&engine, TEST_FILE("unnecessaryReeval.qml")); + QDeclarativeComponent component(&engine, testFileUrl("unnecessaryReeval.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -166,7 +157,7 @@ void tst_v4::unnecessaryReeval() void tst_v4::logicalOr() { { - QDeclarativeComponent component(&engine, TEST_FILE("logicalOr.qml")); + QDeclarativeComponent component(&engine, testFileUrl("logicalOr.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -179,7 +170,7 @@ void tst_v4::logicalOr() } { - QDeclarativeComponent component(&engine, TEST_FILE("logicalOr.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("logicalOr.2.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -195,7 +186,7 @@ void tst_v4::logicalOr() void tst_v4::conditionalExpr() { { - QDeclarativeComponent component(&engine, TEST_FILE("conditionalExpr.qml")); + QDeclarativeComponent component(&engine, testFileUrl("conditionalExpr.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -213,7 +204,7 @@ void tst_v4::conditionalExpr() // NestedObject::result. void tst_v4::nestedObjectAccess() { - QDeclarativeComponent component(&engine, TEST_FILE("nestedObjectAccess.qml")); + QDeclarativeComponent component(&engine, testFileUrl("nestedObjectAccess.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -228,7 +219,7 @@ void tst_v4::nestedObjectAccess() void tst_v4::subscriptionsInConditionalExpressions() { - QDeclarativeComponent component(&engine, TEST_FILE("subscriptionsInConditionalExpressions.qml")); + QDeclarativeComponent component(&engine, testFileUrl("subscriptionsInConditionalExpressions.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -244,7 +235,7 @@ void tst_v4::subscriptionsInConditionalExpressions() // Crash test void tst_v4::qtbug_21883() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_21883.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_21883.qml")); QString warning = component.url().toString() + ":4: Unable to assign null to ResultObject*"; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); @@ -256,7 +247,7 @@ void tst_v4::qtbug_21883() void tst_v4::qtbug_22816() { - QDeclarativeComponent component(&engine, TEST_FILE("qtbug_22816.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_22816.qml")); QObject *o = component.create(); QVERIFY(o != 0); diff --git a/tests/auto/declarative/v4/v4.pro b/tests/auto/declarative/v4/v4.pro index 04d20f0fc3..b14be36475 100644 --- a/tests/auto/declarative/v4/v4.pro +++ b/tests/auto/declarative/v4/v4.pro @@ -3,8 +3,10 @@ TARGET = tst_qdeclarativev4 macx:CONFIG -= app_bundle SOURCES += tst_v4.cpp \ - testtypes.cpp -HEADERS += testtypes.h + testtypes.cpp \ + ../../shared/util.cpp +HEADERS += testtypes.h \ + ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro index fd35266f66..f5bebb3f49 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimations -SOURCES += tst_qdeclarativeanimations.cpp +SOURCES += tst_qdeclarativeanimations.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 2a2055ebbf..190143287a 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -56,14 +56,18 @@ #include "../../shared/util.h" -class tst_qdeclarativeanimations : public QObject +class tst_qdeclarativeanimations : public QDeclarativeDataTest { Q_OBJECT public: tst_qdeclarativeanimations() {} private slots: - void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered + void initTestCase() + { + QDeclarativeEngine engine; // ensure types are registered + QDeclarativeDataTest::initTestCase(); + } void simpleProperty(); void simpleNumber(); @@ -223,7 +227,7 @@ void tst_qdeclarativeanimations::simplePath() { { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathAnimation.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathAnimation.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -259,7 +263,7 @@ void tst_qdeclarativeanimations::simplePath() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathAnimation2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathAnimation2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -291,7 +295,7 @@ void tst_qdeclarativeanimations::simplePath() void tst_qdeclarativeanimations::pathInterpolator() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathInterpolator.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathInterpolator.qml")); QDeclarativePathInterpolator *interpolator = qobject_cast<QDeclarativePathInterpolator*>(c.create()); QVERIFY(interpolator); @@ -316,7 +320,7 @@ void tst_qdeclarativeanimations::pathInterpolator() void tst_qdeclarativeanimations::pathInterpolatorBackwardJump() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathInterpolatorBack.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathInterpolatorBack.qml")); QDeclarativePathInterpolator *interpolator = qobject_cast<QDeclarativePathInterpolator*>(c.create()); QVERIFY(interpolator); @@ -348,7 +352,7 @@ void tst_qdeclarativeanimations::pathInterpolatorBackwardJump() void tst_qdeclarativeanimations::pathWithNoStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathAnimationNoStart.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathAnimationNoStart.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -471,7 +475,7 @@ void tst_qdeclarativeanimations::badTypes() //don't crash { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("badtype1.qml"))); + view->setSource(testFileUrl("badtype1.qml")); qApp->processEvents(); @@ -481,7 +485,7 @@ void tst_qdeclarativeanimations::badTypes() //make sure we get a compiler error { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("badtype2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("badtype2.qml")); QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); c.create(); @@ -492,7 +496,7 @@ void tst_qdeclarativeanimations::badTypes() //make sure we get a compiler error { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("badtype3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("badtype3.qml")); QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); c.create(); @@ -503,7 +507,7 @@ void tst_qdeclarativeanimations::badTypes() //don't crash { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("badtype4.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("badtype4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -521,14 +525,14 @@ void tst_qdeclarativeanimations::badProperties() { QDeclarativeEngine engine; - QDeclarativeComponent c1(&engine, QUrl::fromLocalFile(TESTDATA("badproperty1.qml"))); - QByteArray message = QUrl::fromLocalFile(TESTDATA("badproperty1.qml")).toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate non-existent property \"border.colr\""; + QDeclarativeComponent c1(&engine, testFileUrl("badproperty1.qml")); + QByteArray message = testFileUrl("badproperty1.qml").toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate non-existent property \"border.colr\""; QTest::ignoreMessage(QtWarningMsg, message); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c1.create()); QVERIFY(rect); - QDeclarativeComponent c2(&engine, QUrl::fromLocalFile(TESTDATA("badproperty2.qml"))); - message = QUrl::fromLocalFile(TESTDATA("badproperty2.qml")).toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate read-only property \"border\""; + QDeclarativeComponent c2(&engine, testFileUrl("badproperty2.qml")); + message = testFileUrl("badproperty2.qml").toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate read-only property \"border\""; QTest::ignoreMessage(QtWarningMsg, message); rect = qobject_cast<QQuickRectangle*>(c2.create()); QVERIFY(rect); @@ -545,7 +549,7 @@ void tst_qdeclarativeanimations::mixedTypes() //assumes border.width stays a real -- not real robust { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("mixedtype1.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("mixedtype1.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -561,7 +565,7 @@ void tst_qdeclarativeanimations::mixedTypes() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("mixedtype2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("mixedtype2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -581,7 +585,7 @@ void tst_qdeclarativeanimations::properties() const int waitDuration = 300; { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -593,7 +597,7 @@ void tst_qdeclarativeanimations::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -605,7 +609,7 @@ void tst_qdeclarativeanimations::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -617,7 +621,7 @@ void tst_qdeclarativeanimations::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties4.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -630,7 +634,7 @@ void tst_qdeclarativeanimations::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("properties5.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("properties5.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -647,7 +651,7 @@ void tst_qdeclarativeanimations::propertiesTransition() const int waitDuration = 300; { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -660,7 +664,7 @@ void tst_qdeclarativeanimations::propertiesTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -675,7 +679,7 @@ void tst_qdeclarativeanimations::propertiesTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -688,7 +692,7 @@ void tst_qdeclarativeanimations::propertiesTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition4.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -702,7 +706,7 @@ void tst_qdeclarativeanimations::propertiesTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition5.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition5.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -716,7 +720,7 @@ void tst_qdeclarativeanimations::propertiesTransition() /*{ QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition6.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition6.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -730,7 +734,7 @@ void tst_qdeclarativeanimations::propertiesTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("propertiesTransition7.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("propertiesTransition7.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -746,7 +750,7 @@ void tst_qdeclarativeanimations::propertiesTransition() void tst_qdeclarativeanimations::pathTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathTransition.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathTransition.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -766,7 +770,7 @@ void tst_qdeclarativeanimations::pathTransition() void tst_qdeclarativeanimations::disabledTransition() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("disabledTransition.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("disabledTransition.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -806,7 +810,7 @@ void tst_qdeclarativeanimations::attached() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("attached.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("attached.qml")); QTest::ignoreMessage(QtDebugMsg, "off"); QTest::ignoreMessage(QtDebugMsg, "on"); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); @@ -818,7 +822,7 @@ void tst_qdeclarativeanimations::propertyValueSourceDefaultStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("valuesource.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("valuesource.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -831,7 +835,7 @@ void tst_qdeclarativeanimations::propertyValueSourceDefaultStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("valuesource2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("valuesource2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -844,7 +848,7 @@ void tst_qdeclarativeanimations::propertyValueSourceDefaultStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("dontAutoStart.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("dontAutoStart.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -861,7 +865,7 @@ void tst_qdeclarativeanimations::dontStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("dontStart.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("dontStart.qml")); QString warning = c.url().toString() + ":14:13: QML NumberAnimation: setRunning() cannot be used on non-root animation nodes."; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -876,7 +880,7 @@ void tst_qdeclarativeanimations::dontStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("dontStart2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("dontStart2.qml")); QString warning = c.url().toString() + ":15:17: QML NumberAnimation: setRunning() cannot be used on non-root animation nodes."; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -959,7 +963,7 @@ void tst_qdeclarativeanimations::easingProperties() void tst_qdeclarativeanimations::rotation() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("rotation.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("rotation.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -990,7 +994,7 @@ void tst_qdeclarativeanimations::runningTrueBug() { //ensure we start correctly when "running: true" is explicitly set QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("runningTrueBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("runningTrueBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -1007,7 +1011,7 @@ void tst_qdeclarativeanimations::nonTransitionBug() //in the case where an animation in the transition doesn't match anything (but previously did) QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("nonTransitionBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("nonTransitionBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1033,7 +1037,7 @@ void tst_qdeclarativeanimations::registrationBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("registrationBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("registrationBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QTRY_COMPARE(rect->property("value"), QVariant(int(100))); @@ -1043,7 +1047,7 @@ void tst_qdeclarativeanimations::doubleRegistrationBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("doubleRegistrationBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("doubleRegistrationBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1081,7 +1085,7 @@ void tst_qdeclarativeanimations::transitionAssignmentBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("transitionAssignmentBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("transitionAssignmentBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1093,7 +1097,7 @@ void tst_qdeclarativeanimations::pauseBindingBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pauseBindingBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pauseBindingBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QDeclarativeAbstractAnimation *anim = rect->findChild<QDeclarativeAbstractAnimation*>("animation"); @@ -1107,7 +1111,7 @@ void tst_qdeclarativeanimations::pauseBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pauseBug.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pauseBug.qml")); QDeclarativeAbstractAnimation *anim = qobject_cast<QDeclarativeAbstractAnimation*>(c.create()); QVERIFY(anim != 0); QCOMPARE(anim->qtAnimation()->state(), QAbstractAnimation::Paused); diff --git a/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro index 3ac9446a4c..e68c68a96c 100644 --- a/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativebehaviors -SOURCES += tst_qdeclarativebehaviors.cpp +SOURCES += tst_qdeclarativebehaviors.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index 526a23f262..f96f0949a1 100644 --- a/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -50,7 +50,7 @@ #include <private/qquickitem_p.h> #include "../../shared/util.h" -class tst_qdeclarativebehaviors : public QObject +class tst_qdeclarativebehaviors : public QDeclarativeDataTest { Q_OBJECT public: @@ -85,7 +85,7 @@ private slots: void tst_qdeclarativebehaviors::simpleBehavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("simple.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("simple.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); QTRY_VERIFY(qobject_cast<QDeclarativeBehavior*>(rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation()); @@ -101,7 +101,7 @@ void tst_qdeclarativebehaviors::simpleBehavior() void tst_qdeclarativebehaviors::scriptTriggered() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("scripttrigger.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("scripttrigger.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -116,7 +116,7 @@ void tst_qdeclarativebehaviors::scriptTriggered() void tst_qdeclarativebehaviors::cppTriggered() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("cpptrigger.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("cpptrigger.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -133,7 +133,7 @@ void tst_qdeclarativebehaviors::cppTriggered() void tst_qdeclarativebehaviors::loop() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("loop.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("loop.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -146,7 +146,7 @@ void tst_qdeclarativebehaviors::loop() void tst_qdeclarativebehaviors::colorBehavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("color.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("color.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -161,7 +161,7 @@ void tst_qdeclarativebehaviors::colorBehavior() void tst_qdeclarativebehaviors::parentBehavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("parent.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("parent.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -175,7 +175,7 @@ void tst_qdeclarativebehaviors::parentBehavior() void tst_qdeclarativebehaviors::replaceBinding() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("binding.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("binding.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -208,7 +208,7 @@ void tst_qdeclarativebehaviors::group() /* XXX TODO Create a test element for this case. { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("groupProperty.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("groupProperty.qml"))); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); qDebug() << c.errorString(); QTRY_VERIFY(rect); @@ -225,7 +225,7 @@ void tst_qdeclarativebehaviors::group() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("groupProperty2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("groupProperty2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QTRY_VERIFY(rect); @@ -241,7 +241,7 @@ void tst_qdeclarativebehaviors::group() void tst_qdeclarativebehaviors::valueType() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("valueType.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("valueType.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -254,7 +254,7 @@ void tst_qdeclarativebehaviors::valueType() void tst_qdeclarativebehaviors::emptyBehavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("empty.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("empty.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -268,7 +268,7 @@ void tst_qdeclarativebehaviors::emptyBehavior() void tst_qdeclarativebehaviors::explicitSelection() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("explicit.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("explicit.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -283,7 +283,7 @@ void tst_qdeclarativebehaviors::explicitSelection() void tst_qdeclarativebehaviors::nonSelectingBehavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("nonSelecting2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("nonSelecting2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -297,8 +297,8 @@ void tst_qdeclarativebehaviors::nonSelectingBehavior() void tst_qdeclarativebehaviors::reassignedAnimation() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("reassignedAnimation.qml"))); - QString warning = QUrl::fromLocalFile(TESTDATA("reassignedAnimation.qml")).toString() + ":9:9: QML Behavior: Cannot change the animation assigned to a Behavior."; + QDeclarativeComponent c(&engine, testFileUrl("reassignedAnimation.qml")); + QString warning = testFileUrl("reassignedAnimation.qml").toString() + ":9:9: QML Behavior: Cannot change the animation assigned to a Behavior."; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -311,7 +311,7 @@ void tst_qdeclarativebehaviors::reassignedAnimation() void tst_qdeclarativebehaviors::disabled() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("disabled.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("disabled.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); QCOMPARE(rect->findChild<QDeclarativeBehavior*>("MyBehavior")->enabled(), false); @@ -327,7 +327,7 @@ void tst_qdeclarativebehaviors::dontStart() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("dontStart.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("dontStart.qml")); QString warning = c.url().toString() + ":13:13: QML NumberAnimation: setRunning() cannot be used on non-root animation nodes."; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); @@ -345,7 +345,7 @@ void tst_qdeclarativebehaviors::startup() { { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("startup.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("startup.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -359,7 +359,7 @@ void tst_qdeclarativebehaviors::startup() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("startup2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("startup2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -379,7 +379,7 @@ void tst_qdeclarativebehaviors::startup() void tst_qdeclarativebehaviors::groupedPropertyCrash() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("groupedPropertyCrash.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("groupedPropertyCrash.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); //don't crash @@ -390,7 +390,7 @@ void tst_qdeclarativebehaviors::groupedPropertyCrash() void tst_qdeclarativebehaviors::runningTrue() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("runningTrue.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("runningTrue.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -408,7 +408,7 @@ void tst_qdeclarativebehaviors::runningTrue() void tst_qdeclarativebehaviors::sameValue() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("qtbug12295.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("qtbug12295.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -438,7 +438,7 @@ void tst_qdeclarativebehaviors::delayedRegistration() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("delayedRegistration.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("delayedRegistration.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -455,7 +455,7 @@ void tst_qdeclarativebehaviors::startOnCompleted() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("startOnCompleted.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("startOnCompleted.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); diff --git a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro index de9461f7ac..e257696cc2 100644 --- a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,8 +2,11 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h -SOURCES += tst_qdeclarativefontloader.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += tst_qdeclarativefontloader.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 86789068ad..5b8ae05b28 100644 --- a/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -51,14 +51,14 @@ #define SERVER_PORT 14448 -class tst_qdeclarativefontloader : public QObject +class tst_qdeclarativefontloader : public QDeclarativeDataTest { Q_OBJECT public: tst_qdeclarativefontloader(); private slots: - void init(); + void initTestCase(); void noFont(); void namedFont(); void localFont(); @@ -77,11 +77,12 @@ private: tst_qdeclarativefontloader::tst_qdeclarativefontloader() : server(SERVER_PORT) { - server.serveDirectory(TESTDATA("")); } -void tst_qdeclarativefontloader::init() +void tst_qdeclarativefontloader::initTestCase() { + QDeclarativeDataTest::initTestCase(); + server.serveDirectory(dataDirectory()); QVERIFY(server.isValid()); } @@ -115,7 +116,7 @@ void tst_qdeclarativefontloader::namedFont() void tst_qdeclarativefontloader::localFont() { - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + TESTDATA("tarzeau_ocr_a.ttf") + "\" }"; + QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFile("tarzeau_ocr_a.ttf") + "\" }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create()); @@ -128,8 +129,8 @@ void tst_qdeclarativefontloader::localFont() void tst_qdeclarativefontloader::failLocalFont() { - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + QUrl::fromLocalFile(TESTDATA("dummy.ttf")).toString() + "\" }"; - QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + QUrl::fromLocalFile(TESTDATA("dummy.ttf")).toString() + "\"").toUtf8().constData()); + QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFileUrl("dummy.ttf").toString() + "\" }"; + QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + testFileUrl("dummy.ttf").toString() + "\"").toUtf8().constData()); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create()); @@ -188,7 +189,7 @@ void tst_qdeclarativefontloader::changeFont() { QString componentStr = "import QtQuick 2.0\nFontLoader { source: font }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("font", QUrl::fromLocalFile(TESTDATA("tarzeau_ocr_a.ttf"))); + ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create()); @@ -210,7 +211,7 @@ void tst_qdeclarativefontloader::changeFont() QCOMPARE(statusSpy.count(), 2); QTRY_COMPARE(fontObject->name(), QString("Daniel")); - ctxt->setContextProperty("font", QUrl::fromLocalFile(TESTDATA("tarzeau_ocr_a.ttf"))); + ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf")); QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready); QCOMPARE(nameSpy.count(), 2); QCOMPARE(statusSpy.count(), 2); @@ -225,7 +226,7 @@ void tst_qdeclarativefontloader::changeFont() void tst_qdeclarativefontloader::changeFontSourceViaState() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("qtbug-20268.qml"))); + QQuickView canvas(testFileUrl("qtbug-20268.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -240,7 +241,7 @@ void tst_qdeclarativefontloader::changeFontSourceViaState() canvas.rootObject()->setProperty("usename", true); // This warning should probably not be printed once QTBUG-20268 is fixed - QString warning = QString(QUrl::fromLocalFile(TESTDATA("qtbug-20268.qml")).toString()) + + QString warning = QString(testFileUrl("qtbug-20268.qml").toString()) + QLatin1String(":13:5: QML FontLoader: Cannot load font: \"\""); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); diff --git a/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro index 9f4204efa3..caadcbd728 100644 --- a/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro +++ b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativepath macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativepath.cpp +SOURCES += tst_qdeclarativepath.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp index bf4f70b292..9a21e56aab 100644 --- a/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp +++ b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp @@ -46,7 +46,7 @@ #include "../../shared/util.h" -class tst_QDeclarativePath : public QObject +class tst_QDeclarativePath : public QDeclarativeDataTest { Q_OBJECT public: @@ -61,7 +61,7 @@ private slots: void tst_QDeclarativePath::arc() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("arc.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("arc.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj != 0); @@ -96,7 +96,7 @@ void tst_QDeclarativePath::arc() void tst_QDeclarativePath::catmullromCurve() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("curve.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("curve.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj != 0); @@ -131,7 +131,7 @@ void tst_QDeclarativePath::catmullromCurve() void tst_QDeclarativePath::svg() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("svg.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("svg.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj != 0); diff --git a/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 391c28c10a..1cc8149e85 100644 --- a/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -2,11 +2,12 @@ CONFIG += testcase TARGET = tst_qdeclarativepixmapcache macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativepixmapcache.cpp - +SOURCES += tst_qdeclarativepixmapcache.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h -SOURCES += ../../shared/testhttpserver.cpp importFiles.files = data importFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 4dd384748f..e7710b8691 100644 --- a/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -54,22 +54,14 @@ #define PIXMAP_DATA_LEAK_TEST 0 -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -class tst_qdeclarativepixmapcache : public QObject +class tst_qdeclarativepixmapcache : public QDeclarativeDataTest { Q_OBJECT public: - tst_qdeclarativepixmapcache() : - server(14452) - { - server.serveDirectory(TESTDATA("http")); - } + tst_qdeclarativepixmapcache() : server(14452) {} private slots: + void initTestCase(); void single(); void single_data(); void parallel(); @@ -118,6 +110,13 @@ static const bool localfile_optimized = true; static const bool localfile_optimized = false; #endif + +void tst_qdeclarativepixmapcache::initTestCase() +{ + QDeclarativeDataTest::initTestCase(); + server.serveDirectory(testFile("http")); +} + void tst_qdeclarativepixmapcache::single_data() { // Note, since QDeclarativePixmapCache is shared, tests affect each other! @@ -129,8 +128,8 @@ void tst_qdeclarativepixmapcache::single_data() QTest::addColumn<bool>("neterror"); // File URLs are optimized - QTest::newRow("local") << TEST_FILE("exists.png") << localfile_optimized << true << false; - QTest::newRow("local") << TEST_FILE("notexists.png") << localfile_optimized << false << false; + QTest::newRow("local") << testFileUrl("exists.png") << localfile_optimized << true << false; + QTest::newRow("local") << testFileUrl("notexists.png") << localfile_optimized << false << false; QTest::newRow("remote") << QUrl("http://127.0.0.1:14452/exists.png") << false << true << false; QTest::newRow("remote") << QUrl("http://127.0.0.1:14452/notexists.png") << false << false << true; } @@ -193,8 +192,8 @@ void tst_qdeclarativepixmapcache::parallel_data() QTest::addColumn<int>("cancel"); // which one to cancel QTest::newRow("local") - << TEST_FILE("exists1.png") - << TEST_FILE("exists2.png") + << testFileUrl("exists1.png") + << testFileUrl("exists2.png") << (localfile_optimized ? 2 : 0) << -1; @@ -290,7 +289,7 @@ void tst_qdeclarativepixmapcache::parallel() void tst_qdeclarativepixmapcache::massive() { QDeclarativeEngine engine; - QUrl url = TEST_FILE("massive.png"); + QUrl url = testFileUrl("massive.png"); // Confirm that massive images remain in the cache while they are // in use by the application. @@ -368,7 +367,7 @@ void createNetworkServer() { QEventLoop eventLoop; TestHTTPServer server(14453); - server.serveDirectory(TESTDATA("http")); + server.serveDirectory(QDeclarativeDataTest::instance()->testFile("http")); QTimer::singleShot(100, &eventLoop, SLOT(quit())); eventLoop.exec(); } @@ -396,7 +395,7 @@ void tst_qdeclarativepixmapcache::networkCrash() void tst_qdeclarativepixmapcache::lockingCrash() { TestHTTPServer server(14453); - server.serveDirectory(TESTDATA("http"), TestHTTPServer::Delay); + server.serveDirectory(testFile("http"), TestHTTPServer::Delay); { QDeclarativePixmap* p = new QDeclarativePixmap; @@ -422,7 +421,7 @@ class DataLeakView : public QQuickView public: explicit DataLeakView() : QQuickView() { - setSource(TEST_FILE("dataLeak.qml")); + setSource(testFileUrl("dataLeak.qml")); } void showFor2Seconds() @@ -449,9 +448,9 @@ void tst_qdeclarativepixmapcache::dataLeak() { QScopedPointer<DataLeakView> test(new DataLeakView); test->showFor2Seconds(); - dataLeakPixmap()->load(test->engine(), TEST_FILE("exists.png")); - p1->load(test->engine(), TEST_FILE("exists.png")); - p2->load(test->engine(), TEST_FILE("exists2.png")); + dataLeakPixmap()->load(test->engine(), testFileUrl("exists.png")); + p1->load(test->engine(), testFileUrl("exists.png")); + p2->load(test->engine(), testFileUrl("exists2.png")); QTest::qWait(2005); // 2 seconds + a few more millis. } diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 1e8a7d5ba6..044a7968f3 100644 --- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativesmoothedanimation.cpp +SOURCES += tst_qdeclarativesmoothedanimation.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index 632bcda091..2736377218 100644 --- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -46,7 +46,7 @@ #include <private/qdeclarativevaluetype_p.h> #include "../../shared/util.h" -class tst_qdeclarativesmoothedanimation : public QObject +class tst_qdeclarativesmoothedanimation : public QDeclarativeDataTest { Q_OBJECT public: @@ -71,7 +71,7 @@ tst_qdeclarativesmoothedanimation::tst_qdeclarativesmoothedanimation() void tst_qdeclarativesmoothedanimation::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("smoothedanimation1.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation1.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -88,7 +88,7 @@ void tst_qdeclarativesmoothedanimation::defaultValues() void tst_qdeclarativesmoothedanimation::values() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("smoothedanimation2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation2.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -105,7 +105,7 @@ void tst_qdeclarativesmoothedanimation::values() void tst_qdeclarativesmoothedanimation::disabled() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("smoothedanimation3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("smoothedanimation3.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -148,7 +148,7 @@ void tst_qdeclarativesmoothedanimation::valueSource() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("smoothedanimationValueSource.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("smoothedanimationValueSource.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); @@ -180,7 +180,7 @@ void tst_qdeclarativesmoothedanimation::behavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("smoothedanimationBehavior.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("smoothedanimationBehavior.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect); diff --git a/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro index 3ac2551380..9c7000a247 100644 --- a/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativespringanimation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativespringanimation.cpp +SOURCES += tst_qdeclarativespringanimation.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp index f7acc2a3e0..1e747e4951 100644 --- a/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp @@ -45,7 +45,7 @@ #include <private/qdeclarativevaluetype_p.h> #include "../../shared/util.h" -class tst_qdeclarativespringanimation : public QObject +class tst_qdeclarativespringanimation : public QDeclarativeDataTest { Q_OBJECT public: @@ -67,7 +67,7 @@ tst_qdeclarativespringanimation::tst_qdeclarativespringanimation() void tst_qdeclarativespringanimation::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("springanimation1.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("springanimation1.qml")); QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create()); QVERIFY(obj != 0); @@ -87,7 +87,7 @@ void tst_qdeclarativespringanimation::defaultValues() void tst_qdeclarativespringanimation::values() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("springanimation2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("springanimation2.qml")); QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create()); QVERIFY(obj != 0); @@ -109,7 +109,7 @@ void tst_qdeclarativespringanimation::values() void tst_qdeclarativespringanimation::disabled() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("springanimation3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("springanimation3.qml")); QDeclarativeSpringAnimation *obj = qobject_cast<QDeclarativeSpringAnimation*>(c.create()); QVERIFY(obj != 0); diff --git a/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro index f799f7066b..dbf7441d3b 100644 --- a/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativestates macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativestates.cpp +SOURCES += tst_qdeclarativestates.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp index 663d78d402..69142daeff 100644 --- a/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp @@ -92,14 +92,14 @@ private: QML_DECLARE_TYPE(MyRect) QML_DECLARE_TYPEINFO(MyRect, QML_HAS_ATTACHED_PROPERTIES) -class tst_qdeclarativestates : public QObject +class tst_qdeclarativestates : public QDeclarativeDataTest { Q_OBJECT public: tst_qdeclarativestates() {} private: - static QByteArray fullDataPath(const QString &path); + QByteArray fullDataPath(const QString &path) const; private slots: void initTestCase(); @@ -151,12 +151,13 @@ private slots: void tst_qdeclarativestates::initTestCase() { + QDeclarativeDataTest::initTestCase(); qmlRegisterType<MyRect>("Qt.test", 1, 0, "MyRectangle"); } -QByteArray tst_qdeclarativestates::fullDataPath(const QString &path) +QByteArray tst_qdeclarativestates::fullDataPath(const QString &path) const { - return QUrl::fromLocalFile(TESTDATA(path)).toString().toUtf8(); + return testFileUrl(path).toString().toUtf8(); } void tst_qdeclarativestates::basicChanges() @@ -164,7 +165,7 @@ void tst_qdeclarativestates::basicChanges() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicChanges.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicChanges.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -179,7 +180,7 @@ void tst_qdeclarativestates::basicChanges() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicChanges2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicChanges2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -200,7 +201,7 @@ void tst_qdeclarativestates::basicChanges() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicChanges3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicChanges3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -236,7 +237,7 @@ void tst_qdeclarativestates::basicChanges() // signal using 'onPropertyWithNotifyChanged' even though the signal name is // actually 'oddlyNamedNotifySignal' - QDeclarativeComponent component(&engine, TESTDATA("basicChanges4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("basicChanges4.qml")); QVERIFY(component.isReady()); MyRect *rect = qobject_cast<MyRect*>(component.create()); @@ -258,7 +259,7 @@ void tst_qdeclarativestates::attachedPropertyChanges() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TESTDATA("attachedPropertyChanges.qml")); + QDeclarativeComponent component(&engine, testFileUrl("attachedPropertyChanges.qml")); QVERIFY(component.isReady()); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); @@ -280,7 +281,7 @@ void tst_qdeclarativestates::basicExtension() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicExtension.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicExtension.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -314,7 +315,7 @@ void tst_qdeclarativestates::basicExtension() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("fakeExtension.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("fakeExtension.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -346,7 +347,7 @@ void tst_qdeclarativestates::basicBinding() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicBinding.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicBinding.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -374,7 +375,7 @@ void tst_qdeclarativestates::basicBinding() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicBinding2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicBinding2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -405,7 +406,7 @@ void tst_qdeclarativestates::basicBinding() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicBinding3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicBinding3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -430,7 +431,7 @@ void tst_qdeclarativestates::basicBinding() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicBinding4.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicBinding4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); QVERIFY(rect != 0); @@ -463,7 +464,7 @@ void tst_qdeclarativestates::signalOverride() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("signalOverride.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("signalOverride.qml")); MyRect *rect = qobject_cast<MyRect*>(rectComponent.create()); QVERIFY(rect != 0); @@ -477,7 +478,7 @@ void tst_qdeclarativestates::signalOverride() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("signalOverride2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("signalOverride2.qml")); MyRect *rect = qobject_cast<MyRect*>(rectComponent.create()); QVERIFY(rect != 0); @@ -498,7 +499,7 @@ void tst_qdeclarativestates::signalOverrideCrash() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("signalOverrideCrash.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("signalOverrideCrash.qml")); MyRect *rect = qobject_cast<MyRect*>(rectComponent.create()); QVERIFY(rect != 0); @@ -510,7 +511,7 @@ void tst_qdeclarativestates::signalOverrideCrash2() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("signalOverrideCrash2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("signalOverrideCrash2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -525,7 +526,7 @@ void tst_qdeclarativestates::signalOverrideCrash3() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("signalOverrideCrash3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("signalOverrideCrash3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -542,7 +543,7 @@ void tst_qdeclarativestates::parentChange() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange1.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange1.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -569,7 +570,7 @@ void tst_qdeclarativestates::parentChange() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -584,7 +585,7 @@ void tst_qdeclarativestates::parentChange() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -606,7 +607,7 @@ void tst_qdeclarativestates::parentChange() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange6.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange6.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -626,7 +627,7 @@ void tst_qdeclarativestates::parentChangeErrors() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange4.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -642,7 +643,7 @@ void tst_qdeclarativestates::parentChangeErrors() } { - QDeclarativeComponent rectComponent(&engine, TESTDATA("parentChange5.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("parentChange5.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -662,7 +663,7 @@ void tst_qdeclarativestates::anchorChanges() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges1.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges1.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -695,7 +696,7 @@ void tst_qdeclarativestates::anchorChanges2() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -716,7 +717,7 @@ void tst_qdeclarativestates::anchorChanges3() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -767,7 +768,7 @@ void tst_qdeclarativestates::anchorChanges4() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges4.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges4.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -802,7 +803,7 @@ void tst_qdeclarativestates::anchorChanges5() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges5.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges5.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -846,7 +847,7 @@ void tst_qdeclarativestates::anchorChangesRTL() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges1.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges1.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -880,7 +881,7 @@ void tst_qdeclarativestates::anchorChangesRTL2() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -902,7 +903,7 @@ void tst_qdeclarativestates::anchorChangesRTL3() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChanges3.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChanges3.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -957,7 +958,7 @@ void tst_qdeclarativestates::anchorChangesCrash() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorChangesCrash.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorChangesCrash.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -970,7 +971,7 @@ void tst_qdeclarativestates::anchorChangesCrash() void tst_qdeclarativestates::anchorRewindBug() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("anchorRewindBug.qml"))); + view->setSource(testFileUrl("anchorRewindBug.qml")); view->show(); view->requestActivateWindow(); @@ -1010,7 +1011,7 @@ void tst_qdeclarativestates::anchorRewindBug2() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("anchorRewindBug2.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("anchorRewindBug2.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -1036,7 +1037,7 @@ void tst_qdeclarativestates::script() QDeclarativeEngine engine; { - QDeclarativeComponent rectComponent(&engine, TESTDATA("script.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("script.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1054,7 +1055,7 @@ void tst_qdeclarativestates::restoreEntryValues() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("restoreEntryValues.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("restoreEntryValues.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1071,7 +1072,7 @@ void tst_qdeclarativestates::explicitChanges() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("explicit.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("explicit.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1104,7 +1105,7 @@ void tst_qdeclarativestates::explicitChanges() void tst_qdeclarativestates::propertyErrors() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("propertyErrors.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("propertyErrors.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -1119,7 +1120,7 @@ void tst_qdeclarativestates::incorrectRestoreBug() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("basicChanges.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("basicChanges.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1145,7 +1146,7 @@ void tst_qdeclarativestates::autoStateAtStartupRestoreBug() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TESTDATA("autoStateAtStartupRestoreBug.qml")); + QDeclarativeComponent component(&engine, testFileUrl("autoStateAtStartupRestoreBug.qml")); QObject *obj = component.create(); QVERIFY(obj != 0); @@ -1162,7 +1163,7 @@ void tst_qdeclarativestates::deletingChange() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("deleting.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("deleting.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1194,7 +1195,7 @@ void tst_qdeclarativestates::deletingState() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("deletingState.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("deletingState.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); @@ -1225,7 +1226,7 @@ void tst_qdeclarativestates::tempState() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("legalTempState.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("legalTempState.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1239,7 +1240,7 @@ void tst_qdeclarativestates::illegalTempState() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("illegalTempState.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("illegalTempState.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1252,7 +1253,7 @@ void tst_qdeclarativestates::nonExistantProperty() { QDeclarativeEngine engine; - QDeclarativeComponent rectComponent(&engine, TESTDATA("nonExistantProp.qml")); + QDeclarativeComponent rectComponent(&engine, testFileUrl("nonExistantProp.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(rectComponent.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1265,7 +1266,7 @@ void tst_qdeclarativestates::reset() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("reset.qml")); + QDeclarativeComponent c(&engine, testFileUrl("reset.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1286,7 +1287,7 @@ void tst_qdeclarativestates::illegalObjectCreation() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TESTDATA("illegalObj.qml")); + QDeclarativeComponent component(&engine, testFileUrl("illegalObj.qml")); QList<QDeclarativeError> errors = component.errors(); QVERIFY(errors.count() == 1); const QDeclarativeError &error = errors.at(0); @@ -1299,7 +1300,7 @@ void tst_qdeclarativestates::whenOrdering() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("whenOrdering.qml")); + QDeclarativeComponent c(&engine, testFileUrl("whenOrdering.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1322,7 +1323,7 @@ void tst_qdeclarativestates::urlResolution() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("urlResolution.qml")); + QDeclarativeComponent c(&engine, testFileUrl("urlResolution.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1333,7 +1334,7 @@ void tst_qdeclarativestates::urlResolution() QVERIFY(myType != 0 && image1 != 0 && image2 != 0 && image3 != 0); QQuickItemPrivate::get(myType)->setState("SetImageState"); - QUrl resolved = QUrl::fromLocalFile(TESTDATA("Implementation/images/qt-logo.png")); + QUrl resolved = testFileUrl("Implementation/images/qt-logo.png"); QCOMPARE(image1->source(), resolved); QCOMPARE(image2->source(), resolved); QCOMPARE(image3->source(), resolved); @@ -1345,7 +1346,7 @@ void tst_qdeclarativestates::unnamedWhen() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("unnamedWhen.qml")); + QDeclarativeComponent c(&engine, testFileUrl("unnamedWhen.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1364,7 +1365,7 @@ void tst_qdeclarativestates::returnToBase() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("returnToBase.qml")); + QDeclarativeComponent c(&engine, testFileUrl("returnToBase.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1384,7 +1385,7 @@ void tst_qdeclarativestates::extendsBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("extendsBug.qml")); + QDeclarativeComponent c(&engine, testFileUrl("extendsBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); @@ -1399,7 +1400,7 @@ void tst_qdeclarativestates::editProperties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("editProperties.qml")); + QDeclarativeComponent c(&engine, testFileUrl("editProperties.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1527,7 +1528,7 @@ void tst_qdeclarativestates::QTBUG_14830() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("QTBUG-14830.qml")); + QDeclarativeComponent c(&engine, testFileUrl("QTBUG-14830.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); QQuickItem *item = rect->findChild<QQuickItem*>("area"); @@ -1540,7 +1541,7 @@ void tst_qdeclarativestates::avoidFastForward() QDeclarativeEngine engine; //shouldn't fast forward if there isn't a transition - QDeclarativeComponent c(&engine, TESTDATA("avoidFastForward.qml")); + QDeclarativeComponent c(&engine, testFileUrl("avoidFastForward.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); @@ -1554,7 +1555,7 @@ void tst_qdeclarativestates::revertListBug() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, TESTDATA("revertListBug.qml")); + QDeclarativeComponent c(&engine, testFileUrl("revertListBug.qml")); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create()); QVERIFY(rect != 0); diff --git a/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 10944bcb41..f5628fbd00 100644 --- a/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -2,7 +2,10 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativexmllistmodel.cpp +SOURCES += tst_qdeclarativexmllistmodel.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles diff --git a/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 316ac50c5e..4668af408f 100644 --- a/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -66,7 +66,7 @@ Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>) Q_DECLARE_METATYPE(QDeclarativeXmlModelData) Q_DECLARE_METATYPE(QDeclarativeXmlListModel::Status) -class tst_qdeclarativexmllistmodel : public QObject +class tst_qdeclarativexmllistmodel : public QDeclarativeDataTest { Q_OBJECT @@ -75,6 +75,7 @@ public: private slots: void initTestCase() { + QDeclarativeDataTest::initTestCase(); qRegisterMetaType<QDeclarativeXmlListModel::Status>(); } @@ -194,7 +195,7 @@ QNetworkAccessManager *CustomNetworkAccessManagerFactory::create(QObject *parent void tst_qdeclarativexmllistmodel::buildModel() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 9); @@ -213,7 +214,7 @@ void tst_qdeclarativexmllistmodel::testTypes() QFETCH(QString, roleName); QFETCH(QVariant, expectedValue); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("testtypes.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("testtypes.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); model->setProperty("xml",xml.toUtf8()); @@ -273,7 +274,7 @@ void tst_qdeclarativexmllistmodel::testTypes_data() void tst_qdeclarativexmllistmodel::cdata() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("recipes.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("recipes.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 5); @@ -285,7 +286,7 @@ void tst_qdeclarativexmllistmodel::cdata() void tst_qdeclarativexmllistmodel::attributes() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("recipes.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("recipes.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 5); @@ -296,7 +297,7 @@ void tst_qdeclarativexmllistmodel::attributes() void tst_qdeclarativexmllistmodel::roles() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 9); @@ -313,9 +314,9 @@ void tst_qdeclarativexmllistmodel::roles() void tst_qdeclarativexmllistmodel::roleErrors() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleErrors.qml"))); - QTest::ignoreMessage(QtWarningMsg, (QUrl::fromLocalFile(TESTDATA("roleErrors.qml")).toString() + ":7:5: QML XmlRole: An XmlRole query must not start with '/'").toUtf8().constData()); - QTest::ignoreMessage(QtWarningMsg, (QUrl::fromLocalFile(TESTDATA("roleErrors.qml")).toString() + ":10:5: QML XmlRole: invalid query: \"age/\"").toUtf8().constData()); + QDeclarativeComponent component(&engine, testFileUrl("roleErrors.qml")); + QTest::ignoreMessage(QtWarningMsg, (testFileUrl("roleErrors.qml").toString() + ":7:5: QML XmlRole: An XmlRole query must not start with '/'").toUtf8().constData()); + QTest::ignoreMessage(QtWarningMsg, (testFileUrl("roleErrors.qml").toString() + ":10:5: QML XmlRole: invalid query: \"age/\"").toUtf8().constData()); //### make sure we receive all expected warning messages. QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); @@ -336,8 +337,8 @@ void tst_qdeclarativexmllistmodel::roleErrors() void tst_qdeclarativexmllistmodel::uniqueRoleNames() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("unique.qml"))); - QTest::ignoreMessage(QtWarningMsg, (QUrl::fromLocalFile(TESTDATA("unique.qml")).toString() + ":8:5: QML XmlRole: \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData()); + QDeclarativeComponent component(&engine, testFileUrl("unique.qml")); + QTest::ignoreMessage(QtWarningMsg, (testFileUrl("unique.qml").toString() + ":8:5: QML XmlRole: \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData()); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 9); @@ -354,7 +355,7 @@ void tst_qdeclarativexmllistmodel::xml() QFETCH(QString, xml); QFETCH(int, count); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QSignalSpy spy(model, SIGNAL(statusChanged(QDeclarativeXmlListModel::Status))); @@ -409,7 +410,7 @@ void tst_qdeclarativexmllistmodel::headers() CustomNetworkAccessManagerFactory factory; qmlEng.setNetworkAccessManagerFactory(&factory); - QDeclarativeComponent component(&qmlEng, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&qmlEng, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(qvariant_cast<QDeclarativeXmlListModel::Status>(model->property("status")), @@ -433,7 +434,7 @@ void tst_qdeclarativexmllistmodel::source() QFETCH(int, count); QFETCH(QDeclarativeXmlListModel::Status, status); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QSignalSpy spy(model, SIGNAL(statusChanged(QDeclarativeXmlListModel::Status))); @@ -489,7 +490,7 @@ void tst_qdeclarativexmllistmodel::source_data() QTest::addColumn<int>("count"); QTest::addColumn<QDeclarativeXmlListModel::Status>("status"); - QTest::newRow("valid") << QUrl::fromLocalFile(TESTDATA("model2.xml")) << 2 + QTest::newRow("valid") << testFileUrl("model2.xml") << 2 << QDeclarativeXmlListModel::Ready; QTest::newRow("invalid") << QUrl("http://blah.blah/blah.xml") << 0 << QDeclarativeXmlListModel::Error; @@ -504,7 +505,7 @@ void tst_qdeclarativexmllistmodel::source_data() void tst_qdeclarativexmllistmodel::data() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); @@ -520,7 +521,7 @@ void tst_qdeclarativexmllistmodel::data() void tst_qdeclarativexmllistmodel::get() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("get.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("get.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); @@ -541,7 +542,7 @@ void tst_qdeclarativexmllistmodel::reload() // If no keys are used, the model should be rebuilt from scratch when // reload() is called. - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("model.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("model.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 9); @@ -581,7 +582,7 @@ void tst_qdeclarativexmllistmodel::useKeys() QFETCH(QList<QDeclarativeXmlListRange>, insertRanges); QFETCH(QList<QDeclarativeXmlListRange>, removeRanges); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleKeys.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("roleKeys.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); @@ -732,7 +733,7 @@ void tst_qdeclarativexmllistmodel::noKeysValueChanges() // If a 'sport' value is changed, the model should not be reloaded, // since 'sport' is not marked as a key. - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleKeys.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("roleKeys.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); @@ -770,7 +771,7 @@ void tst_qdeclarativexmllistmodel::keysChanged() // delete all its data and build a clean model (i.e. same behaviour as // if no keys are set). - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleKeys.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("roleKeys.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); @@ -806,7 +807,7 @@ void tst_qdeclarativexmllistmodel::threading() { QFETCH(int, xmlDataCount); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleKeys.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("roleKeys.qml")); QListModelInterface *m1 = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(m1 != 0); @@ -879,7 +880,7 @@ void tst_qdeclarativexmllistmodel::threading_data() void tst_qdeclarativexmllistmodel::propertyChanges() { - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("propertychanges.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); QTRY_COMPARE(model->count(), 9); @@ -950,7 +951,7 @@ void tst_qdeclarativexmllistmodel::propertyChanges() void tst_qdeclarativexmllistmodel::roleCrash() { // don't crash - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("roleCrash.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("roleCrash.qml")); QListModelInterface *model = qobject_cast<QListModelInterface*>(component.create()); QVERIFY(model != 0); delete model; diff --git a/tests/auto/qtquick2/qquickanchors/qquickanchors.pro b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro index 92f24cff07..03b99e1dec 100644 --- a/tests/auto/qtquick2/qquickanchors/qquickanchors.pro +++ b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro @@ -1,6 +1,9 @@ TARGET = tst_qquickanchors CONFIG += testcase -SOURCES += tst_qquickanchors.cpp +SOURCES += tst_qquickanchors.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp index cae1421573..1b30c63d5f 100644 --- a/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp +++ b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp @@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(QQuickAnchors::Anchor) Q_DECLARE_METATYPE(QQuickAnchorLine::AnchorLine) -class tst_qquickanchors : public QObject +class tst_qquickanchors : public QDeclarativeDataTest { Q_OBJECT public: @@ -111,7 +111,7 @@ T *findItem(QQuickItem *parent, const QString &objectName) void tst_qquickanchors::basicAnchors() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("anchors.qml"))); + view->setSource(testFileUrl("anchors.qml")); qApp->processEvents(); @@ -196,7 +196,7 @@ void mirrorAnchors(QQuickItem *item) { void tst_qquickanchors::basicAnchorsRTL() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("anchors.qml"))); + view->setSource(testFileUrl("anchors.qml")); qApp->processEvents(); @@ -278,7 +278,7 @@ void tst_qquickanchors::basicAnchorsRTL() void tst_qquickanchors::loops() { { - QUrl source(QUrl::fromLocalFile(TESTDATA("loop1.qml"))); + QUrl source(testFileUrl("loop1.qml")); QString expect = source.toString() + ":6:5: QML Text: Possible anchor loop detected on horizontal anchor."; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); @@ -292,7 +292,7 @@ void tst_qquickanchors::loops() } { - QUrl source(QUrl::fromLocalFile(TESTDATA("loop2.qml"))); + QUrl source(testFileUrl("loop2.qml")); QString expect = source.toString() + ":8:3: QML Image: Possible anchor loop detected on horizontal anchor."; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); @@ -480,7 +480,7 @@ void tst_qquickanchors::nullItem_data() //QTBUG-5428 void tst_qquickanchors::crash1() { - QUrl source(QUrl::fromLocalFile(TESTDATA("crash1.qml"))); + QUrl source(testFileUrl("crash1.qml")); QString expect = source.toString() + ":3:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column"; @@ -494,7 +494,7 @@ void tst_qquickanchors::crash1() void tst_qquickanchors::fill() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("fill.qml"))); + QQuickView *view = new QQuickView(testFileUrl("fill.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("filler")); @@ -518,7 +518,7 @@ void tst_qquickanchors::fill() void tst_qquickanchors::fillRTL() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("fill.qml"))); + QQuickView *view = new QQuickView(testFileUrl("fill.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("filler")); @@ -544,7 +544,7 @@ void tst_qquickanchors::fillRTL() void tst_qquickanchors::centerIn() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("centerin.qml"))); + QQuickView *view = new QQuickView(testFileUrl("centerin.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("centered")); @@ -563,7 +563,7 @@ void tst_qquickanchors::centerIn() void tst_qquickanchors::centerInRTL() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("centerin.qml"))); + QQuickView *view = new QQuickView(testFileUrl("centerin.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("centered")); @@ -584,7 +584,7 @@ void tst_qquickanchors::centerInRTL() //QTBUG-12441 void tst_qquickanchors::centerInRotation() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("centerinRotation.qml"))); + QQuickView *view = new QQuickView(testFileUrl("centerinRotation.qml")); qApp->processEvents(); QQuickRectangle* outer = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("outer")); @@ -601,7 +601,7 @@ void tst_qquickanchors::centerInRotation() void tst_qquickanchors::hvCenter() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("hvCenter.qml"))); + QQuickView *view = new QQuickView(testFileUrl("hvCenter.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("centered")); @@ -621,7 +621,7 @@ void tst_qquickanchors::hvCenter() void tst_qquickanchors::hvCenterRTL() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("hvCenter.qml"))); + QQuickView *view = new QQuickView(testFileUrl("hvCenter.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("centered")); @@ -641,7 +641,7 @@ void tst_qquickanchors::hvCenterRTL() } void tst_qquickanchors::margins() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("margins.qml"))); + QQuickView *view = new QQuickView(testFileUrl("margins.qml")); qApp->processEvents(); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("filler")); @@ -664,7 +664,7 @@ void tst_qquickanchors::margins() void tst_qquickanchors::marginsRTL() { - QQuickView *view = new QQuickView(QUrl::fromLocalFile(TESTDATA("margins.qml"))); + QQuickView *view = new QQuickView(testFileUrl("margins.qml")); QQuickRectangle* rect = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("filler")); QQuickItemPrivate *rectPrivate = QQuickItemPrivate::get(rect); diff --git a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro index 56394592b8..c8c3bdb9f4 100644 --- a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro +++ b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro @@ -1,7 +1,11 @@ CONFIG += testcase TARGET = tst_qquickanimatedimage -HEADERS += ../../shared/testhttpserver.h -SOURCES += tst_qquickanimatedimage.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += tst_qquickanimatedimage.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp index bf1017fe21..c2b554cac9 100644 --- a/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(QQuickImageBase::Status) -class tst_qquickanimatedimage : public QObject +class tst_qquickanimatedimage : public QDeclarativeDataTest { Q_OBJECT public: @@ -81,7 +81,7 @@ private slots: void tst_qquickanimatedimage::play() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickman.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickman.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QVERIFY(anim->isPlaying()); @@ -92,7 +92,7 @@ void tst_qquickanimatedimage::play() void tst_qquickanimatedimage::pause() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickmanpause.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickmanpause.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QVERIFY(anim->isPlaying()); @@ -104,7 +104,7 @@ void tst_qquickanimatedimage::pause() void tst_qquickanimatedimage::stopped() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickmanstopped.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickmanstopped.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QVERIFY(!anim->isPlaying()); @@ -116,7 +116,7 @@ void tst_qquickanimatedimage::stopped() void tst_qquickanimatedimage::setFrame() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickmanpause.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickmanpause.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QVERIFY(anim->isPlaying()); @@ -128,7 +128,7 @@ void tst_qquickanimatedimage::setFrame() void tst_qquickanimatedimage::frameCount() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("colors.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("colors.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QVERIFY(anim->isPlaying()); @@ -144,7 +144,7 @@ void tst_qquickanimatedimage::mirror_running() QQuickView *canvas = new QQuickView; canvas->show(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("hearts.qml"))); + canvas->setSource(testFileUrl("hearts.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(canvas->rootObject()); QVERIFY(anim); @@ -224,8 +224,8 @@ void tst_qquickanimatedimage::mirror_notRunning_data() { QTest::addColumn<QUrl>("fileUrl"); - QTest::newRow("paused") << QUrl::fromLocalFile(TESTDATA("stickmanpause.qml")); - QTest::newRow("stopped") << QUrl::fromLocalFile(TESTDATA("stickmanstopped.qml")); + QTest::newRow("paused") << testFileUrl("stickmanpause.qml"); + QTest::newRow("stopped") << testFileUrl("stickmanstopped.qml"); } void tst_qquickanimatedimage::remote() @@ -235,7 +235,7 @@ void tst_qquickanimatedimage::remote() TestHTTPServer server(14449); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl("http://127.0.0.1:14449/" + fileName)); @@ -257,7 +257,7 @@ void tst_qquickanimatedimage::remote() void tst_qquickanimatedimage::sourceSize() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickmanscaled.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickmanscaled.qml")); QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); QVERIFY(anim); QCOMPARE(anim->width(),240.0); @@ -270,7 +270,7 @@ void tst_qquickanimatedimage::sourceSize() void tst_qquickanimatedimage::sourceSizeReadOnly() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("stickmanerror1.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("stickmanerror1.qml")); QVERIFY(component.isError()); QCOMPARE(component.errors().at(0).description(), QString("Invalid property assignment: \"sourceSize\" is a read-only property")); } @@ -307,10 +307,10 @@ void tst_qquickanimatedimage::qtbug_16520() { TestHTTPServer server(14449); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("qtbug-16520.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("qtbug-16520.qml")); QTRY_VERIFY(component.isReady()); QQuickRectangle *root = qobject_cast<QQuickRectangle *>(component.create()); @@ -329,12 +329,12 @@ void tst_qquickanimatedimage::progressAndStatusChanges() { TestHTTPServer server(14449); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); QDeclarativeEngine engine; QString componentStr = "import QtQuick 2.0\nAnimatedImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("stickman.gif"))); + ctxt->setContextProperty("srcImage", testFileUrl("stickman.gif")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -348,7 +348,7 @@ void tst_qquickanimatedimage::progressAndStatusChanges() QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status))); // Loading local file - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("colors.gif"))); + ctxt->setContextProperty("srcImage", testFileUrl("colors.gif")); QTRY_VERIFY(obj->status() == QQuickImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 1); diff --git a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro index 34d08aa37f..23c504df83 100644 --- a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro @@ -2,8 +2,11 @@ CONFIG += testcase TARGET = tst_qquickborderimage macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h -SOURCES += tst_qquickborderimage.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += tst_qquickborderimage.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp index b9fd91d7fb..cd580dd78c 100644 --- a/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp @@ -61,7 +61,7 @@ #define SERVER_PORT 14446 #define SERVER_ADDR "http://127.0.0.1:14446" -class tst_qquickborderimage : public QObject +class tst_qquickborderimage : public QDeclarativeDataTest { Q_OBJECT @@ -113,9 +113,9 @@ void tst_qquickborderimage::imageSource_data() QTest::addColumn<bool>("remote"); QTest::addColumn<QString>("error"); - QTest::newRow("local") << QUrl::fromLocalFile(TESTDATA("colors.png")).toString() << false << ""; - QTest::newRow("local not found") << QUrl::fromLocalFile(TESTDATA("no-such-file.png")).toString() << false - << "file::2:1: QML BorderImage: Cannot open: " + QUrl::fromLocalFile(TESTDATA("no-such-file.png")).toString(); + QTest::newRow("local") << testFileUrl("colors.png").toString() << false << ""; + QTest::newRow("local not found") << testFileUrl("no-such-file.png").toString() << false + << "file::2:1: QML BorderImage: Cannot open: " + testFileUrl("no-such-file.png").toString(); QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true << "file::2:1: QML BorderImage: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; @@ -131,7 +131,7 @@ void tst_qquickborderimage::imageSource() if (remote) { server = new TestHTTPServer(SERVER_PORT); QVERIFY(server->isValid()); - server->serveDirectory(TESTDATA("")); + server->serveDirectory(dataDirectory()); } if (!error.isEmpty()) @@ -168,7 +168,7 @@ void tst_qquickborderimage::clearSource() { QString componentStr = "import QtQuick 2.0\nBorderImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("colors.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("colors.png")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); @@ -186,7 +186,7 @@ void tst_qquickborderimage::clearSource() void tst_qquickborderimage::resized() { - QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + QUrl::fromLocalFile(TESTDATA("colors.png")).toString() + "\"; width: 300; height: 300 }"; + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + testFileUrl("colors.png").toString() + "\"; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); @@ -203,7 +203,7 @@ void tst_qquickborderimage::resized() void tst_qquickborderimage::smooth() { - QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + TESTDATA("colors.png") + "\"; smooth: true; width: 300; height: 300 }"; + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + testFile("colors.png") + "\"; smooth: true; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); @@ -222,7 +222,7 @@ void tst_qquickborderimage::mirror() QQuickView *canvas = new QQuickView; canvas->show(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("mirror.qml"))); + canvas->setSource(testFileUrl("mirror.qml")); QQuickBorderImage *image = qobject_cast<QQuickBorderImage*>(canvas->rootObject()); QVERIFY(image != 0); canvas->show(); @@ -244,7 +244,7 @@ void tst_qquickborderimage::mirror() void tst_qquickborderimage::tileModes() { { - QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + TESTDATA("colors.png") + "\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }"; + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + testFile("colors.png") + "\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); @@ -257,7 +257,7 @@ void tst_qquickborderimage::tileModes() delete obj; } { - QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + TESTDATA("colors.png") + "\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }"; + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + testFile("colors.png") + "\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); @@ -281,7 +281,7 @@ void tst_qquickborderimage::sciSource() if (remote) { server = new TestHTTPServer(SERVER_PORT); QVERIFY(server->isValid()); - server->serveDirectory(TESTDATA("")); + server->serveDirectory(dataDirectory()); } QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }"; @@ -318,9 +318,9 @@ void tst_qquickborderimage::sciSource_data() QTest::addColumn<QString>("source"); QTest::addColumn<bool>("valid"); - QTest::newRow("local") << QUrl::fromLocalFile(TESTDATA("colors-round.sci")).toString() << true; - QTest::newRow("local quoted filename") << QUrl::fromLocalFile(TESTDATA("colors-round-quotes.sci")).toString() << true; - QTest::newRow("local not found") << QUrl::fromLocalFile(TESTDATA("no-such-file.sci")).toString() << false; + QTest::newRow("local") << testFileUrl("colors-round.sci").toString() << true; + QTest::newRow("local quoted filename") << testFileUrl("colors-round-quotes.sci").toString() << true; + QTest::newRow("local not found") << testFileUrl("no-such-file.sci").toString() << false; QTest::newRow("remote") << SERVER_ADDR "/colors-round.sci" << true; QTest::newRow("remote filename quoted") << SERVER_ADDR "/colors-round-quotes.sci" << true; QTest::newRow("remote image") << SERVER_ADDR "/colors-round-remote.sci" << true; @@ -332,7 +332,7 @@ void tst_qquickborderimage::invalidSciFile() QTest::ignoreMessage(QtWarningMsg, "QQuickGridScaledImage: Invalid tile rule specified. Using Stretch."); // for "Roun" QTest::ignoreMessage(QtWarningMsg, "QQuickGridScaledImage: Invalid tile rule specified. Using Stretch."); // for "Repea" - QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + QUrl::fromLocalFile(TESTDATA("invalid.sci")).toString() +"\"; width: 300; height: 300 }"; + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + testFileUrl("invalid.sci").toString() +"\"; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); diff --git a/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro index 95236970f8..3aa38949bf 100644 --- a/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro +++ b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qquickcanvas -SOURCES += tst_qquickcanvas.cpp +SOURCES += tst_qquickcanvas.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp index 780f58cc37..9ded975805 100644 --- a/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp +++ b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp @@ -170,16 +170,12 @@ protected: } }; -class tst_qquickcanvas : public QObject +class tst_qquickcanvas : public QDeclarativeDataTest { Q_OBJECT public: - tst_qquickcanvas(); private slots: - void initTestCase(); - void cleanupTestCase(); - void constantUpdates(); void touchEvent_basic(); @@ -200,18 +196,6 @@ private slots: void headless(); }; -tst_qquickcanvas::tst_qquickcanvas() -{ -} - -void tst_qquickcanvas::initTestCase() -{ -} - -void tst_qquickcanvas::cleanupTestCase() -{ -} - //If the item calls update inside updatePaintNode, it should schedule another update void tst_qquickcanvas::constantUpdates() { @@ -532,7 +516,7 @@ void tst_qquickcanvas::qmlCreation() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); - component.loadUrl(TESTDATA("window.qml")); + component.loadUrl(testFileUrl("window.qml")); QObject* created = component.create(); QVERIFY(created); @@ -606,7 +590,7 @@ void tst_qquickcanvas::animationsWhileHidden() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); - component.loadUrl(TESTDATA("AnimationsWhileHidden.qml")); + component.loadUrl(testFileUrl("AnimationsWhileHidden.qml")); QObject* created = component.create(); QQuickCanvas* canvas = qobject_cast<QQuickCanvas*>(created); @@ -648,7 +632,7 @@ void tst_qquickcanvas::headless() { QDeclarativeEngine engine; QDeclarativeComponent component(&engine); - component.loadUrl(TESTDATA("Headless.qml")); + component.loadUrl(testFileUrl("Headless.qml")); QObject* created = component.create(); QQuickCanvas* canvas = qobject_cast<QQuickCanvas*>(created); diff --git a/tests/auto/qtquick2/qquickflickable/qquickflickable.pro b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro index 7376f593fd..6c2a2a6fc2 100644 --- a/tests/auto/qtquick2/qquickflickable/qquickflickable.pro +++ b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickflickable macx:CONFIG -= app_bundle -SOURCES += tst_qquickflickable.cpp +SOURCES += tst_qquickflickable.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp index 1827e0af1c..f7543d0fd7 100644 --- a/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp @@ -49,16 +49,12 @@ #include "../../shared/util.h" #include <QtOpenGL/QGLShaderProgram> -class tst_qquickflickable : public QObject +class tst_qquickflickable : public QDeclarativeDataTest { Q_OBJECT public: - tst_qquickflickable(); private slots: - void initTestCase(); - void cleanupTestCase(); - void create(); void horizontalViewportSize(); void verticalViewportSize(); @@ -85,24 +81,10 @@ private: T *findItem(QQuickItem *parent, const QString &objectName); }; -tst_qquickflickable::tst_qquickflickable() -{ -} - -void tst_qquickflickable::initTestCase() -{ - -} - -void tst_qquickflickable::cleanupTestCase() -{ - -} - void tst_qquickflickable::create() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable01.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("flickable01.qml")); QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create()); QVERIFY(obj != 0); @@ -127,7 +109,7 @@ void tst_qquickflickable::create() void tst_qquickflickable::horizontalViewportSize() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable02.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("flickable02.qml")); QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create()); QVERIFY(obj != 0); @@ -144,7 +126,7 @@ void tst_qquickflickable::horizontalViewportSize() void tst_qquickflickable::verticalViewportSize() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable03.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("flickable03.qml")); QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create()); QVERIFY(obj != 0); @@ -161,7 +143,7 @@ void tst_qquickflickable::verticalViewportSize() void tst_qquickflickable::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("flickable04.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("flickable04.qml")); QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create()); QVERIFY(obj != 0); @@ -261,7 +243,7 @@ void tst_qquickflickable::pressDelay() void tst_qquickflickable::nestedPressDelay() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("nestedPressDelay.qml"))); + canvas->setSource(testFileUrl("nestedPressDelay.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -316,7 +298,7 @@ void tst_qquickflickable::flickableDirection() void tst_qquickflickable::resizeContent() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("resize.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("resize.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(c.create()); QQuickFlickable *obj = findItem<QQuickFlickable>(root, "flick"); @@ -340,7 +322,7 @@ void tst_qquickflickable::resizeContent() void tst_qquickflickable::returnToBounds() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("resize.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("resize.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(c.create()); QQuickFlickable *obj = findItem<QQuickFlickable>(root, "flick"); @@ -366,7 +348,7 @@ void tst_qquickflickable::returnToBounds() void tst_qquickflickable::wheel() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("wheel.qml"))); + canvas->setSource(testFileUrl("wheel.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -401,7 +383,7 @@ void tst_qquickflickable::wheel() void tst_qquickflickable::movingAndDragging() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("flickable03.qml"))); + canvas->setSource(testFileUrl("flickable03.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -506,7 +488,7 @@ void tst_qquickflickable::movingAndDragging() void tst_qquickflickable::disabled() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("disabled.qml"))); + canvas->setSource(testFileUrl("disabled.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -538,7 +520,7 @@ void tst_qquickflickable::flickVelocity() #endif QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("flickable03.qml"))); + canvas->setSource(testFileUrl("flickable03.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -562,7 +544,7 @@ void tst_qquickflickable::flickVelocity() void tst_qquickflickable::margins() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("margins.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("margins.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(c.create()); QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(root); QVERIFY(obj != 0); diff --git a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro index 532c42f79b..d1932fc3d5 100644 --- a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro +++ b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickflipable macx:CONFIG -= app_bundle -SOURCES += tst_qquickflipable.cpp +SOURCES += tst_qquickflipable.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp index a217e26714..5624cf82b6 100644 --- a/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp +++ b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp @@ -50,15 +50,12 @@ #include <QtOpenGL/QGLShaderProgram> #include "../../shared/util.h" -class tst_qquickflipable : public QObject +class tst_qquickflipable : public QDeclarativeDataTest { Q_OBJECT public: - tst_qquickflipable(); private slots: - void initTestCase(); - void cleanupTestCase(); void create(); void checkFrontAndBack(); void setFrontAndBack(); @@ -71,22 +68,10 @@ private: QDeclarativeEngine engine; }; -tst_qquickflipable::tst_qquickflipable() -{ -} -void tst_qquickflipable::initTestCase() -{ -} - -void tst_qquickflipable::cleanupTestCase() -{ - -} - void tst_qquickflipable::create() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-flipable.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); QVERIFY(obj != 0); @@ -96,7 +81,7 @@ void tst_qquickflipable::create() void tst_qquickflipable::checkFrontAndBack() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-flipable.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); QVERIFY(obj != 0); @@ -108,7 +93,7 @@ void tst_qquickflipable::checkFrontAndBack() void tst_qquickflipable::setFrontAndBack() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-flipable.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-flipable.qml")); QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create()); QVERIFY(obj != 0); @@ -128,7 +113,7 @@ void tst_qquickflipable::setFrontAndBack() void tst_qquickflipable::QTBUG_9161_crash() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("crash.qml"))); + canvas->setSource(testFileUrl("crash.qml")); QQuickItem *root = canvas->rootObject(); QVERIFY(root != 0); canvas->show(); @@ -138,7 +123,7 @@ void tst_qquickflipable::QTBUG_9161_crash() void tst_qquickflipable::QTBUG_8474_qgv_abort() { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("flipable-abort.qml"))); + canvas->setSource(testFileUrl("flipable-abort.qml")); QQuickItem *root = canvas->rootObject(); QVERIFY(root != 0); canvas->show(); diff --git a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro index 138750db3c..1167643f46 100644 --- a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qquickfocusscope -SOURCES += tst_qquickfocusscope.cpp +SOURCES += tst_qquickfocusscope.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp index 11cc7a15e0..6073f8c320 100644 --- a/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp @@ -49,7 +49,7 @@ #include <QtQuick/private/qquickfocusscope_p.h> #include "../../shared/util.h" -class tst_qquickfocusscope : public QObject +class tst_qquickfocusscope : public QDeclarativeDataTest { Q_OBJECT public: @@ -59,8 +59,6 @@ public: T *findItem(QQuickItem *parent, const QString &id); private slots: - void initTestCase(); - void cleanupTestCase(); void basic(); void nested(); void noFocus(); @@ -72,14 +70,6 @@ private slots: void forceActiveFocus(); void canvasFocus(); }; -void tst_qquickfocusscope::initTestCase() -{ -} - -void tst_qquickfocusscope::cleanupTestCase() -{ - -} /* Find an item with the specified id. @@ -106,7 +96,7 @@ T *tst_qquickfocusscope::findItem(QQuickItem *parent, const QString &objectName) void tst_qquickfocusscope::basic() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("test.qml"))); + view->setSource(testFileUrl("test.qml")); QQuickFocusScope *item0 = findItem<QQuickFocusScope>(view->rootObject(), QLatin1String("item0")); QQuickRectangle *item1 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item1")); @@ -149,7 +139,7 @@ void tst_qquickfocusscope::basic() void tst_qquickfocusscope::nested() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("test2.qml"))); + view->setSource(testFileUrl("test2.qml")); QQuickFocusScope *item1 = findItem<QQuickFocusScope>(view->rootObject(), QLatin1String("item1")); QQuickFocusScope *item2 = findItem<QQuickFocusScope>(view->rootObject(), QLatin1String("item2")); @@ -179,7 +169,7 @@ void tst_qquickfocusscope::nested() void tst_qquickfocusscope::noFocus() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("test4.qml"))); + view->setSource(testFileUrl("test4.qml")); QQuickRectangle *item0 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item0")); QQuickRectangle *item1 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item1")); @@ -218,7 +208,7 @@ void tst_qquickfocusscope::noFocus() void tst_qquickfocusscope::textEdit() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("test5.qml"))); + view->setSource(testFileUrl("test5.qml")); QQuickFocusScope *item0 = findItem<QQuickFocusScope>(view->rootObject(), QLatin1String("item0")); QQuickTextEdit *item1 = findItem<QQuickTextEdit>(view->rootObject(), QLatin1String("item1")); @@ -268,7 +258,7 @@ void tst_qquickfocusscope::textEdit() void tst_qquickfocusscope::forceFocus() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("forcefocus.qml"))); + view->setSource(testFileUrl("forcefocus.qml")); QQuickFocusScope *item0 = findItem<QQuickFocusScope>(view->rootObject(), QLatin1String("item0")); QQuickRectangle *item1 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item1")); @@ -317,7 +307,7 @@ void tst_qquickfocusscope::forceFocus() void tst_qquickfocusscope::noParentFocus() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("chain.qml"))); + view->setSource(testFileUrl("chain.qml")); QVERIFY(view->rootObject()); view->show(); @@ -337,7 +327,7 @@ void tst_qquickfocusscope::noParentFocus() void tst_qquickfocusscope::signalEmission() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("signalEmission.qml"))); + view->setSource(testFileUrl("signalEmission.qml")); QQuickRectangle *item1 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item1")); QQuickRectangle *item2 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("item2")); @@ -393,7 +383,7 @@ void tst_qquickfocusscope::signalEmission() void tst_qquickfocusscope::qtBug13380() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("qtBug13380.qml"))); + view->setSource(testFileUrl("qtBug13380.qml")); view->show(); QVERIFY(view->rootObject()); @@ -414,7 +404,7 @@ void tst_qquickfocusscope::qtBug13380() void tst_qquickfocusscope::forceActiveFocus() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("forceActiveFocus.qml"))); + view->setSource(testFileUrl("forceActiveFocus.qml")); view->show(); view->requestActivateWindow(); @@ -528,7 +518,7 @@ void tst_qquickfocusscope::forceActiveFocus() void tst_qquickfocusscope::canvasFocus() { QQuickView *view = new QQuickView; - view->setSource(QUrl::fromLocalFile(TESTDATA("canvasFocus.qml"))); + view->setSource(testFileUrl("canvasFocus.qml")); QQuickView alternateView; diff --git a/tests/auto/qtquick2/qquickgridview/qquickgridview.pro b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro index b34cfdf936..32bf0ecaf9 100644 --- a/tests/auto/qtquick2/qquickgridview/qquickgridview.pro +++ b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickgridview macx:CONFIG -= app_bundle -SOURCES += tst_qquickgridview.cpp +SOURCES += tst_qquickgridview.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp index 5a1f482f49..babfe4c649 100644 --- a/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp @@ -58,15 +58,13 @@ Q_DECLARE_METATYPE(Qt::LayoutDirection) Q_DECLARE_METATYPE(QQuickGridView::Flow) -class tst_QQuickGridView : public QObject +class tst_QQuickGridView : public QDeclarativeDataTest { Q_OBJECT public: tst_QQuickGridView(); private slots: - void initTestCase(); - void cleanupTestCase(); void items(); void changed(); void inserted(); @@ -159,16 +157,6 @@ void tst_qquickgridview_move(int from, int to, int n, T *items) *t = *f; } -void tst_QQuickGridView::initTestCase() -{ -} - -void tst_QQuickGridView::cleanupTestCase() -{ - -} - - class TestModel : public QAbstractListModel { public: @@ -286,7 +274,7 @@ void tst_QQuickGridView::items() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -336,7 +324,7 @@ void tst_QQuickGridView::changed() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickFlickable *gridview = findItem<QQuickFlickable>(canvas->rootObject(), "grid"); @@ -371,7 +359,7 @@ void tst_QQuickGridView::inserted() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -457,7 +445,7 @@ void tst_QQuickGridView::inserted_more() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -626,7 +614,7 @@ void tst_QQuickGridView::insertBeforeVisible() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -710,7 +698,7 @@ void tst_QQuickGridView::removed() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -861,7 +849,7 @@ void tst_QQuickGridView::addOrRemoveBeforeVisible() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); @@ -940,7 +928,7 @@ void tst_QQuickGridView::clear() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -987,7 +975,7 @@ void tst_QQuickGridView::moved() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -1192,7 +1180,7 @@ void tst_QQuickGridView::multipleChanges() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -1409,7 +1397,7 @@ void tst_QQuickGridView::swapWithFirstItem() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -1436,7 +1424,7 @@ void tst_QQuickGridView::currentIndex() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - QString filename(TESTDATA("gridview-initCurrent.qml")); + QString filename(testFile("gridview-initCurrent.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -1681,7 +1669,7 @@ void tst_QQuickGridView::noCurrentIndex() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - QString filename(TESTDATA("gridview-noCurrent.qml")); + QString filename(testFile("gridview-noCurrent.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -1719,7 +1707,7 @@ void tst_QQuickGridView::changeFlow() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -1806,7 +1794,7 @@ void tst_QQuickGridView::changeFlow() void tst_QQuickGridView::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("gridview3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("gridview3.qml")); QQuickGridView *obj = qobject_cast<QQuickGridView*>(c.create()); QTRY_VERIFY(obj != 0); @@ -1829,7 +1817,7 @@ void tst_QQuickGridView::defaultValues() void tst_QQuickGridView::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("gridview2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("gridview2.qml")); QQuickGridView *obj = qobject_cast<QQuickGridView*>(c.create()); QTRY_VERIFY(obj != 0); @@ -1853,7 +1841,7 @@ void tst_QQuickGridView::propertyChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView"); QTRY_VERIFY(gridView); @@ -1926,7 +1914,7 @@ void tst_QQuickGridView::componentChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView"); QTRY_VERIFY(gridView); @@ -1974,7 +1962,7 @@ void tst_QQuickGridView::modelChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView"); QTRY_VERIFY(gridView); @@ -2009,7 +1997,7 @@ void tst_QQuickGridView::positionViewAtIndex() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2210,7 +2198,7 @@ void tst_QQuickGridView::snapping() ctxt->setContextProperty("testTopToBottom", QVariant(false)); ctxt->setContextProperty("testRightToLeft", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2241,12 +2229,12 @@ void tst_QQuickGridView::snapping() void tst_QQuickGridView::mirroring() { QQuickView *canvasA = createView(); - canvasA->setSource(QUrl::fromLocalFile(TESTDATA("mirroring.qml"))); + canvasA->setSource(testFileUrl("mirroring.qml")); QQuickGridView *gridviewA = findItem<QQuickGridView>(canvasA->rootObject(), "view"); QTRY_VERIFY(gridviewA != 0); QQuickView *canvasB = createView(); - canvasB->setSource(QUrl::fromLocalFile(TESTDATA("mirroring.qml"))); + canvasB->setSource(testFileUrl("mirroring.qml")); QQuickGridView *gridviewB = findItem<QQuickGridView>(canvasB->rootObject(), "view"); QTRY_VERIFY(gridviewA != 0); qApp->processEvents(); @@ -2312,7 +2300,7 @@ void tst_QQuickGridView::positionViewAtIndex_rightToLeft() ctxt->setContextProperty("testTopToBottom", QVariant(true)); ctxt->setContextProperty("testRightToLeft", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2442,7 +2430,7 @@ void tst_QQuickGridView::resetModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaygrid.qml"))); + canvas->setSource(testFileUrl("displaygrid.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2487,7 +2475,7 @@ void tst_QQuickGridView::enforceRange() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview-enforcerange.qml"))); + canvas->setSource(testFileUrl("gridview-enforcerange.qml")); qApp->processEvents(); QVERIFY(canvas->rootObject() != 0); @@ -2543,7 +2531,7 @@ void tst_QQuickGridView::enforceRange_rightToLeft() ctxt->setContextProperty("testRightToLeft", QVariant(true)); ctxt->setContextProperty("testTopToBottom", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview-enforcerange.qml"))); + canvas->setSource(testFileUrl("gridview-enforcerange.qml")); qApp->processEvents(); QVERIFY(canvas->rootObject() != 0); @@ -2592,7 +2580,7 @@ void tst_QQuickGridView::QTBUG_8456() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("setindex.qml"))); + canvas->setSource(testFileUrl("setindex.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2607,7 +2595,7 @@ void tst_QQuickGridView::manualHighlight() { QQuickView *canvas = createView(); - QString filename(TESTDATA("manual-highlight.qml")); + QString filename(testFile("manual-highlight.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -2671,7 +2659,7 @@ void tst_QQuickGridView::footer() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("footer.qml"))); + canvas->setSource(testFileUrl("footer.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -2830,7 +2818,7 @@ void tst_QQuickGridView::header() canvas->rootContext()->setContextProperty("testModel", &model); canvas->rootContext()->setContextProperty("initialViewWidth", 240); canvas->rootContext()->setContextProperty("initialViewHeight", 320); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml"))); + canvas->setSource(testFileUrl("header.qml")); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); @@ -2894,7 +2882,7 @@ void tst_QQuickGridView::header() canvas->rootContext()->setContextProperty("testModel", &model); canvas->rootContext()->setContextProperty("initialViewWidth", 240); canvas->rootContext()->setContextProperty("initialViewHeight", 320); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml"))); + canvas->setSource(testFileUrl("header.qml")); gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); @@ -2975,7 +2963,7 @@ void tst_QQuickGridView::resizeViewAndRepaint() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("initialHeight", 100); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizeview.qml"))); + canvas->setSource(testFileUrl("resizeview.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -3013,7 +3001,7 @@ void tst_QQuickGridView::indexAt() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -3052,7 +3040,7 @@ void tst_QQuickGridView::onAdd() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("delegateWidth", delegateWidth); ctxt->setContextProperty("delegateHeight", delegateHeight); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml"))); + canvas->setSource(testFileUrl("attachedSignals.qml")); QObject *object = canvas->rootObject(); object->setProperty("width", canvas->width()); @@ -3110,7 +3098,7 @@ void tst_QQuickGridView::onRemove() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("delegateWidth", delegateWidth); ctxt->setContextProperty("delegateHeight", delegateHeight); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml"))); + canvas->setSource(testFileUrl("attachedSignals.qml")); QObject *object = canvas->rootObject(); model.removeItems(indexToRemove, removeCount); @@ -3146,7 +3134,7 @@ void tst_QQuickGridView::onRemove_data() void tst_QQuickGridView::columnCount() { QQuickView canvas; - canvas.setSource(QUrl::fromLocalFile(TESTDATA("gridview4.qml"))); + canvas.setSource(testFileUrl("gridview4.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -3176,7 +3164,7 @@ void tst_QQuickGridView::margins() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testRightToLeft", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("margins.qml"))); + canvas->setSource(testFileUrl("margins.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -3239,7 +3227,7 @@ void tst_QQuickGridView::margins() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testRightToLeft", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("margins.qml"))); + canvas->setSource(testFileUrl("margins.qml")); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); @@ -3296,7 +3284,7 @@ void tst_QQuickGridView::creationContext() { QQuickView canvas; canvas.setGeometry(0,0,240,320); - canvas.setSource(QUrl::fromLocalFile(TESTDATA("creationContext.qml"))); + canvas.setSource(testFileUrl("creationContext.qml")); qApp->processEvents(); QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject()); @@ -3355,7 +3343,7 @@ void tst_QQuickGridView::snapToRow() QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapToRow.qml"))); + canvas->setSource(testFileUrl("snapToRow.qml")); canvas->show(); qApp->processEvents(); @@ -3449,7 +3437,7 @@ void tst_QQuickGridView::snapOneRow() QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapOneRow.qml"))); + canvas->setSource(testFileUrl("snapOneRow.qml")); canvas->show(); qApp->processEvents(); @@ -3530,7 +3518,7 @@ void tst_QQuickGridView::unaligned() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("unaligned.qml"))); + canvas->setSource(testFileUrl("unaligned.qml")); qApp->processEvents(); QQuickGridView *gridview = qobject_cast<QQuickGridView*>(canvas->rootObject()); @@ -3617,7 +3605,7 @@ void tst_QQuickGridView::cacheBuffer() ctxt->setContextProperty("testRightToLeft", QVariant(false)); ctxt->setContextProperty("testTopToBottom", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("gridview1.qml"))); + canvas->setSource(testFileUrl("gridview1.qml")); canvas->show(); qApp->processEvents(); @@ -3708,7 +3696,7 @@ void tst_QQuickGridView::asynchronous() QDeclarativeIncubationController controller; canvas->engine()->setIncubationController(&controller); - canvas->setSource(TESTDATA("asyncloader.qml")); + canvas->setSource(testFile("asyncloader.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(rootObject); @@ -3761,8 +3749,7 @@ void tst_QQuickGridView::unrequestedVisibility() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testWrap", QVariant(false)); - QString filename(TESTDATA("unrequestedItems.qml")); - canvas->setSource(QUrl::fromLocalFile(filename)); + canvas->setSource(testFileUrl("unrequestedItems.qml")); canvas->show(); diff --git a/tests/auto/qtquick2/qquickimage/qquickimage.pro b/tests/auto/qtquick2/qquickimage/qquickimage.pro index fd2af3b677..07dd5fe1e7 100644 --- a/tests/auto/qtquick2/qquickimage/qquickimage.pro +++ b/tests/auto/qtquick2/qquickimage/qquickimage.pro @@ -2,8 +2,11 @@ CONFIG += testcase TARGET = tst_qquickimage macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h -SOURCES += tst_qquickimage.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += tst_qquickimage.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp index a7883626c6..630ad0c8aa 100644 --- a/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp @@ -64,7 +64,7 @@ Q_DECLARE_METATYPE(QQuickImageBase::Status) -class tst_qquickimage : public QObject +class tst_qquickimage : public QDeclarativeDataTest { Q_OBJECT public: @@ -130,13 +130,13 @@ void tst_qquickimage::imageSource_data() QTest::addColumn<bool>("cache"); QTest::addColumn<QString>("error"); - QTest::newRow("local") << QUrl::fromLocalFile(TESTDATA("colors.png")).toString() << 120.0 << 120.0 << false << false << true << ""; - QTest::newRow("local no cache") << QUrl::fromLocalFile(TESTDATA("colors.png")).toString() << 120.0 << 120.0 << false << false << false << ""; - QTest::newRow("local async") << QUrl::fromLocalFile(TESTDATA("colors1.png")).toString() << 120.0 << 120.0 << false << true << true << ""; - QTest::newRow("local not found") << QUrl::fromLocalFile(TESTDATA("no-such-file.png")).toString() << 0.0 << 0.0 << false - << false << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(TESTDATA("no-such-file.png")).toString(); - QTest::newRow("local async not found") << QUrl::fromLocalFile(TESTDATA("no-such-file-1.png")).toString() << 0.0 << 0.0 << false - << true << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(TESTDATA("no-such-file-1.png")).toString(); + QTest::newRow("local") << testFileUrl("colors.png").toString() << 120.0 << 120.0 << false << false << true << ""; + QTest::newRow("local no cache") << testFileUrl("colors.png").toString() << 120.0 << 120.0 << false << false << false << ""; + QTest::newRow("local async") << testFileUrl("colors1.png").toString() << 120.0 << 120.0 << false << true << true << ""; + QTest::newRow("local not found") << testFileUrl("no-such-file.png").toString() << 0.0 << 0.0 << false + << false << true << "file::2:1: QML Image: Cannot open: " + testFileUrl("no-such-file.png").toString(); + QTest::newRow("local async not found") << testFileUrl("no-such-file-1.png").toString() << 0.0 << 0.0 << false + << true << true << "file::2:1: QML Image: Cannot open: " + testFileUrl("no-such-file-1.png").toString(); QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << true << ""; QTest::newRow("remote redirected") << SERVER_ADDR "/oldcolors.png" << 120.0 << 120.0 << true << false << false << ""; if (QImageReader::supportedImageFormats().contains("svg")) @@ -160,7 +160,7 @@ void tst_qquickimage::imageSource() TestHTTPServer server(SERVER_PORT); if (remote) { QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); server.addRedirect("oldcolors.png", SERVER_ADDR "/colors.png"); } @@ -207,7 +207,7 @@ void tst_qquickimage::clearSource() { QString componentStr = "import QtQuick 2.0\nImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("colors.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("colors.png")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -229,7 +229,7 @@ void tst_qquickimage::clearSource() void tst_qquickimage::resized() { - QString componentStr = "import QtQuick 2.0\nImage { source: \"" + TESTDATA("colors.png") + "\"; width: 300; height: 300 }"; + QString componentStr = "import QtQuick 2.0\nImage { source: \"" + testFile("colors.png") + "\"; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -246,14 +246,14 @@ void tst_qquickimage::preserveAspectRatio() QQuickView *canvas = new QQuickView(0); canvas->show(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("aspectratio.qml"))); + canvas->setSource(testFileUrl("aspectratio.qml")); QQuickImage *image = qobject_cast<QQuickImage*>(canvas->rootObject()); QVERIFY(image != 0); image->setWidth(80.0); QCOMPARE(image->width(), 80.); QCOMPARE(image->height(), 80.); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("aspectratio.qml"))); + canvas->setSource(testFileUrl("aspectratio.qml")); image = qobject_cast<QQuickImage*>(canvas->rootObject()); image->setHeight(60.0); QVERIFY(image != 0); @@ -264,7 +264,7 @@ void tst_qquickimage::preserveAspectRatio() void tst_qquickimage::smooth() { - QString componentStr = "import QtQuick 2.0\nImage { source: \"" + TESTDATA("colors.png") + "\"; smooth: true; width: 300; height: 300 }"; + QString componentStr = "import QtQuick 2.0\nImage { source: \"" + testFile("colors.png") + "\"; smooth: true; width: 300; height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -291,7 +291,7 @@ void tst_qquickimage::mirror() foreach (QQuickImage::FillMode fillMode, fillModes) { QQuickView *canvas = new QQuickView; - canvas->setSource(QUrl::fromLocalFile(TESTDATA("mirror.qml"))); + canvas->setSource(testFileUrl("mirror.qml")); QQuickImage *obj = canvas->rootObject()->findChild<QQuickImage*>("image"); QVERIFY(obj != 0); @@ -307,7 +307,7 @@ void tst_qquickimage::mirror() foreach (QQuickImage::FillMode fillMode, fillModes) { QPixmap srcPixmap; - QVERIFY(srcPixmap.load(TESTDATA("pattern.png"))); + QVERIFY(srcPixmap.load(testFile("pattern.png"))); QPixmap expected(width, height); expected.fill(); @@ -359,7 +359,7 @@ void tst_qquickimage::svg() if (!QImageReader::supportedImageFormats().contains("svg")) QSKIP("svg support not available"); - QString src = QUrl::fromLocalFile(TESTDATA("heart.svg")).toString(); + QString src = testFileUrl("heart.svg").toString(); QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; sourceSize.width: 300; sourceSize.height: 300 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -423,7 +423,7 @@ void tst_qquickimage::geometry() QFETCH(double, boundingWidth); QFETCH(double, boundingHeight); - QString src = QUrl::fromLocalFile(TESTDATA("rect.png")).toString(); + QString src = testFileUrl("rect.png").toString(); QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; fillMode: Image." + fillMode + "; "; if (explicitWidth) @@ -451,7 +451,7 @@ void tst_qquickimage::big() // If the JPEG loader does not implement scaling efficiently, it would // have to build a 400 MB image. That would be a bug in the JPEG loader. - QString src = QUrl::fromLocalFile(TESTDATA("big.jpeg")).toString(); + QString src = testFileUrl("big.jpeg").toString(); QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; width: 100; sourceSize.height: 256 }"; QDeclarativeComponent component(&engine); @@ -484,7 +484,7 @@ void tst_qquickimage::tiling_QTBUG_6716() QQuickView *canvas = new QQuickView(0); AutoDelete<QQuickView> del(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA(source))); + canvas->setSource(testFileUrl(source)); canvas->show(); qApp->processEvents(); @@ -512,12 +512,12 @@ void tst_qquickimage::noLoading() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); server.addRedirect("oldcolors.png", SERVER_ADDR "/colors.png"); QString componentStr = "import QtQuick 2.0\nImage { source: srcImage; cache: true }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("heart.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("heart.png")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -529,7 +529,7 @@ void tst_qquickimage::noLoading() QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QQuickImageBase::Status))); // Loading local file - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("green.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("green.png")); QTRY_VERIFY(obj->status() == QQuickImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 1); @@ -547,7 +547,7 @@ void tst_qquickimage::noLoading() QTRY_COMPARE(statusSpy.count(), 2); // Loading remote file again - should not go through 'Loading' state. - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("green.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("green.png")); ctxt->setContextProperty("srcImage", QString(SERVER_ADDR) + "/rect.png"); QTRY_VERIFY(obj->status() == QQuickImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); @@ -561,7 +561,7 @@ void tst_qquickimage::noLoading() void tst_qquickimage::paintedWidthHeight() { { - QString src = QUrl::fromLocalFile(TESTDATA("heart.png")).toString(); + QString src = testFileUrl("heart.png").toString(); QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; width: 200; height: 25; fillMode: Image.PreserveAspectFit }"; QDeclarativeComponent component(&engine); @@ -577,7 +577,7 @@ void tst_qquickimage::paintedWidthHeight() } { - QString src = QUrl::fromLocalFile(TESTDATA("heart.png")).toString(); + QString src = testFileUrl("heart.png").toString(); QString componentStr = "import QtQuick 2.0\nImage { source: \"" + src + "\"; width: 26; height: 175; fillMode: Image.PreserveAspectFit }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -596,7 +596,7 @@ void tst_qquickimage::sourceSize_QTBUG_14303() { QString componentStr = "import QtQuick 2.0\nImage { source: srcImage }"; QDeclarativeContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("heart200.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("heart200.png")); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); @@ -610,12 +610,12 @@ void tst_qquickimage::sourceSize_QTBUG_14303() QTRY_COMPARE(obj->sourceSize().height(), 200); QTRY_COMPARE(sourceSizeSpy.count(), 0); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("colors.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("colors.png")); QTRY_COMPARE(obj->sourceSize().width(), 120); QTRY_COMPARE(obj->sourceSize().height(), 120); QTRY_COMPARE(sourceSizeSpy.count(), 1); - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(TESTDATA("heart200.png"))); + ctxt->setContextProperty("srcImage", testFileUrl("heart200.png")); QTRY_COMPARE(obj->sourceSize().width(), 200); QTRY_COMPARE(obj->sourceSize().height(), 200); QTRY_COMPARE(sourceSizeSpy.count(), 2); @@ -626,7 +626,7 @@ void tst_qquickimage::sourceSize_QTBUG_14303() void tst_qquickimage::sourceSize_QTBUG_16389() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug_16389.qml"))); + canvas->setSource(testFileUrl("qtbug_16389.qml")); canvas->show(); qApp->processEvents(); @@ -659,7 +659,7 @@ static void checkWarnings(QtMsgType, const char *msg) void tst_qquickimage::nullPixmapPaint() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("nullpixmap.qml"))); + canvas->setSource(testFileUrl("nullpixmap.qml")); canvas->show(); QQuickImage *image = qobject_cast<QQuickImage*>(canvas->rootObject()); @@ -679,10 +679,10 @@ void tst_qquickimage::imageCrash_QTBUG_22125() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA(""), TestHTTPServer::Delay); + server.serveDirectory(dataDirectory(), TestHTTPServer::Delay); { - QQuickView view(QUrl::fromLocalFile(TESTDATA("qtbug_22125.qml"))); + QQuickView view(testFileUrl("qtbug_22125.qml")); view.show(); qApp->processEvents(); qApp->processEvents(); diff --git a/tests/auto/qtquick2/qquickitem/qquickitem.pro b/tests/auto/qtquick2/qquickitem/qquickitem.pro index 2ebe76b09c..a29641c02b 100644 --- a/tests/auto/qtquick2/qquickitem/qquickitem.pro +++ b/tests/auto/qtquick2/qquickitem/qquickitem.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qquickitem -SOURCES += tst_qquickitem.cpp +SOURCES += tst_qquickitem.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp index fd7433b64e..688f5e5024 100644 --- a/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp @@ -103,16 +103,12 @@ protected: virtual void focusOutEvent(QFocusEvent *) { Q_ASSERT(focused); focused = false; } }; -class tst_qquickitem : public QObject +class tst_qquickitem : public QDeclarativeDataTest { Q_OBJECT public: - tst_qquickitem(); private slots: - void initTestCase(); - void cleanupTestCase(); - void noCanvas(); void simpleFocus(); void scopedFocus(); @@ -150,18 +146,6 @@ private: } }; -tst_qquickitem::tst_qquickitem() -{ -} - -void tst_qquickitem::initTestCase() -{ -} - -void tst_qquickitem::cleanupTestCase() -{ -} - // Focus has no effect when outside a canvas void tst_qquickitem::noCanvas() { @@ -1075,56 +1059,59 @@ void tst_qquickitem::hoverEventInParent() void tst_qquickitem::paintOrder_data() { + const QUrl order1Url = testFileUrl("order.1.qml"); + const QUrl order2Url = testFileUrl("order.2.qml"); + QTest::addColumn<QUrl>("source"); QTest::addColumn<int>("op"); QTest::addColumn<QVariant>("param1"); QTest::addColumn<QVariant>("param2"); QTest::addColumn<QStringList>("expected"); - QTest::newRow("test 1 noop") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 noop") << order1Url << int(NoOp) << QVariant() << QVariant() << (QStringList() << "1" << "2" << "3"); - QTest::newRow("test 1 add") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 add") << order1Url << int(Append) << QVariant("new") << QVariant() << (QStringList() << "1" << "2" << "3" << "new"); - QTest::newRow("test 1 remove") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 remove") << order1Url << int(Remove) << QVariant(1) << QVariant() << (QStringList() << "1" << "3"); - QTest::newRow("test 1 stack before") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 stack before") << order1Url << int(StackBefore) << QVariant(2) << QVariant(1) << (QStringList() << "1" << "3" << "2"); - QTest::newRow("test 1 stack after") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 stack after") << order1Url << int(StackAfter) << QVariant(0) << QVariant(1) << (QStringList() << "2" << "1" << "3"); - QTest::newRow("test 1 set z") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 set z") << order1Url << int(SetZ) << QVariant(1) << QVariant(qreal(1.)) << (QStringList() << "1" << "3" << "2"); - QTest::newRow("test 2 noop") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 noop") << order2Url << int(NoOp) << QVariant() << QVariant() << (QStringList() << "1" << "3" << "2"); - QTest::newRow("test 2 add") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 add") << order2Url << int(Append) << QVariant("new") << QVariant() << (QStringList() << "1" << "3" << "new" << "2"); - QTest::newRow("test 2 remove 1") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 remove 1") << order2Url << int(Remove) << QVariant(1) << QVariant() << (QStringList() << "1" << "3"); - QTest::newRow("test 2 remove 2") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 remove 2") << order2Url << int(Remove) << QVariant(2) << QVariant() << (QStringList() << "1" << "2"); - QTest::newRow("test 2 stack before 1") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 stack before 1") << order2Url << int(StackBefore) << QVariant(1) << QVariant(0) << (QStringList() << "1" << "3" << "2"); - QTest::newRow("test 2 stack before 2") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 stack before 2") << order2Url << int(StackBefore) << QVariant(2) << QVariant(0) << (QStringList() << "3" << "1" << "2"); - QTest::newRow("test 2 stack after 1") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 stack after 1") << order2Url << int(StackAfter) << QVariant(0) << QVariant(1) << (QStringList() << "1" << "3" << "2"); - QTest::newRow("test 2 stack after 2") << QUrl::fromLocalFile(TESTDATA("order.2.qml")) + QTest::newRow("test 2 stack after 2") << order2Url << int(StackAfter) << QVariant(0) << QVariant(2) << (QStringList() << "3" << "1" << "2"); - QTest::newRow("test 1 set z") << QUrl::fromLocalFile(TESTDATA("order.1.qml")) + QTest::newRow("test 1 set z") << order1Url << int(SetZ) << QVariant(2) << QVariant(qreal(2.)) << (QStringList() << "1" << "2" << "3"); } diff --git a/tests/auto/qtquick2/qquickitem2/qquickitem2.pro b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro index 2a1d63633c..75a6d88858 100644 --- a/tests/auto/qtquick2/qquickitem2/qquickitem2.pro +++ b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickitem2 macx:CONFIG -= app_bundle -SOURCES += tst_qquickitem.cpp +SOURCES += tst_qquickitem.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp index 959710e0db..334f5456f2 100644 --- a/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp @@ -48,7 +48,7 @@ #include <private/qquickitem_p.h> #include "../../shared/util.h" -class tst_QQuickItem : public QObject +class tst_QQuickItem : public QDeclarativeDataTest { Q_OBJECT public: @@ -197,6 +197,7 @@ tst_QQuickItem::tst_QQuickItem() void tst_QQuickItem::initTestCase() { + QDeclarativeDataTest::initTestCase(); qmlRegisterType<KeyTestItem>("Test",1,0,"KeyTestItem"); } @@ -211,7 +212,7 @@ void tst_QQuickItem::keys() canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true)); canvas->rootContext()->setContextProperty("forwardeeVisible", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keystest.qml"))); + canvas->setSource(testFileUrl("keystest.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -329,7 +330,7 @@ void tst_QQuickItem::keysProcessingOrder() KeysTestObject *testObject = new KeysTestObject; canvas->rootContext()->setContextProperty("keysTestObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keyspriority.qml"))); + canvas->setSource(testFileUrl("keyspriority.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -397,7 +398,7 @@ bool anchorsMirrored(QQuickItem *rootItem, const char * itemString) void tst_QQuickItem::layoutMirroring() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("layoutmirroring.qml"))); + canvas->setSource(testFileUrl("layoutmirroring.qml")); canvas->show(); QQuickItem *rootItem = qobject_cast<QQuickItem*>(canvas->rootObject()); @@ -538,7 +539,7 @@ void tst_QQuickItem::keyNavigation() QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(240,320)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keynavigationtest.qml"))); + canvas->setSource(testFileUrl("keynavigationtest.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -615,7 +616,7 @@ void tst_QQuickItem::keyNavigation_RightToLeft() QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(240,320)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keynavigationtest.qml"))); + canvas->setSource(testFileUrl("keynavigationtest.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -670,7 +671,7 @@ void tst_QQuickItem::keyNavigation_skipNotVisible() QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(240,320)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keynavigationtest.qml"))); + canvas->setSource(testFileUrl("keynavigationtest.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -745,7 +746,7 @@ void tst_QQuickItem::keyNavigation_implicitSetting() QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(240,320)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("keynavigationtest_implicit.qml"))); + canvas->setSource(testFileUrl("keynavigationtest_implicit.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -933,7 +934,7 @@ void tst_QQuickItem::mapCoordinates() QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(300, 300)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("mapCoordinates.qml"))); + canvas->setSource(testFileUrl("mapCoordinates.qml")); canvas->show(); qApp->processEvents(); @@ -962,8 +963,8 @@ void tst_QQuickItem::mapCoordinates() Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, x), Q_ARG(QVariant, y))); QCOMPARE(result.value<QPointF>(), qobject_cast<QQuickItem*>(a)->mapFromScene(QPointF(x, y))); - QString warning1 = QUrl::fromLocalFile(TESTDATA("mapCoordinates.qml")).toString() + ":48:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item"; - QString warning2 = QUrl::fromLocalFile(TESTDATA("mapCoordinates.qml")).toString() + ":48:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item"; + QString warning1 = testFileUrl("mapCoordinates.qml").toString() + ":48:5: QML Item: mapToItem() given argument \"1122\" which is neither null nor an Item"; + QString warning2 = testFileUrl("mapCoordinates.qml").toString() + ":48:5: QML Item: mapFromItem() given argument \"1122\" which is neither null nor an Item"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QVERIFY(QMetaObject::invokeMethod(root, "checkMapAToInvalid", @@ -1014,7 +1015,7 @@ void tst_QQuickItem::transforms() void tst_QQuickItem::childrenProperty() { - QDeclarativeComponent component(&engine, TESTDATA("childrenProperty.qml")); + QDeclarativeComponent component(&engine, testFileUrl("childrenProperty.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -1029,7 +1030,7 @@ void tst_QQuickItem::childrenProperty() void tst_QQuickItem::resourcesProperty() { - QDeclarativeComponent component(&engine, TESTDATA("resourcesProperty.qml")); + QDeclarativeComponent component(&engine, testFileUrl("resourcesProperty.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -1046,7 +1047,7 @@ void tst_QQuickItem::propertyChanges() { QQuickView *canvas = new QQuickView(0); canvas->setBaseSize(QSize(300, 300)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + canvas->setSource(testFileUrl("propertychanges.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -1127,7 +1128,7 @@ void tst_QQuickItem::propertyChanges() void tst_QQuickItem::childrenRect() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRect.qml"))); + canvas->setSource(testFileUrl("childrenRect.qml")); canvas->setBaseSize(QSize(240,320)); canvas->show(); @@ -1157,11 +1158,11 @@ void tst_QQuickItem::childrenRectBug() { QQuickView *canvas = new QQuickView(0); - QString warning = QUrl::fromLocalFile(TESTDATA("childrenRectBug.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; + QString warning = testFileUrl("childrenRectBug.qml").toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRectBug.qml"))); + canvas->setSource(testFileUrl("childrenRectBug.qml")); canvas->show(); QQuickItem *o = canvas->rootObject(); @@ -1178,17 +1179,17 @@ void tst_QQuickItem::childrenRectBug2() { QQuickView *canvas = new QQuickView(0); - QString warning1 = QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"width\""; + QString warning1 = testFileUrl("childrenRectBug2.qml").toString() + ":7:5: QML Item: Binding loop detected for property \"width\""; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); - QString warning2 = QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; + QString warning2 = testFileUrl("childrenRectBug2.qml").toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml"))); + canvas->setSource(testFileUrl("childrenRectBug2.qml")); canvas->show(); QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(canvas->rootObject()); @@ -1211,7 +1212,7 @@ void tst_QQuickItem::childrenRectBug2() void tst_QQuickItem::childrenRectBug3() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRectBug3.qml"))); + canvas->setSource(testFileUrl("childrenRectBug3.qml")); canvas->show(); //don't crash on delete @@ -1222,7 +1223,7 @@ void tst_QQuickItem::childrenRectBug3() void tst_QQuickItem::transformCrash() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("transformCrash.qml"))); + canvas->setSource(testFileUrl("transformCrash.qml")); canvas->show(); delete canvas; @@ -1231,7 +1232,7 @@ void tst_QQuickItem::transformCrash() void tst_QQuickItem::implicitSize() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("implicitsize.qml"))); + canvas->setSource(testFileUrl("implicitsize.qml")); canvas->show(); QQuickItem *item = qobject_cast<QQuickItem*>(canvas->rootObject()); @@ -1259,7 +1260,7 @@ void tst_QQuickItem::implicitSize() void tst_QQuickItem::qtbug_16871() { - QDeclarativeComponent component(&engine, TESTDATA("qtbug_16871.qml")); + QDeclarativeComponent component(&engine, testFileUrl("qtbug_16871.qml")); QObject *o = component.create(); QVERIFY(o != 0); delete o; diff --git a/tests/auto/qtquick2/qquicklistview/qquicklistview.pro b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro index be88679c62..16e0695855 100644 --- a/tests/auto/qtquick2/qquicklistview/qquicklistview.pro +++ b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro @@ -2,8 +2,11 @@ CONFIG += testcase TARGET = tst_qquicklistview macx:CONFIG -= app_bundle -HEADERS += incrementalmodel.h -SOURCES += tst_qquicklistview.cpp incrementalmodel.cpp +HEADERS += incrementalmodel.h \ + ../../shared/util.h +SOURCES += tst_qquicklistview.cpp \ + incrementalmodel.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp index c6cd692045..73b4d0319d 100644 --- a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp @@ -60,15 +60,13 @@ Q_DECLARE_METATYPE(Qt::LayoutDirection) Q_DECLARE_METATYPE(QQuickListView::Orientation) -class tst_QQuickListView : public QObject +class tst_QQuickListView : public QDeclarativeDataTest { Q_OBJECT public: tst_QQuickListView(); private slots: - void initTestCase(); - void cleanupTestCase(); // Test both QListModelInterface and QAbstractItemModel model types void qListModelInterface_items(); void qListModelInterface_package_items(); @@ -184,14 +182,6 @@ private: void moved_data(); }; -void tst_QQuickListView::initTestCase() -{ -} - -void tst_QQuickListView::cleanupTestCase() -{ - -} class TestObject : public QObject { Q_OBJECT @@ -611,7 +601,7 @@ void tst_QQuickListView::inserted(const QUrl &source) ctxt->setContextProperty("testObject", testObject); canvas->setSource(source); - //canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + //canvas->setSource(testFileUrl("listviewtest.qml"))); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -715,7 +705,7 @@ void tst_QQuickListView::inserted_more() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -865,7 +855,7 @@ void tst_QQuickListView::insertBeforeVisible() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1396,7 +1386,7 @@ void tst_QQuickListView::multipleChanges() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1613,7 +1603,7 @@ void tst_QQuickListView::swapWithFirstItem() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1639,7 +1629,7 @@ void tst_QQuickListView::enforceRange() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-enforcerange.qml"))); + canvas->setSource(testFileUrl("listview-enforcerange.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1700,7 +1690,7 @@ void tst_QQuickListView::enforceRange_withoutHighlight() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-enforcerange-nohighlight.qml"))); + canvas->setSource(testFileUrl("listview-enforcerange-nohighlight.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1742,7 +1732,7 @@ void tst_QQuickListView::spacing() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -1894,7 +1884,7 @@ void tst_QQuickListView::sectionsDelegate() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-sections_delegate.qml"))); + canvas->setSource(testFileUrl("listview-sections_delegate.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -2007,7 +1997,7 @@ void tst_QQuickListView::sectionsPositioning() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-sections_delegate.qml"))); + canvas->setSource(testFileUrl("listview-sections_delegate.qml")); qApp->processEvents(); canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart | QQuickViewSection::NextLabelAtEnd))); @@ -2136,7 +2126,7 @@ void tst_QQuickListView::currentIndex_delayedItemCreation() // (since the currentItem will have changed and that shares the same index) canvas->rootContext()->setContextProperty("setCurrentToZero", setCurrentToZero); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml"))); + canvas->setSource(testFileUrl("fillModelOnComponentCompleted.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -2173,7 +2163,7 @@ void tst_QQuickListView::currentIndex() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testWrap", QVariant(false)); - QString filename(TESTDATA("listview-initCurrent.qml")); + QString filename(testFile("listview-initCurrent.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -2309,7 +2299,7 @@ void tst_QQuickListView::noCurrentIndex() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - QString filename(TESTDATA("listview-noCurrent.qml")); + QString filename(testFile("listview-noCurrent.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -2339,7 +2329,7 @@ void tst_QQuickListView::itemList() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("itemlist.qml"))); + canvas->setSource(testFileUrl("itemlist.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "view"); @@ -2390,7 +2380,7 @@ void tst_QQuickListView::cacheBuffer() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); canvas->show(); qApp->processEvents(); @@ -2491,7 +2481,7 @@ void tst_QQuickListView::positionViewAtIndex() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -2656,7 +2646,7 @@ void tst_QQuickListView::resetModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml"))); + canvas->setSource(testFileUrl("displaylist.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -2692,7 +2682,7 @@ void tst_QQuickListView::propertyChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView"); QTRY_VERIFY(listView); @@ -2760,7 +2750,7 @@ void tst_QQuickListView::componentChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView"); QTRY_VERIFY(listView); @@ -2808,7 +2798,7 @@ void tst_QQuickListView::modelChanges() { QQuickView *canvas = createView(); QTRY_VERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml"))); + canvas->setSource(testFileUrl("propertychangestest.qml")); QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView"); QTRY_VERIFY(listView); @@ -2835,7 +2825,7 @@ void tst_QQuickListView::QTBUG_9791() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("strictlyenforcerange.qml"))); + canvas->setSource(testFileUrl("strictlyenforcerange.qml")); qApp->processEvents(); QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject()); @@ -2871,7 +2861,7 @@ void tst_QQuickListView::manualHighlight() QQuickView *canvas = new QQuickView(0); canvas->setGeometry(0,0,240,320); - QString filename(TESTDATA("manual-highlight.qml")); + QString filename(testFile("manual-highlight.qml")); canvas->setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -2916,7 +2906,7 @@ void tst_QQuickListView::QTBUG_11105() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -2969,7 +2959,7 @@ void tst_QQuickListView::header() canvas->rootContext()->setContextProperty("testModel", &model); canvas->rootContext()->setContextProperty("initialViewWidth", 240); canvas->rootContext()->setContextProperty("initialViewHeight", 320); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml"))); + canvas->setSource(testFileUrl("header.qml")); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); QTRY_VERIFY(listview != 0); @@ -3026,7 +3016,7 @@ void tst_QQuickListView::header() canvas->rootContext()->setContextProperty("testModel", &model); canvas->rootContext()->setContextProperty("initialViewWidth", 0.0); canvas->rootContext()->setContextProperty("initialViewHeight", 0.0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml"))); + canvas->setSource(testFileUrl("header.qml")); listview = findItem<QQuickListView>(canvas->rootObject(), "list"); QTRY_VERIFY(listview != 0); @@ -3102,7 +3092,7 @@ void tst_QQuickListView::header_delayItemCreation() TestModel model; canvas->rootContext()->setContextProperty("setCurrentToZero", QVariant(false)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml"))); + canvas->setSource(testFileUrl("fillModelOnComponentCompleted.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3143,7 +3133,7 @@ void tst_QQuickListView::footer() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("footer.qml"))); + canvas->setSource(testFileUrl("footer.qml")); canvas->show(); qApp->processEvents(); @@ -3298,7 +3288,7 @@ void tst_QQuickListView::headerFooter() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml"))); + canvas->setSource(testFileUrl("headerfooter.qml")); qApp->processEvents(); QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject()); @@ -3328,7 +3318,7 @@ void tst_QQuickListView::headerFooter() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml"))); + canvas->setSource(testFileUrl("headerfooter.qml")); canvas->rootObject()->setProperty("horizontal", true); qApp->processEvents(); @@ -3359,7 +3349,7 @@ void tst_QQuickListView::headerFooter() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml"))); + canvas->setSource(testFileUrl("headerfooter.qml")); canvas->rootObject()->setProperty("horizontal", true); canvas->rootObject()->setProperty("rtl", true); qApp->processEvents(); @@ -3399,7 +3389,7 @@ void tst_QQuickListView::resizeView() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3443,7 +3433,7 @@ void tst_QQuickListView::resizeViewAndRepaint() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("initialHeight", 100); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizeview.qml"))); + canvas->setSource(testFileUrl("resizeview.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3477,7 +3467,7 @@ void tst_QQuickListView::sizeLessThan1() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("sizelessthan1.qml"))); + canvas->setSource(testFileUrl("sizelessthan1.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3503,7 +3493,7 @@ void tst_QQuickListView::QTBUG_14821() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug14821.qml"))); + canvas->setSource(testFileUrl("qtbug14821.qml")); qApp->processEvents(); QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject()); @@ -3534,7 +3524,7 @@ void tst_QQuickListView::resizeDelegate() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml"))); + canvas->setSource(testFileUrl("displaylist.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3619,7 +3609,7 @@ void tst_QQuickListView::resizeFirstDelegate() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3678,7 +3668,7 @@ void tst_QQuickListView::QTBUG_16037() QQuickView *canvas = createView(); canvas->show(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug16037.qml"))); + canvas->setSource(testFileUrl("qtbug16037.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "listview"); @@ -3707,7 +3697,7 @@ void tst_QQuickListView::indexAt() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + canvas->setSource(testFileUrl("listviewtest.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3734,7 +3724,7 @@ void tst_QQuickListView::incrementalModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml"))); + canvas->setSource(testFileUrl("displaylist.qml")); qApp->processEvents(); QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list"); @@ -3769,7 +3759,7 @@ void tst_QQuickListView::onAdd() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("delegateHeight", delegateHeight); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml"))); + canvas->setSource(testFileUrl("attachedSignals.qml")); QObject *object = canvas->rootObject(); object->setProperty("width", canvas->width()); @@ -3823,7 +3813,7 @@ void tst_QQuickListView::onRemove() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("delegateHeight", delegateHeight); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml"))); + canvas->setSource(testFileUrl("attachedSignals.qml")); QObject *object = canvas->rootObject(); model.removeItems(indexToRemove, removeCount); @@ -3861,7 +3851,7 @@ void tst_QQuickListView::rightToLeft() { QQuickView *canvas = createView(); canvas->setGeometry(0,0,640,320); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml"))); + canvas->setSource(testFileUrl("rightToLeft.qml")); qApp->processEvents(); QVERIFY(canvas->rootObject() != 0); @@ -3911,12 +3901,12 @@ void tst_QQuickListView::rightToLeft() void tst_QQuickListView::test_mirroring() { QQuickView *canvasA = createView(); - canvasA->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml"))); + canvasA->setSource(testFileUrl("rightToLeft.qml")); QQuickListView *listviewA = findItem<QQuickListView>(canvasA->rootObject(), "view"); QTRY_VERIFY(listviewA != 0); QQuickView *canvasB = createView(); - canvasB->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml"))); + canvasB->setSource(testFileUrl("rightToLeft.qml")); QQuickListView *listviewB = findItem<QQuickListView>(canvasB->rootObject(), "view"); QTRY_VERIFY(listviewA != 0); qApp->processEvents(); @@ -3980,7 +3970,7 @@ void tst_QQuickListView::margins() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("margins.qml"))); + canvas->setSource(testFileUrl("margins.qml")); canvas->show(); qApp->processEvents(); @@ -4074,7 +4064,7 @@ void tst_QQuickListView::snapToItem() QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapToItem.qml"))); + canvas->setSource(testFileUrl("snapToItem.qml")); canvas->show(); qApp->processEvents(); @@ -4127,42 +4117,42 @@ void tst_QQuickListView::snapToItem() void tst_QQuickListView::qListModelInterface_items() { - items<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); + items<TestModel>(testFileUrl("listviewtest.qml"), false); } void tst_QQuickListView::qListModelInterface_package_items() { - items<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml")), true); + items<TestModel>(testFileUrl("listviewtest-package.qml"), true); } void tst_QQuickListView::qAbstractItemModel_items() { - items<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); + items<TestModel2>(testFileUrl("listviewtest.qml"), false); } void tst_QQuickListView::qListModelInterface_changed() { - changed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); + changed<TestModel>(testFileUrl("listviewtest.qml"), false); } void tst_QQuickListView::qListModelInterface_package_changed() { - changed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml")), true); + changed<TestModel>(testFileUrl("listviewtest-package.qml"), true); } void tst_QQuickListView::qAbstractItemModel_changed() { - changed<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); + changed<TestModel2>(testFileUrl("listviewtest.qml"), false); } void tst_QQuickListView::qListModelInterface_inserted() { - inserted<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + inserted<TestModel>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qListModelInterface_package_inserted() { - inserted<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml"))); + inserted<TestModel>(testFileUrl("listviewtest-package.qml")); } void tst_QQuickListView::qListModelInterface_inserted_more() @@ -4177,7 +4167,7 @@ void tst_QQuickListView::qListModelInterface_inserted_more_data() void tst_QQuickListView::qAbstractItemModel_inserted() { - inserted<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + inserted<TestModel2>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qAbstractItemModel_inserted_more() @@ -4192,25 +4182,25 @@ void tst_QQuickListView::qAbstractItemModel_inserted_more_data() void tst_QQuickListView::qListModelInterface_removed() { - removed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); - removed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), true); + removed<TestModel>(testFileUrl("listviewtest.qml"), false); + removed<TestModel>(testFileUrl("listviewtest.qml"), true); } void tst_QQuickListView::qListModelInterface_package_removed() { - removed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml")), false); - removed<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml")), true); + removed<TestModel>(testFileUrl("listviewtest-package.qml"), false); + removed<TestModel>(testFileUrl("listviewtest-package.qml"), true); } void tst_QQuickListView::qAbstractItemModel_removed() { - removed<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), false); - removed<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")), true); + removed<TestModel2>(testFileUrl("listviewtest.qml"), false); + removed<TestModel2>(testFileUrl("listviewtest.qml"), true); } void tst_QQuickListView::qListModelInterface_moved() { - moved<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + moved<TestModel>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qListModelInterface_moved_data() @@ -4220,7 +4210,7 @@ void tst_QQuickListView::qListModelInterface_moved_data() void tst_QQuickListView::qListModelInterface_package_moved() { - moved<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml"))); + moved<TestModel>(testFileUrl("listviewtest-package.qml")); } void tst_QQuickListView::qListModelInterface_package_moved_data() @@ -4230,7 +4220,7 @@ void tst_QQuickListView::qListModelInterface_package_moved_data() void tst_QQuickListView::qAbstractItemModel_moved() { - moved<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + moved<TestModel2>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qAbstractItemModel_moved_data() @@ -4240,39 +4230,39 @@ void tst_QQuickListView::qAbstractItemModel_moved_data() void tst_QQuickListView::qListModelInterface_clear() { - clear<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + clear<TestModel>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qListModelInterface_package_clear() { - clear<TestModel>(QUrl::fromLocalFile(TESTDATA("listviewtest-package.qml"))); + clear<TestModel>(testFileUrl("listviewtest-package.qml")); } void tst_QQuickListView::qAbstractItemModel_clear() { - clear<TestModel2>(QUrl::fromLocalFile(TESTDATA("listviewtest.qml"))); + clear<TestModel2>(testFileUrl("listviewtest.qml")); } void tst_QQuickListView::qListModelInterface_sections() { - sections<TestModel>(QUrl::fromLocalFile(TESTDATA("listview-sections.qml"))); + sections<TestModel>(testFileUrl("listview-sections.qml")); } void tst_QQuickListView::qListModelInterface_package_sections() { - sections<TestModel>(QUrl::fromLocalFile(TESTDATA("listview-sections-package.qml"))); + sections<TestModel>(testFileUrl("listview-sections-package.qml")); } void tst_QQuickListView::qAbstractItemModel_sections() { - sections<TestModel2>(QUrl::fromLocalFile(TESTDATA("listview-sections.qml"))); + sections<TestModel2>(testFileUrl("listview-sections.qml")); } void tst_QQuickListView::creationContext() { QQuickView canvas; canvas.setGeometry(0,0,240,320); - canvas.setSource(QUrl::fromLocalFile(TESTDATA("creationContext.qml"))); + canvas.setSource(testFileUrl("creationContext.qml")); qApp->processEvents(); QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject()); @@ -4294,7 +4284,7 @@ void tst_QQuickListView::QTBUG_21742() { QQuickView canvas; canvas.setGeometry(0,0,200,200); - canvas.setSource(QUrl::fromLocalFile(TESTDATA("qtbug-21742.qml"))); + canvas.setSource(testFileUrl("qtbug-21742.qml")); qApp->processEvents(); QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject()); @@ -4335,7 +4325,7 @@ void tst_QQuickListView::asynchronous() QDeclarativeIncubationController controller; canvas->engine()->setIncubationController(&controller); - canvas->setSource(TESTDATA("asyncloader.qml")); + canvas->setSource(testFileUrl("asyncloader.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(rootObject); @@ -4416,7 +4406,7 @@ void tst_QQuickListView::snapOneItem() QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapOneItem.qml"))); + canvas->setSource(testFileUrl("snapOneItem.qml")); canvas->show(); qApp->processEvents(); @@ -4497,8 +4487,7 @@ void tst_QQuickListView::unrequestedVisibility() ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testWrap", QVariant(false)); - QString filename(TESTDATA("unrequestedItems.qml")); - canvas->setSource(QUrl::fromLocalFile(filename)); + canvas->setSource(testFileUrl("unrequestedItems.qml")); canvas->show(); diff --git a/tests/auto/qtquick2/qquickloader/qquickloader.pro b/tests/auto/qtquick2/qquickloader/qquickloader.pro index 6e372692c2..c22ed63b89 100644 --- a/tests/auto/qtquick2/qquickloader/qquickloader.pro +++ b/tests/auto/qtquick2/qquickloader/qquickloader.pro @@ -3,9 +3,12 @@ TARGET = tst_qquickloader macx:CONFIG -= app_bundle INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h + SOURCES += tst_qquickloader.cpp \ - ../../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp index 3df692a6a6..b1d6d07566 100644 --- a/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp @@ -51,11 +51,6 @@ #define SERVER_PORT 14450 -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - class PeriodicIncubationController : public QObject, public QDeclarativeIncubationController { @@ -70,7 +65,7 @@ protected: } }; -class tst_QQuickLoader : public QObject +class tst_QQuickLoader : public QDeclarativeDataTest { Q_OBJECT @@ -149,7 +144,7 @@ void tst_QQuickLoader::sourceOrComponent() " onProgressChanged: onProgressChangedCount += 1\n" " onLoaded: onLoadedCount += 1\n" "}") - , TEST_FILE("")); + , dataDirectoryUrl()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader != 0); @@ -194,10 +189,10 @@ void tst_QQuickLoader::sourceOrComponent_data() QTest::addColumn<QUrl>("sourceUrl"); QTest::addColumn<QString>("errorString"); - QTest::newRow("source") << "source" << "source: 'Rect120x60.qml'\n" << QUrl::fromLocalFile(TESTDATA("Rect120x60.qml")) << ""; + QTest::newRow("source") << "source" << "source: 'Rect120x60.qml'\n" << testFileUrl("Rect120x60.qml") << ""; QTest::newRow("sourceComponent") << "component" << "Component { id: comp; Rectangle { width: 100; height: 50 } }\n sourceComponent: comp\n" << QUrl() << ""; - QTest::newRow("invalid source") << "source" << "source: 'IDontExist.qml'\n" << QUrl::fromLocalFile(TESTDATA("IDontExist.qml")) - << QString(QUrl::fromLocalFile(TESTDATA("IDontExist.qml")).toString() + ": File not found"); + QTest::newRow("invalid source") << "source" << "source: 'IDontExist.qml'\n" << testFileUrl("IDontExist.qml") + << QString(testFileUrl("IDontExist.qml").toString() + ": File not found"); } void tst_QQuickLoader::clear() @@ -210,7 +205,7 @@ void tst_QQuickLoader::clear() " source: 'Rect120x60.qml'\n" " Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n" " }") - , TEST_FILE("")); + , dataDirectoryUrl()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader != 0); QVERIFY(loader->item()); @@ -225,7 +220,7 @@ void tst_QQuickLoader::clear() delete loader; } { - QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/SetSourceComponent.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -245,7 +240,7 @@ void tst_QQuickLoader::clear() delete item; } { - QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/SetSourceComponent.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -276,7 +271,7 @@ void tst_QQuickLoader::urlToComponent() " source: \"Rect120x60.qml\"\n" " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n" "}" ) - , TEST_FILE("")); + , dataDirectoryUrl()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QTest::qWait(200); QTRY_VERIFY(loader != 0); @@ -291,7 +286,7 @@ void tst_QQuickLoader::urlToComponent() void tst_QQuickLoader::componentToUrl() { - QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/SetSourceComponent.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -301,7 +296,7 @@ void tst_QQuickLoader::componentToUrl() QCOMPARE(loader->progress(), 1.0); QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1); - loader->setSource(TEST_FILE("/Rect120x60.qml")); + loader->setSource(testFileUrl("/Rect120x60.qml")); QVERIFY(loader->item()); QCOMPARE(loader->progress(), 1.0); QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1); @@ -313,7 +308,7 @@ void tst_QQuickLoader::componentToUrl() void tst_QQuickLoader::anchoredLoader() { - QDeclarativeComponent component(&engine, TEST_FILE("/AnchoredLoader.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/AnchoredLoader.qml")); QQuickItem *rootItem = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootItem != 0); QQuickItem *loader = rootItem->findChild<QQuickItem*>("loader"); @@ -334,7 +329,7 @@ void tst_QQuickLoader::anchoredLoader() void tst_QQuickLoader::sizeLoaderToItem() { - QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/SizeToItem.qml")); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader != 0); QCOMPARE(loader->width(), 120.0); @@ -375,7 +370,7 @@ void tst_QQuickLoader::sizeLoaderToItem() void tst_QQuickLoader::sizeItemToLoader() { - QDeclarativeComponent component(&engine, TEST_FILE("/SizeToLoader.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/SizeToLoader.qml")); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader != 0); QCOMPARE(loader->width(), 200.0); @@ -405,7 +400,7 @@ void tst_QQuickLoader::sizeItemToLoader() void tst_QQuickLoader::noResize() { - QDeclarativeComponent component(&engine, TEST_FILE("/NoResize.qml")); + QDeclarativeComponent component(&engine, testFileUrl("/NoResize.qml")); QQuickItem* item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item != 0); QCOMPARE(item->width(), 200.0); @@ -418,10 +413,10 @@ void tst_QQuickLoader::networkRequestUrl() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); QDeclarativeComponent component(&engine); - component.setData(QByteArray("import QtQuick 2.0\nLoader { property int signalCount : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: signalCount += 1 }"), QUrl::fromLocalFile(TESTDATA("../dummy.qml"))); + component.setData(QByteArray("import QtQuick 2.0\nLoader { property int signalCount : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: signalCount += 1 }"), testFileUrl("../dummy.qml")); if (component.isError()) qDebug() << component.errors(); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); @@ -451,7 +446,7 @@ void tst_QQuickLoader::networkComponent() "Item {\n" " Component { id: comp; NW.SlowRect {} }\n" " Loader { sourceComponent: comp } }") - , TEST_FILE("")); + , dataDirectoryUrl()); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -473,7 +468,7 @@ void tst_QQuickLoader::failNetworkRequest() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); QTest::ignoreMessage(QtWarningMsg, "http://127.0.0.1:14450/IDontExist.qml: File not found"); @@ -496,7 +491,7 @@ void tst_QQuickLoader::active() { // check that the item isn't instantiated until active is set to true { - QDeclarativeComponent component(&engine, TEST_FILE("active.1.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.1.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -515,7 +510,7 @@ void tst_QQuickLoader::active() // check that the status is Null if active is set to false { - QDeclarativeComponent component(&engine, TEST_FILE("active.2.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.2.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -532,7 +527,7 @@ void tst_QQuickLoader::active() // check that the source is not cleared if active is set to false { - QDeclarativeComponent component(&engine, TEST_FILE("active.3.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.3.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -549,7 +544,7 @@ void tst_QQuickLoader::active() // check that the sourceComponent is not cleared if active is set to false { - QDeclarativeComponent component(&engine, TEST_FILE("active.4.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.4.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -566,7 +561,7 @@ void tst_QQuickLoader::active() // check that the item is released if active is set to false { - QDeclarativeComponent component(&engine, TEST_FILE("active.5.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.5.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -583,7 +578,7 @@ void tst_QQuickLoader::active() // check that the activeChanged signal is emitted correctly { - QDeclarativeComponent component(&engine, TEST_FILE("active.6.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.6.qml")); QObject *object = component.create(); QVERIFY(object != 0); QQuickLoader *loader = object->findChild<QQuickLoader*>("loader"); @@ -613,7 +608,7 @@ void tst_QQuickLoader::active() // check that the component isn't loaded until active is set to true { - QDeclarativeComponent component(&engine, TEST_FILE("active.7.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.7.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("success").toBool(), true); @@ -622,7 +617,7 @@ void tst_QQuickLoader::active() // check that the component is loaded if active is not set (true by default) { - QDeclarativeComponent component(&engine, TEST_FILE("active.8.qml")); + QDeclarativeComponent component(&engine, testFileUrl("active.8.qml")); QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("success").toBool(), true); @@ -637,42 +632,42 @@ void tst_QQuickLoader::initialPropertyValues_data() QTest::addColumn<QStringList>("propertyNames"); QTest::addColumn<QVariantList>("propertyValues"); - QTest::newRow("source url with value set in onLoaded, initially active = true") << TEST_FILE("initialPropertyValues.1.qml") + QTest::newRow("source url with value set in onLoaded, initially active = true") << testFileUrl("initialPropertyValues.1.qml") << QStringList() << (QStringList() << "initialValue" << "behaviorCount") << (QVariantList() << 1 << 1); - QTest::newRow("set source with initial property values specified, active = true") << TEST_FILE("initialPropertyValues.2.qml") + QTest::newRow("set source with initial property values specified, active = true") << testFileUrl("initialPropertyValues.2.qml") << QStringList() << (QStringList() << "initialValue" << "behaviorCount") << (QVariantList() << 2 << 0); - QTest::newRow("set source with initial property values specified, active = false") << TEST_FILE("initialPropertyValues.3.qml") - << (QStringList() << QString(QLatin1String("file://") + TEST_FILE("initialPropertyValues.3.qml").toLocalFile() + QLatin1String(":16: TypeError: Cannot read property 'canary' of null"))) + QTest::newRow("set source with initial property values specified, active = false") << testFileUrl("initialPropertyValues.3.qml") + << (QStringList() << QString(QLatin1String("file://") + testFileUrl("initialPropertyValues.3.qml").toLocalFile() + QLatin1String(":16: TypeError: Cannot read property 'canary' of null"))) << (QStringList()) << (QVariantList()); - QTest::newRow("set source with initial property values specified, active = false, with active set true later") << TEST_FILE("initialPropertyValues.4.qml") + QTest::newRow("set source with initial property values specified, active = false, with active set true later") << testFileUrl("initialPropertyValues.4.qml") << QStringList() << (QStringList() << "initialValue" << "behaviorCount") << (QVariantList() << 4 << 0); - QTest::newRow("set source without initial property values specified, active = true") << TEST_FILE("initialPropertyValues.5.qml") + QTest::newRow("set source without initial property values specified, active = true") << testFileUrl("initialPropertyValues.5.qml") << QStringList() << (QStringList() << "initialValue" << "behaviorCount") << (QVariantList() << 0 << 0); - QTest::newRow("set source with initial property values specified with binding, active = true") << TEST_FILE("initialPropertyValues.6.qml") + QTest::newRow("set source with initial property values specified with binding, active = true") << testFileUrl("initialPropertyValues.6.qml") << QStringList() << (QStringList() << "initialValue" << "behaviorCount") << (QVariantList() << 6 << 0); - QTest::newRow("ensure initial property value semantics mimic createObject") << TEST_FILE("initialPropertyValues.7.qml") + QTest::newRow("ensure initial property value semantics mimic createObject") << testFileUrl("initialPropertyValues.7.qml") << QStringList() << (QStringList() << "loaderValue" << "createObjectValue") << (QVariantList() << 1 << 1); - QTest::newRow("ensure initial property values aren't disposed prior to component completion") << TEST_FILE("initialPropertyValues.8.qml") + QTest::newRow("ensure initial property values aren't disposed prior to component completion") << testFileUrl("initialPropertyValues.8.qml") << QStringList() << (QStringList() << "initialValue") << (QVariantList() << 6); @@ -687,7 +682,7 @@ void tst_QQuickLoader::initialPropertyValues() TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(TESTDATA("")); + server.serveDirectory(dataDirectory()); foreach (const QString &warning, expectedWarnings) QTest::ignoreMessage(QtWarningMsg, warning.toAscii().constData()); @@ -706,7 +701,7 @@ void tst_QQuickLoader::initialPropertyValues() void tst_QQuickLoader::initialPropertyValuesBinding() { - QDeclarativeComponent component(&engine, TEST_FILE("initialPropertyValues.binding.qml")); + QDeclarativeComponent component(&engine, testFileUrl("initialPropertyValues.binding.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -721,18 +716,18 @@ void tst_QQuickLoader::initialPropertyValuesError_data() QTest::addColumn<QUrl>("qmlFile"); QTest::addColumn<QStringList>("expectedWarnings"); - QTest::newRow("invalid initial property values object") << TEST_FILE("initialPropertyValues.error.1.qml") - << (QStringList() << QString(TEST_FILE("initialPropertyValues.error.1.qml").toString() + ":6:5: QML Loader: setSource: value is not an object")); + QTest::newRow("invalid initial property values object") << testFileUrl("initialPropertyValues.error.1.qml") + << (QStringList() << QString(testFileUrl("initialPropertyValues.error.1.qml").toString() + ":6:5: QML Loader: setSource: value is not an object")); - QTest::newRow("nonexistent source url") << TEST_FILE("initialPropertyValues.error.2.qml") - << (QStringList() << QString(TEST_FILE("NonexistentSourceComponent.qml").toString() + ": File not found")); + QTest::newRow("nonexistent source url") << testFileUrl("initialPropertyValues.error.2.qml") + << (QStringList() << QString(testFileUrl("NonexistentSourceComponent.qml").toString() + ": File not found")); - QTest::newRow("invalid source url") << TEST_FILE("initialPropertyValues.error.3.qml") - << (QStringList() << QString(TEST_FILE("InvalidSourceComponent.qml").toString() + ":5:1: Syntax error")); + QTest::newRow("invalid source url") << testFileUrl("initialPropertyValues.error.3.qml") + << (QStringList() << QString(testFileUrl("InvalidSourceComponent.qml").toString() + ":5:1: Syntax error")); - QTest::newRow("invalid initial property values object with invalid property access") << TEST_FILE("initialPropertyValues.error.4.qml") - << (QStringList() << QString(TEST_FILE("initialPropertyValues.error.4.qml").toString() + ":7:5: QML Loader: setSource: value is not an object") - << QString(TEST_FILE("initialPropertyValues.error.4.qml").toString() + ":5: TypeError: Cannot read property 'canary' of null")); + QTest::newRow("invalid initial property values object with invalid property access") << testFileUrl("initialPropertyValues.error.4.qml") + << (QStringList() << QString(testFileUrl("initialPropertyValues.error.4.qml").toString() + ":7:5: QML Loader: setSource: value is not an object") + << QString(testFileUrl("initialPropertyValues.error.4.qml").toString() + ":5: TypeError: Cannot read property 'canary' of null")); } void tst_QQuickLoader::initialPropertyValuesError() @@ -755,7 +750,7 @@ void tst_QQuickLoader::initialPropertyValuesError() // QTBUG-9241 void tst_QQuickLoader::deleteComponentCrash() { - QDeclarativeComponent component(&engine, TEST_FILE("crash.qml")); + QDeclarativeComponent component(&engine, testFileUrl("crash.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -769,15 +764,15 @@ void tst_QQuickLoader::deleteComponentCrash() QCOMPARE(loader->status(), QQuickLoader::Ready); qApp->processEvents(QEventLoop::DeferredDeletion); QTRY_COMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1); - QVERIFY(loader->source() == QUrl::fromLocalFile(TESTDATA("BlueRect.qml"))); + QVERIFY(loader->source() == testFileUrl("BlueRect.qml")); delete item; } void tst_QQuickLoader::nonItem() { - QDeclarativeComponent component(&engine, TEST_FILE("nonItem.qml")); - QString err = QUrl::fromLocalFile(TESTDATA("nonItem.qml")).toString() + ":3:1: QML Loader: Loader does not support loading non-visual elements."; + QDeclarativeComponent component(&engine, testFileUrl("nonItem.qml")); + QString err = testFileUrl("nonItem.qml").toString() + ":3:1: QML Loader: Loader does not support loading non-visual elements."; QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); @@ -789,8 +784,8 @@ void tst_QQuickLoader::nonItem() void tst_QQuickLoader::vmeErrors() { - QDeclarativeComponent component(&engine, TEST_FILE("vmeErrors.qml")); - QString err = QUrl::fromLocalFile(TESTDATA("VmeError.qml")).toString() + ":6: Cannot assign object type QObject with no default method"; + QDeclarativeComponent component(&engine, testFileUrl("vmeErrors.qml")); + QString err = testFileUrl("VmeError.qml").toString() + ":6: Cannot assign object type QObject with no default method"; QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader); @@ -802,7 +797,7 @@ void tst_QQuickLoader::vmeErrors() // QTBUG-13481 void tst_QQuickLoader::creationContext() { - QDeclarativeComponent component(&engine, TEST_FILE("creationContext.qml")); + QDeclarativeComponent component(&engine, testFileUrl("creationContext.qml")); QObject *o = component.create(); QVERIFY(o != 0); @@ -814,7 +809,7 @@ void tst_QQuickLoader::creationContext() void tst_QQuickLoader::QTBUG_16928() { - QDeclarativeComponent component(&engine, TEST_FILE("QTBUG_16928.qml")); + QDeclarativeComponent component(&engine, testFileUrl("QTBUG_16928.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -826,7 +821,7 @@ void tst_QQuickLoader::QTBUG_16928() void tst_QQuickLoader::implicitSize() { - QDeclarativeComponent component(&engine, TEST_FILE("implicitSize.qml")); + QDeclarativeComponent component(&engine, testFileUrl("implicitSize.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -841,7 +836,7 @@ void tst_QQuickLoader::implicitSize() void tst_QQuickLoader::QTBUG_17114() { - QDeclarativeComponent component(&engine, TEST_FILE("QTBUG_17114.qml")); + QDeclarativeComponent component(&engine, testFileUrl("QTBUG_17114.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); @@ -856,14 +851,14 @@ void tst_QQuickLoader::asynchronous_data() QTest::addColumn<QUrl>("qmlFile"); QTest::addColumn<QStringList>("expectedWarnings"); - QTest::newRow("Valid component") << TEST_FILE("BigComponent.qml") + QTest::newRow("Valid component") << testFileUrl("BigComponent.qml") << QStringList(); - QTest::newRow("Non-existant component") << TEST_FILE("IDoNotExist.qml") - << (QStringList() << QString(TEST_FILE("IDoNotExist.qml").toString() + ": File not found")); + QTest::newRow("Non-existant component") << testFileUrl("IDoNotExist.qml") + << (QStringList() << QString(testFileUrl("IDoNotExist.qml").toString() + ": File not found")); - QTest::newRow("Invalid component") << TEST_FILE("InvalidSourceComponent.qml") - << (QStringList() << QString(TEST_FILE("InvalidSourceComponent.qml").toString() + ":5:1: Syntax error")); + QTest::newRow("Invalid component") << testFileUrl("InvalidSourceComponent.qml") + << (QStringList() << QString(testFileUrl("InvalidSourceComponent.qml").toString() + ":5:1: Syntax error")); } void tst_QQuickLoader::asynchronous() @@ -873,7 +868,7 @@ void tst_QQuickLoader::asynchronous() if (!engine.incubationController()) engine.setIncubationController(new PeriodicIncubationController); - QDeclarativeComponent component(&engine, TEST_FILE("asynchronous.qml")); + QDeclarativeComponent component(&engine, testFileUrl("asynchronous.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(component.create()); QVERIFY(root); @@ -907,7 +902,7 @@ void tst_QQuickLoader::asynchronous_clear() { if (!engine.incubationController()) engine.setIncubationController(new PeriodicIncubationController); - QDeclarativeComponent component(&engine, TEST_FILE("asynchronous.qml")); + QDeclarativeComponent component(&engine, testFileUrl("asynchronous.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(component.create()); QVERIFY(root); @@ -948,7 +943,7 @@ void tst_QQuickLoader::asynchronous_clear() void tst_QQuickLoader::parented() { - QDeclarativeComponent component(&engine, TEST_FILE("parented.qml")); + QDeclarativeComponent component(&engine, testFileUrl("parented.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(component.create()); QVERIFY(root); diff --git a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro index fcf166b0ed..cd1a44e91d 100644 --- a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro @@ -2,8 +2,11 @@ CONFIG += testcase TARGET = tst_qquickmousearea macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h -SOURCES += tst_qquickmousearea.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += tst_qquickmousearea.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp index 7c9af4ba64..50ab26e6a1 100644 --- a/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp @@ -52,12 +52,10 @@ //#define OLDWAY -class tst_QQuickMouseArea: public QObject +class tst_QQuickMouseArea: public QDeclarativeDataTest { Q_OBJECT private slots: - void initTestCase(); - void cleanupTestCase(); void dragProperties(); void resetDrag(); void dragging(); @@ -80,21 +78,11 @@ private: QQuickView *createView(); }; -void tst_QQuickMouseArea::initTestCase() -{ - -} - -void tst_QQuickMouseArea::cleanupTestCase() -{ - -} - void tst_QQuickMouseArea::dragProperties() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("dragproperties.qml"))); + canvas->setSource(testFileUrl("dragproperties.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -180,7 +168,7 @@ void tst_QQuickMouseArea::resetDrag() QQuickView *canvas = createView(); canvas->rootContext()->setContextProperty("haveTarget", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("dragreset.qml"))); + canvas->setSource(testFileUrl("dragreset.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -210,7 +198,7 @@ void tst_QQuickMouseArea::dragging() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("dragging.qml"))); + canvas->setSource(testFileUrl("dragging.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWait(20); @@ -277,7 +265,7 @@ QQuickView *tst_QQuickMouseArea::createView() void tst_QQuickMouseArea::updateMouseAreaPosOnClick() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("updateMousePosOnClick.qml"))); + canvas->setSource(testFileUrl("updateMousePosOnClick.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -306,7 +294,7 @@ void tst_QQuickMouseArea::updateMouseAreaPosOnClick() void tst_QQuickMouseArea::updateMouseAreaPosOnResize() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("updateMousePosOnResize.qml"))); + canvas->setSource(testFileUrl("updateMousePosOnResize.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -343,7 +331,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold() { // We handle onPressAndHold, therefore no onClicked QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("clickandhold.qml"))); + canvas->setSource(testFileUrl("clickandhold.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -368,7 +356,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold() { // We do not handle onPressAndHold, therefore we get onClicked QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("noclickandhold.qml"))); + canvas->setSource(testFileUrl("noclickandhold.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -392,7 +380,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold() void tst_QQuickMouseArea::onMousePressRejected() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("rejectEvent.qml"))); + canvas->setSource(testFileUrl("rejectEvent.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -429,7 +417,7 @@ void tst_QQuickMouseArea::onMousePressRejected() void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pressedCanceled.qml"))); + canvas->setSource(testFileUrl("pressedCanceled.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -474,7 +462,7 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate() void tst_QQuickMouseArea::doubleClick() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("doubleclick.qml"))); + canvas->setSource(testFileUrl("doubleclick.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -503,7 +491,7 @@ void tst_QQuickMouseArea::doubleClick() void tst_QQuickMouseArea::clickTwice() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("clicktwice.qml"))); + canvas->setSource(testFileUrl("clicktwice.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -534,7 +522,7 @@ void tst_QQuickMouseArea::clickTwice() void tst_QQuickMouseArea::pressedOrdering() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pressedOrdering.qml"))); + canvas->setSource(testFileUrl("pressedOrdering.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -562,7 +550,7 @@ void tst_QQuickMouseArea::preventStealing() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("preventstealing.qml"))); + canvas->setSource(testFileUrl("preventstealing.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -625,7 +613,7 @@ void tst_QQuickMouseArea::clickThrough() { //With no handlers defined click, doubleClick and PressAndHold should propagate to those with handlers QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("clickThrough.qml"))); + canvas->setSource(testFileUrl("clickThrough.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -658,7 +646,7 @@ void tst_QQuickMouseArea::clickThrough() //With handlers defined click, doubleClick and PressAndHold should propagate only when explicitly ignored canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("clickThrough2.qml"))); + canvas->setSource(testFileUrl("clickThrough2.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -776,7 +764,7 @@ void tst_QQuickMouseArea::testQtQuick11Attributes_data() void tst_QQuickMouseArea::hoverPosition() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("hoverPosition.qml"))); + canvas->setSource(testFileUrl("hoverPosition.qml")); QQuickItem *root = canvas->rootObject(); QVERIFY(root != 0); @@ -797,7 +785,7 @@ void tst_QQuickMouseArea::hoverPropagation() { //QTBUG-18175, to behave like GV did. QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("hoverPropagation.qml"))); + canvas->setSource(testFileUrl("hoverPropagation.qml")); QQuickItem *root = canvas->rootObject(); QVERIFY(root != 0); diff --git a/tests/auto/qtquick2/qquickpathview/qquickpathview.pro b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro index 6e16dd4879..7a414cd3ed 100644 --- a/tests/auto/qtquick2/qquickpathview/qquickpathview.pro +++ b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickpathview macx:CONFIG -= app_bundle -SOURCES += tst_qquickpathview.cpp +SOURCES += tst_qquickpathview.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp index 0bfa65b734..53c94ca4a9 100644 --- a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp @@ -78,15 +78,13 @@ static void initStandardTreeModel(QStandardItemModel *model) } -class tst_QQuickPathView : public QObject +class tst_QQuickPathView : public QDeclarativeDataTest { Q_OBJECT public: tst_QQuickPathView(); private slots: - void initTestCase(); - void cleanupTestCase(); void initValues(); void items(); void dataModel(); @@ -129,15 +127,6 @@ private: QList<T*> findItems(QQuickItem *parent, const QString &objectName); }; -void tst_QQuickPathView::initTestCase() -{ -} - -void tst_QQuickPathView::cleanupTestCase() -{ - -} - class TestObject : public QObject { Q_OBJECT @@ -285,7 +274,7 @@ tst_QQuickPathView::tst_QQuickPathView() void tst_QQuickPathView::initValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathview1.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathview1.qml")); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); QVERIFY(obj != 0); @@ -315,7 +304,7 @@ void tst_QQuickPathView::items() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -350,7 +339,7 @@ void tst_QQuickPathView::items() void tst_QQuickPathView::pathview2() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathview2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathview2.qml")); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); QVERIFY(obj != 0); @@ -370,7 +359,7 @@ void tst_QQuickPathView::pathview2() void tst_QQuickPathView::pathview3() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathview3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathview3.qml")); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); QVERIFY(obj != 0); @@ -449,7 +438,7 @@ void tst_QQuickPathView::insertModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -535,7 +524,7 @@ void tst_QQuickPathView::removeModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -626,7 +615,7 @@ void tst_QQuickPathView::moveModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -649,7 +638,7 @@ void tst_QQuickPathView::moveModel() void tst_QQuickPathView::path() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("pathtest.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("pathtest.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj != 0); @@ -719,7 +708,7 @@ void tst_QQuickPathView::dataModel() ctxt->setContextProperty("testData", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("datamodel.qml"))); + canvas->setSource(testFileUrl("datamodel.qml")); qApp->processEvents(); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(canvas->rootObject()); @@ -821,7 +810,7 @@ void tst_QQuickPathView::pathMoved() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -878,7 +867,7 @@ void tst_QQuickPathView::setCurrentIndex() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview0.qml"))); + canvas->setSource(testFileUrl("pathview0.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -1005,7 +994,7 @@ void tst_QQuickPathView::resetModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaypath.qml"))); + canvas->setSource(testFileUrl("displaypath.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -1038,7 +1027,7 @@ void tst_QQuickPathView::propertyChanges() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + canvas->setSource(testFileUrl("propertychanges.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1073,7 +1062,7 @@ void tst_QQuickPathView::pathChanges() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + canvas->setSource(testFileUrl("propertychanges.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1135,7 +1124,7 @@ void tst_QQuickPathView::componentChanges() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + canvas->setSource(testFileUrl("propertychanges.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1158,7 +1147,7 @@ void tst_QQuickPathView::modelChanges() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychanges.qml"))); + canvas->setSource(testFileUrl("propertychanges.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1185,7 +1174,7 @@ void tst_QQuickPathView::pathUpdateOnStartChanged() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathUpdateOnStartChanged.qml"))); + canvas->setSource(testFileUrl("pathUpdateOnStartChanged.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1207,7 +1196,7 @@ void tst_QQuickPathView::package() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathview_package.qml"))); + canvas->setSource(testFileUrl("pathview_package.qml")); canvas->show(); QTest::qWaitForWindowShown(canvas); @@ -1231,7 +1220,7 @@ void tst_QQuickPathView::emptyModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("emptyModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("emptymodel.qml"))); + canvas->setSource(testFileUrl("emptymodel.qml")); qApp->processEvents(); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(canvas->rootObject()); @@ -1247,7 +1236,7 @@ void tst_QQuickPathView::closed() QDeclarativeEngine engine; { - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("openPath.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("openPath.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj); QCOMPARE(obj->isClosed(), false); @@ -1255,7 +1244,7 @@ void tst_QQuickPathView::closed() } { - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("closedPath.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("closedPath.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj); QCOMPARE(obj->isClosed(), true); @@ -1268,7 +1257,7 @@ void tst_QQuickPathView::pathUpdate() { QQuickView *canvas = createView(); QVERIFY(canvas); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathUpdate.qml"))); + canvas->setSource(testFileUrl("pathUpdate.qml")); QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("pathView"); QVERIFY(pathView); @@ -1283,7 +1272,7 @@ void tst_QQuickPathView::pathUpdate() void tst_QQuickPathView::visualDataModel() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("vdm.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("vdm.qml")); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); QVERIFY(obj != 0); @@ -1303,7 +1292,7 @@ void tst_QQuickPathView::undefinedPath() QString warning2("QPainterPath::lineTo: Adding point where x or y is NaN or Inf, ignoring call"); QTest::ignoreMessage(QtWarningMsg,qPrintable(warning2)); - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("undefinedpath.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("undefinedpath.qml")); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); QVERIFY(obj != 0); @@ -1316,7 +1305,7 @@ void tst_QQuickPathView::undefinedPath() void tst_QQuickPathView::mouseDrag() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("dragpath.qml"))); + canvas->setSource(testFileUrl("dragpath.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -1355,7 +1344,7 @@ void tst_QQuickPathView::treeModel() initStandardTreeModel(&model); canvas->engine()->rootContext()->setContextProperty("myModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("treemodel.qml"))); + canvas->setSource(testFileUrl("treemodel.qml")); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(canvas->rootObject()); QVERIFY(pathview != 0); @@ -1378,7 +1367,7 @@ void tst_QQuickPathView::changePreferredHighlight() { QQuickView *canvas = createView(); canvas->setGeometry(0,0,400,200); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("dragpath.qml"))); + canvas->setSource(testFileUrl("dragpath.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -1417,7 +1406,7 @@ void tst_QQuickPathView::creationContext() { QQuickView canvas; canvas.setGeometry(0,0,240,320); - canvas.setSource(QUrl::fromLocalFile(TESTDATA("creationContext.qml"))); + canvas.setSource(testFileUrl("creationContext.qml")); QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject()); QVERIFY(rootItem); @@ -1439,7 +1428,7 @@ void tst_QQuickPathView::currentOffsetOnInsertion() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pathline.qml"))); + canvas->setSource(testFileUrl("pathline.qml")); qApp->processEvents(); QQuickPathView *pathview = findItem<QQuickPathView>(canvas->rootObject(), "view"); @@ -1515,7 +1504,7 @@ void tst_QQuickPathView::asynchronous() QDeclarativeIncubationController controller; canvas->engine()->setIncubationController(&controller); - canvas->setSource(TESTDATA("asyncloader.qml")); + canvas->setSource(testFileUrl("asyncloader.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(rootObject); @@ -1625,7 +1614,7 @@ QList<T*> tst_QQuickPathView::findItems(QQuickItem *parent, const QString &objec void tst_QQuickPathView::missingPercent() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("missingPercent.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("missingPercent.qml")); QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create()); QVERIFY(obj); QCOMPARE(obj->attributeAt("_qfx_percent", 1.0), qreal(1.0)); diff --git a/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro index 6e2ff59512..f5fb246ae8 100644 --- a/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickpincharea macx:CONFIG -= app_bundle -SOURCES += tst_qquickpincharea.cpp +SOURCES += tst_qquickpincharea.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp index c34565e953..53d7c2c2ce 100644 --- a/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativecontext.h> #include "../../shared/util.h" -class tst_QQuickPinchArea: public QObject +class tst_QQuickPinchArea: public QDeclarativeDataTest { Q_OBJECT public: @@ -66,6 +66,7 @@ private: }; void tst_QQuickPinchArea::initTestCase() { + QDeclarativeDataTest::initTestCase(); if (!device) { device = new QTouchDevice; device->setType(QTouchDevice::TouchScreen); @@ -80,7 +81,7 @@ void tst_QQuickPinchArea::cleanupTestCase() void tst_QQuickPinchArea::pinchProperties() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml"))); + canvas->setSource(testFileUrl("pinchproperties.qml")); canvas->show(); canvas->requestActivateWindow(); QVERIFY(canvas->rootObject() != 0); @@ -206,7 +207,7 @@ QTouchEvent::TouchPoint makeTouchPoint(int id, QPoint p, QQuickView *v, QQuickIt void tst_QQuickPinchArea::scale() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml"))); + canvas->setSource(testFileUrl("pinchproperties.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -259,7 +260,7 @@ void tst_QQuickPinchArea::scale() void tst_QQuickPinchArea::pan() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml"))); + canvas->setSource(testFileUrl("pinchproperties.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); @@ -315,7 +316,7 @@ void tst_QQuickPinchArea::pan() void tst_QQuickPinchArea::retouch() { QQuickView *canvas = createView(); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("pinchproperties.qml"))); + canvas->setSource(testFileUrl("pinchproperties.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWaitForWindowShown(canvas); diff --git a/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro index 5931b9ba3a..729b61e80b 100644 --- a/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qquickpositioners -SOURCES += tst_qquickpositioners.cpp +SOURCES += tst_qquickpositioners.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp index b6cc68f18e..2878240430 100644 --- a/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp @@ -49,7 +49,7 @@ #include <qdeclarativeexpression.h> #include "../../shared/util.h" -class tst_qquickpositioners : public QObject +class tst_qquickpositioners : public QDeclarativeDataTest { Q_OBJECT public: @@ -99,7 +99,7 @@ tst_qquickpositioners::tst_qquickpositioners() void tst_qquickpositioners::test_horizontal() { - QQuickView *canvas = createView(TESTDATA("horizontal.qml")); + QQuickView *canvas = createView(testFile("horizontal.qml")); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -128,7 +128,7 @@ void tst_qquickpositioners::test_horizontal() void tst_qquickpositioners::test_horizontal_rtl() { - QQuickView *canvas = createView(TESTDATA("horizontal.qml")); + QQuickView *canvas = createView(testFile("horizontal.qml")); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -166,7 +166,7 @@ void tst_qquickpositioners::test_horizontal_rtl() void tst_qquickpositioners::test_horizontal_spacing() { - QQuickView *canvas = createView(TESTDATA("horizontal-spacing.qml")); + QQuickView *canvas = createView(testFile("horizontal-spacing.qml")); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -195,7 +195,7 @@ void tst_qquickpositioners::test_horizontal_spacing() void tst_qquickpositioners::test_horizontal_spacing_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("horizontal-spacing.qml")); + QQuickView *canvas = createView(testFile("horizontal-spacing.qml")); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -224,7 +224,7 @@ void tst_qquickpositioners::test_horizontal_spacing_rightToLeft() void tst_qquickpositioners::test_horizontal_animated() { - QQuickView *canvas = createView(TESTDATA("horizontal-animated.qml"), false); + QQuickView *canvas = createView(testFile("horizontal-animated.qml"), false); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -278,7 +278,7 @@ void tst_qquickpositioners::test_horizontal_animated() void tst_qquickpositioners::test_horizontal_animated_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("horizontal-animated.qml"), false); + QQuickView *canvas = createView(testFile("horizontal-animated.qml"), false); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -334,7 +334,7 @@ void tst_qquickpositioners::test_horizontal_animated_rightToLeft() void tst_qquickpositioners::test_horizontal_animated_disabled() { - QQuickView *canvas = createView(TESTDATA("horizontal-animated-disabled.qml")); + QQuickView *canvas = createView(testFile("horizontal-animated-disabled.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -372,7 +372,7 @@ void tst_qquickpositioners::test_horizontal_animated_disabled() void tst_qquickpositioners::test_vertical() { - QQuickView *canvas = createView(TESTDATA("vertical.qml")); + QQuickView *canvas = createView(testFile("vertical.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -400,7 +400,7 @@ void tst_qquickpositioners::test_vertical() void tst_qquickpositioners::test_vertical_spacing() { - QQuickView *canvas = createView(TESTDATA("vertical-spacing.qml")); + QQuickView *canvas = createView(testFile("vertical-spacing.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -427,7 +427,7 @@ void tst_qquickpositioners::test_vertical_spacing() void tst_qquickpositioners::test_vertical_animated() { - QQuickView *canvas = createView(TESTDATA("vertical-animated.qml"), false); + QQuickView *canvas = createView(testFile("vertical-animated.qml"), false); //Note that they animate in QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); @@ -477,7 +477,7 @@ void tst_qquickpositioners::test_vertical_animated() void tst_qquickpositioners::test_grid() { - QQuickView *canvas = createView(TESTDATA("gridtest.qml")); + QQuickView *canvas = createView(testFile("gridtest.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -511,7 +511,7 @@ void tst_qquickpositioners::test_grid() void tst_qquickpositioners::test_grid_topToBottom() { - QQuickView *canvas = createView(TESTDATA("grid-toptobottom.qml")); + QQuickView *canvas = createView(testFile("grid-toptobottom.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -545,7 +545,7 @@ void tst_qquickpositioners::test_grid_topToBottom() void tst_qquickpositioners::test_grid_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("gridtest.qml")); + QQuickView *canvas = createView(testFile("gridtest.qml")); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -594,7 +594,7 @@ void tst_qquickpositioners::test_grid_rightToLeft() void tst_qquickpositioners::test_grid_spacing() { - QQuickView *canvas = createView(TESTDATA("grid-spacing.qml")); + QQuickView *canvas = createView(testFile("grid-spacing.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -627,7 +627,7 @@ void tst_qquickpositioners::test_grid_spacing() void tst_qquickpositioners::test_grid_row_column_spacing() { - QQuickView *canvas = createView(TESTDATA("grid-row-column-spacing.qml")); + QQuickView *canvas = createView(testFile("grid-row-column-spacing.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -660,7 +660,7 @@ void tst_qquickpositioners::test_grid_row_column_spacing() void tst_qquickpositioners::test_grid_animated() { - QQuickView *canvas = createView(TESTDATA("grid-animated.qml"), false); + QQuickView *canvas = createView(testFile("grid-animated.qml"), false); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -745,7 +745,7 @@ void tst_qquickpositioners::test_grid_animated() void tst_qquickpositioners::test_grid_animated_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("grid-animated.qml"), false); + QQuickView *canvas = createView(testFile("grid-animated.qml"), false); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -830,7 +830,7 @@ void tst_qquickpositioners::test_grid_animated_rightToLeft() void tst_qquickpositioners::test_grid_zero_columns() { - QQuickView *canvas = createView(TESTDATA("gridzerocolumns.qml")); + QQuickView *canvas = createView(testFile("gridzerocolumns.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -863,7 +863,7 @@ void tst_qquickpositioners::test_grid_zero_columns() void tst_qquickpositioners::test_propertychanges() { - QQuickView *canvas = createView(TESTDATA("propertychangestest.qml")); + QQuickView *canvas = createView(testFile("propertychangestest.qml")); QQuickGrid *grid = qobject_cast<QQuickGrid*>(canvas->rootObject()); QVERIFY(grid != 0); @@ -922,7 +922,7 @@ void tst_qquickpositioners::test_propertychanges() void tst_qquickpositioners::test_repeater() { - QQuickView *canvas = createView(TESTDATA("repeatertest.qml")); + QQuickView *canvas = createView(testFile("repeatertest.qml")); QQuickRectangle *one = canvas->rootObject()->findChild<QQuickRectangle*>("one"); QVERIFY(one != 0); @@ -945,7 +945,7 @@ void tst_qquickpositioners::test_repeater() void tst_qquickpositioners::test_flow() { - QQuickView *canvas = createView(TESTDATA("flowtest.qml")); + QQuickView *canvas = createView(testFile("flowtest.qml")); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -981,7 +981,7 @@ void tst_qquickpositioners::test_flow() void tst_qquickpositioners::test_flow_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("flowtest.qml")); + QQuickView *canvas = createView(testFile("flowtest.qml")); canvas->rootObject()->setProperty("testRightToLeft", true); @@ -1017,7 +1017,7 @@ void tst_qquickpositioners::test_flow_rightToLeft() void tst_qquickpositioners::test_flow_topToBottom() { - QQuickView *canvas = createView(TESTDATA("flowtest-toptobottom.qml")); + QQuickView *canvas = createView(testFile("flowtest-toptobottom.qml")); canvas->rootObject()->setProperty("testRightToLeft", false); @@ -1070,7 +1070,7 @@ void tst_qquickpositioners::test_flow_topToBottom() void tst_qquickpositioners::test_flow_resize() { - QQuickView *canvas = createView(TESTDATA("flowtest.qml")); + QQuickView *canvas = createView(testFile("flowtest.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(root); @@ -1104,7 +1104,7 @@ void tst_qquickpositioners::test_flow_resize() void tst_qquickpositioners::test_flow_resize_rightToLeft() { - QQuickView *canvas = createView(TESTDATA("flowtest.qml")); + QQuickView *canvas = createView(testFile("flowtest.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(root); @@ -1138,7 +1138,7 @@ void tst_qquickpositioners::test_flow_resize_rightToLeft() void tst_qquickpositioners::test_flow_implicit_resize() { - QQuickView *canvas = createView(TESTDATA("flow-testimplicitsize.qml")); + QQuickView *canvas = createView(testFile("flow-testimplicitsize.qml")); QVERIFY(canvas->rootObject() != 0); QQuickFlow *flow = canvas->rootObject()->findChild<QQuickFlow*>("flow"); @@ -1281,10 +1281,10 @@ void tst_qquickpositioners::test_mirroring() objectNames << "one" << "two" << "three" << "four" << "five"; foreach (const QString qmlFile, qmlFiles) { - QQuickView *canvasA = createView(TESTDATA(qmlFile)); + QQuickView *canvasA = createView(testFile(qmlFile)); QQuickItem *rootA = qobject_cast<QQuickItem*>(canvasA->rootObject()); - QQuickView *canvasB = createView(TESTDATA(qmlFile)); + QQuickView *canvasB = createView(testFile(qmlFile)); QQuickItem *rootB = qobject_cast<QQuickItem*>(canvasB->rootObject()); rootA->setProperty("testRightToLeft", true); // layoutDirection: Qt.RightToLeft @@ -1334,7 +1334,7 @@ void tst_qquickpositioners::test_mirroring() void tst_qquickpositioners::test_allInvisible() { //QTBUG-19361 - QQuickView *canvas = createView(TESTDATA("allInvisible.qml")); + QQuickView *canvas = createView(testFile("allInvisible.qml")); QQuickItem *root = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(root); @@ -1392,15 +1392,15 @@ void tst_qquickpositioners::test_attachedproperties_data() { QTest::addColumn<QString>("filename"); - QTest::newRow("column") << TESTDATA("attachedproperties-column.qml"); - QTest::newRow("row") << TESTDATA("attachedproperties-row.qml"); - QTest::newRow("grid") << TESTDATA("attachedproperties-grid.qml"); - QTest::newRow("flow") << TESTDATA("attachedproperties-flow.qml"); + QTest::newRow("column") << testFile("attachedproperties-column.qml"); + QTest::newRow("row") << testFile("attachedproperties-row.qml"); + QTest::newRow("grid") << testFile("attachedproperties-grid.qml"); + QTest::newRow("flow") << testFile("attachedproperties-flow.qml"); } void tst_qquickpositioners::test_attachedproperties_dynamic() { - QQuickView *canvas = createView(TESTDATA("attachedproperties-dynamic.qml")); + QQuickView *canvas = createView(testFile("attachedproperties-dynamic.qml")); QVERIFY(canvas->rootObject() != 0); QQuickRow *row = canvas->rootObject()->findChild<QQuickRow *>("pos"); diff --git a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro index 7e740f98aa..efd7538099 100644 --- a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickrepeater macx:CONFIG -= app_bundle -SOURCES += tst_qquickrepeater.cpp +SOURCES += tst_qquickrepeater.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testFiles.files = data testFiles.path = . diff --git a/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp index 1d6af452e4..857b4a41f2 100644 --- a/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp @@ -52,12 +52,7 @@ #include "../../shared/util.h" -inline QUrl TEST_FILE(const QString &filename) -{ - return QUrl::fromLocalFile(TESTDATA(filename)); -} - -class tst_QQuickRepeater : public QObject +class tst_QQuickRepeater : public QDeclarativeDataTest { Q_OBJECT public: @@ -183,7 +178,7 @@ void tst_QQuickRepeater::numberModel() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(TEST_FILE("intmodel.qml")); + canvas->setSource(testFileUrl("intmodel.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -224,7 +219,7 @@ void tst_QQuickRepeater::objectList() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", QVariant::fromValue(data)); - canvas->setSource(TEST_FILE("objlist.qml")); + canvas->setSource(testFileUrl("objlist.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -265,7 +260,7 @@ void tst_QQuickRepeater::stringList() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", data); - canvas->setSource(TEST_FILE("repeater1.qml")); + canvas->setSource(testFileUrl("repeater1.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -313,7 +308,7 @@ void tst_QQuickRepeater::dataModel_adding() TestModel testModel; ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -383,7 +378,7 @@ void tst_QQuickRepeater::dataModel_removing() testModel.addItem("five", "5"); ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -449,7 +444,7 @@ void tst_QQuickRepeater::dataModel_changes() testModel.addItem("three", "3"); ctxt->setContextProperty("testData", &testModel); - canvas->setSource(TEST_FILE("repeater2.qml")); + canvas->setSource(testFileUrl("repeater2.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -483,7 +478,7 @@ void tst_QQuickRepeater::itemModel() TestObject *testObject = new TestObject; ctxt->setContextProperty("testObject", testObject); - canvas->setSource(TEST_FILE("itemlist.qml")); + canvas->setSource(testFileUrl("itemlist.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); @@ -527,7 +522,7 @@ void tst_QQuickRepeater::resetModel() QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testData", dataA); - canvas->setSource(TEST_FILE("repeater1.qml")); + canvas->setSource(testFileUrl("repeater1.qml")); qApp->processEvents(); QQuickRepeater *repeater = findItem<QQuickRepeater>(canvas->rootObject(), "repeater"); QVERIFY(repeater != 0); @@ -589,7 +584,7 @@ void tst_QQuickRepeater::resetModel() void tst_QQuickRepeater::modelChanged() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("modelChanged.qml")); + QDeclarativeComponent component(&engine, testFileUrl("modelChanged.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); @@ -612,7 +607,7 @@ void tst_QQuickRepeater::modelChanged() void tst_QQuickRepeater::properties() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("properties.qml")); + QDeclarativeComponent component(&engine, testFileUrl("properties.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); @@ -646,7 +641,7 @@ void tst_QQuickRepeater::asynchronous() QDeclarativeIncubationController controller; canvas->engine()->setIncubationController(&controller); - canvas->setSource(TEST_FILE("asyncloader.qml")); + canvas->setSource(testFileUrl("asyncloader.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(rootObject); @@ -698,7 +693,7 @@ void tst_QQuickRepeater::asynchronous() void tst_QQuickRepeater::initParent() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("initparent.qml")); + QDeclarativeComponent component(&engine, testFileUrl("initparent.qml")); QQuickItem *rootObject = qobject_cast<QQuickItem*>(component.create()); QVERIFY(rootObject); diff --git a/tests/auto/qtquick2/qquickscreen/qquickscreen.pro b/tests/auto/qtquick2/qquickscreen/qquickscreen.pro index 05fa6b9936..8d6a32b7aa 100644 --- a/tests/auto/qtquick2/qquickscreen/qquickscreen.pro +++ b/tests/auto/qtquick2/qquickscreen/qquickscreen.pro @@ -1,6 +1,8 @@ CONFIG += testcase TARGET = tst_qquickscreen -SOURCES += tst_qquickscreen.cpp +SOURCES += tst_qquickscreen.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp b/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp index f74f2845e0..89462230bf 100644 --- a/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp +++ b/tests/auto/qtquick2/qquickscreen/tst_qquickscreen.cpp @@ -46,35 +46,17 @@ #include <QtGui/QScreen> #include "../../shared/util.h" -class tst_qquickscreen : public QObject +class tst_qquickscreen : public QDeclarativeDataTest { Q_OBJECT -public: - tst_qquickscreen (); - private slots: - void initTestCase(); - void cleanupTestCase(); - void basicProperties(); }; -tst_qquickscreen::tst_qquickscreen() -{ -} - -void tst_qquickscreen::initTestCase() -{ -} - -void tst_qquickscreen::cleanupTestCase() -{ -} - void tst_qquickscreen::basicProperties() { QQuickView view; - view.setSource(TESTDATA("screen.qml")); + view.setSource(testFileUrl("screen.qml")); view.show(); QTest::qWaitForWindowShown(&view); diff --git a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro index fe788f5b7b..062a1b99cc 100644 --- a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro +++ b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro @@ -1,6 +1,9 @@ CONFIG += testcase TARGET = tst_qquickspriteimage -SOURCES += tst_qquickspriteimage.cpp +SOURCES += tst_qquickspriteimage.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp index 5c09019b03..9d2c52ac54 100644 --- a/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp +++ b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp @@ -43,7 +43,7 @@ #include <QtQuick/qquickview.h> #include <private/qquickspriteimage_p.h> -class tst_qquickspriteimage : public QObject +class tst_qquickspriteimage : public QDeclarativeDataTest { Q_OBJECT public: @@ -57,7 +57,7 @@ void tst_qquickspriteimage::test_properties() { QQuickView *canvas = new QQuickView(0); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("basic.qml"))); + canvas->setSource(testFileUrl("basic.qml")); canvas->show(); QTest::qWaitForWindowShown(canvas); diff --git a/tests/auto/qtquick2/qquicktext/qquicktext.pro b/tests/auto/qtquick2/qquicktext/qquicktext.pro index e5bd50afc6..5c55714605 100644 --- a/tests/auto/qtquick2/qquicktext/qquicktext.pro +++ b/tests/auto/qtquick2/qquicktext/qquicktext.pro @@ -5,8 +5,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquicktext.cpp INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h -SOURCES += ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h +SOURCES += ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp index 88a8b6d819..877fb311c5 100644 --- a/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp @@ -57,15 +57,13 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) -class tst_qquicktext : public QObject +class tst_qquicktext : public QDeclarativeDataTest { Q_OBJECT public: tst_qquicktext(); private slots: - void initTestCase(); - void cleanupTestCase(); void text(); void width(); void wrap(); @@ -127,14 +125,7 @@ private: QQuickView *createView(const QString &filename); }; -void tst_qquicktext::initTestCase() -{ -} -void tst_qquicktext::cleanupTestCase() -{ - -} tst_qquicktext::tst_qquicktext() { standard << "the quick brown fox jumped over the lazy dog" @@ -451,7 +442,7 @@ void tst_qquicktext::elide() void tst_qquicktext::multilineElide() { - QQuickView *canvas = createView(TESTDATA("multilineelide.qml")); + QQuickView *canvas = createView(testFile("multilineelide.qml")); QQuickText *myText = qobject_cast<QQuickText*>(canvas->rootObject()); QVERIFY(myText != 0); @@ -541,17 +532,17 @@ void tst_qquicktext::alignments_data() QTest::addColumn<int>("vAlign"); QTest::addColumn<QString>("expectfile"); - QTest::newRow("LT") << int(Qt::AlignLeft) << int(Qt::AlignTop) << TESTDATA("alignments_lt.png"); - QTest::newRow("RT") << int(Qt::AlignRight) << int(Qt::AlignTop) << TESTDATA("alignments_rt.png"); - QTest::newRow("CT") << int(Qt::AlignHCenter) << int(Qt::AlignTop) << TESTDATA("alignments_ct.png"); + QTest::newRow("LT") << int(Qt::AlignLeft) << int(Qt::AlignTop) << testFile("alignments_lt.png"); + QTest::newRow("RT") << int(Qt::AlignRight) << int(Qt::AlignTop) << testFile("alignments_rt.png"); + QTest::newRow("CT") << int(Qt::AlignHCenter) << int(Qt::AlignTop) << testFile("alignments_ct.png"); - QTest::newRow("LB") << int(Qt::AlignLeft) << int(Qt::AlignBottom) << TESTDATA("alignments_lb.png"); - QTest::newRow("RB") << int(Qt::AlignRight) << int(Qt::AlignBottom) << TESTDATA("alignments_rb.png"); - QTest::newRow("CB") << int(Qt::AlignHCenter) << int(Qt::AlignBottom) << TESTDATA("alignments_cb.png"); + QTest::newRow("LB") << int(Qt::AlignLeft) << int(Qt::AlignBottom) << testFile("alignments_lb.png"); + QTest::newRow("RB") << int(Qt::AlignRight) << int(Qt::AlignBottom) << testFile("alignments_rb.png"); + QTest::newRow("CB") << int(Qt::AlignHCenter) << int(Qt::AlignBottom) << testFile("alignments_cb.png"); - QTest::newRow("LC") << int(Qt::AlignLeft) << int(Qt::AlignVCenter) << TESTDATA("alignments_lc.png"); - QTest::newRow("RC") << int(Qt::AlignRight) << int(Qt::AlignVCenter) << TESTDATA("alignments_rc.png"); - QTest::newRow("CC") << int(Qt::AlignHCenter) << int(Qt::AlignVCenter) << TESTDATA("alignments_cc.png"); + QTest::newRow("LC") << int(Qt::AlignLeft) << int(Qt::AlignVCenter) << testFile("alignments_lc.png"); + QTest::newRow("RC") << int(Qt::AlignRight) << int(Qt::AlignVCenter) << testFile("alignments_rc.png"); + QTest::newRow("CC") << int(Qt::AlignHCenter) << int(Qt::AlignVCenter) << testFile("alignments_cc.png"); } @@ -563,7 +554,7 @@ void tst_qquicktext::alignments() QFETCH(int, vAlign); QFETCH(QString, expectfile); - QQuickView *canvas = createView(TESTDATA("alignments.qml")); + QQuickView *canvas = createView(testFile("alignments.qml")); canvas->show(); canvas->requestActivateWindow(); QTest::qWait(50); @@ -626,7 +617,7 @@ void tst_qquicktext::horizontalAlignment() void tst_qquicktext::horizontalAlignment_RightToLeft() { - QQuickView *canvas = createView(TESTDATA("horizontalAlignment_RightToLeft.qml")); + QQuickView *canvas = createView(testFile("horizontalAlignment_RightToLeft.qml")); QQuickText *text = canvas->rootObject()->findChild<QQuickText*>("text"); QVERIFY(text != 0); canvas->show(); @@ -1298,12 +1289,12 @@ void tst_qquicktext::embeddedImages_data() { QTest::addColumn<QUrl>("qmlfile"); QTest::addColumn<QString>("error"); - QTest::newRow("local") << QUrl::fromLocalFile(TESTDATA("embeddedImagesLocal.qml")) << ""; - QTest::newRow("local-error") << QUrl::fromLocalFile(TESTDATA("embeddedImagesLocalError.qml")) - << QUrl::fromLocalFile(TESTDATA("embeddedImagesLocalError.qml")).toString()+":3:1: QML Text: Cannot open: " + QUrl::fromLocalFile(TESTDATA("http/notexists.png")).toString(); - QTest::newRow("remote") << QUrl::fromLocalFile(TESTDATA("embeddedImagesRemote.qml")) << ""; - QTest::newRow("remote-error") << QUrl::fromLocalFile(TESTDATA("embeddedImagesRemoteError.qml")) - << QUrl::fromLocalFile(TESTDATA("embeddedImagesRemoteError.qml")).toString()+":3:1: QML Text: Error downloading http://127.0.0.1:14453/notexists.png - server replied: Not found"; + QTest::newRow("local") << testFileUrl("embeddedImagesLocal.qml") << ""; + QTest::newRow("local-error") << testFileUrl("embeddedImagesLocalError.qml") + << testFileUrl("embeddedImagesLocalError.qml").toString()+":3:1: QML Text: Cannot open: " + testFileUrl("http/notexists.png").toString(); + QTest::newRow("remote") << testFileUrl("embeddedImagesRemote.qml") << ""; + QTest::newRow("remote-error") << testFileUrl("embeddedImagesRemoteError.qml") + << testFileUrl("embeddedImagesRemoteError.qml").toString()+":3:1: QML Text: Error downloading http://127.0.0.1:14453/notexists.png - server replied: Not found"; } void tst_qquicktext::embeddedImages() @@ -1314,7 +1305,7 @@ void tst_qquicktext::embeddedImages() QFETCH(QString, error); TestHTTPServer server(14453); - server.serveDirectory(TESTDATA("http")); + server.serveDirectory(testFile("http")); if (!error.isEmpty()) QTest::ignoreMessage(QtWarningMsg, error.toLatin1()); @@ -1326,7 +1317,7 @@ void tst_qquicktext::embeddedImages() QTRY_COMPARE(textObject->resourcesLoading(), 0); - QPixmap pm(TESTDATA("http/exists.png")); + QPixmap pm(testFile("http/exists.png")); if (error.isEmpty()) { QCOMPARE(textObject->width(), double(pm.width())); QCOMPARE(textObject->height(), double(pm.height())); @@ -1341,7 +1332,7 @@ void tst_qquicktext::embeddedImages() void tst_qquicktext::lineCount() { - QQuickView *canvas = createView(TESTDATA("lineCount.qml")); + QQuickView *canvas = createView(testFile("lineCount.qml")); QQuickText *myText = canvas->rootObject()->findChild<QQuickText*>("myText"); QVERIFY(myText != 0); @@ -1370,7 +1361,7 @@ void tst_qquicktext::lineCount() void tst_qquicktext::lineHeight() { - QQuickView *canvas = createView(TESTDATA("lineHeight.qml")); + QQuickView *canvas = createView(testFile("lineHeight.qml")); QQuickText *myText = canvas->rootObject()->findChild<QQuickText*>("myText"); QVERIFY(myText != 0); @@ -1432,7 +1423,7 @@ void tst_qquicktext::implicitSize() void tst_qquicktext::lineLaidOut() { - QQuickView *canvas = createView(TESTDATA("lineLayout.qml")); + QQuickView *canvas = createView(testFile("lineLayout.qml")); QQuickText *myText = canvas->rootObject()->findChild<QQuickText*>("myText"); QVERIFY(myText != 0); diff --git a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro index 02a834beab..b647377482 100644 --- a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro @@ -2,8 +2,12 @@ CONFIG += testcase TARGET = tst_qquicktextedit macx:CONFIG -= app_bundle -SOURCES += tst_qquicktextedit.cpp ../../shared/testhttpserver.cpp -HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquicktextedit.cpp \ + ../../shared/testhttpserver.cpp \ + ../../shared/util.cpp + +HEADERS += ../../shared/testhttpserver.h \ + ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp index fc7b0329cb..075eacb211 100644 --- a/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp @@ -74,7 +74,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual) { // XXX This will be replaced by some clever persistent platform image store. - QString persistent_dir = TESTDATA(""); + QString persistent_dir = QDeclarativeDataTest::instance()->dataDirectory(); QString arch = "unknown-architecture"; // QTest needs to help with this. QString expectfile = persistent_dir + QDir::separator() + filebasename + "-" + arch + ".png"; @@ -89,7 +89,7 @@ QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& typedef QPair<int, QChar> Key; -class tst_qquicktextedit : public QObject +class tst_qquicktextedit : public QDeclarativeDataTest { Q_OBJECT @@ -97,8 +97,6 @@ public: tst_qquicktextedit(); private slots: - void initTestCase(); - void cleanupTestCase(); void text(); void width(); void wrap(); @@ -253,15 +251,6 @@ QList<Key> &operator <<(QList<Key> &keys, Qt::Key key) return keys; } - -void tst_qquicktextedit::initTestCase() -{ -} - -void tst_qquicktextedit::cleanupTestCase() -{ - -} tst_qquicktextedit::tst_qquicktextedit() { standard << "the quick brown fox jumped over the lazy dog" @@ -568,7 +557,7 @@ void tst_qquicktextedit::alignments() QFETCH(int, vAlign); QFETCH(QString, expectfile); - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("alignments.qml"))); + QQuickView canvas(testFileUrl("alignments.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -627,7 +616,7 @@ void tst_qquicktextedit::hAlign() void tst_qquicktextedit::hAlign_RightToLeft() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("horizontalAlignment_RightToLeft.qml"))); + QQuickView canvas(testFileUrl("horizontalAlignment_RightToLeft.qml")); QQuickTextEdit *textEdit = canvas.rootObject()->findChild<QQuickTextEdit*>("text"); QVERIFY(textEdit != 0); canvas.show(); @@ -1110,7 +1099,7 @@ void tst_qquicktextedit::isRightToLeft() void tst_qquicktextedit::keySelection() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("navigation.qml"))); + QQuickView canvas(testFileUrl("navigation.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -1500,19 +1489,19 @@ void tst_qquicktextedit::mouseSelection_data() QTest::addColumn<QString>("selectedText"); // import installed - QTest::newRow("on") << TESTDATA("mouseselection_true.qml") << 4 << 9 << "45678"; - QTest::newRow("off") << TESTDATA("mouseselection_false.qml") << 4 << 9 << QString(); - QTest::newRow("default") << TESTDATA("mouseselection_default.qml") << 4 << 9 << QString(); - QTest::newRow("off word selection") << TESTDATA("mouseselection_false_words.qml") << 4 << 9 << QString(); - QTest::newRow("on word selection (4,9)") << TESTDATA("mouseselection_true_words.qml") << 4 << 9 << "0123456789"; - QTest::newRow("on word selection (2,13)") << TESTDATA("mouseselection_true_words.qml") << 2 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (2,30)") << TESTDATA("mouseselection_true_words.qml") << 2 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (9,13)") << TESTDATA("mouseselection_true_words.qml") << 9 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (9,30)") << TESTDATA("mouseselection_true_words.qml") << 9 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (13,2)") << TESTDATA("mouseselection_true_words.qml") << 13 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (20,2)") << TESTDATA("mouseselection_true_words.qml") << 20 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (12,9)") << TESTDATA("mouseselection_true_words.qml") << 12 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (30,9)") << TESTDATA("mouseselection_true_words.qml") << 30 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on") << testFile("mouseselection_true.qml") << 4 << 9 << "45678"; + QTest::newRow("off") << testFile("mouseselection_false.qml") << 4 << 9 << QString(); + QTest::newRow("default") << testFile("mouseselection_default.qml") << 4 << 9 << QString(); + QTest::newRow("off word selection") << testFile("mouseselection_false_words.qml") << 4 << 9 << QString(); + QTest::newRow("on word selection (4,9)") << testFile("mouseselection_true_words.qml") << 4 << 9 << "0123456789"; + QTest::newRow("on word selection (2,13)") << testFile("mouseselection_true_words.qml") << 2 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (2,30)") << testFile("mouseselection_true_words.qml") << 2 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (9,13)") << testFile("mouseselection_true_words.qml") << 9 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (9,30)") << testFile("mouseselection_true_words.qml") << 9 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (13,2)") << testFile("mouseselection_true_words.qml") << 13 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (20,2)") << testFile("mouseselection_true_words.qml") << 20 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (12,9)") << testFile("mouseselection_true_words.qml") << 12 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (30,9)") << testFile("mouseselection_true_words.qml") << 30 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; } void tst_qquicktextedit::mouseSelection() @@ -1552,7 +1541,7 @@ void tst_qquicktextedit::mouseSelection() void tst_qquicktextedit::dragMouseSelection() { - QString qmlfile = TESTDATA("mouseselection_true.qml"); + QString qmlfile = testFile("mouseselection_true.qml"); QQuickView canvas(QUrl::fromLocalFile(qmlfile)); @@ -1595,9 +1584,9 @@ void tst_qquicktextedit::mouseSelectionMode_data() QTest::addColumn<bool>("selectWords"); // import installed - QTest::newRow("SelectWords") << TESTDATA("mouseselectionmode_words.qml") << true; - QTest::newRow("SelectCharacters") << TESTDATA("mouseselectionmode_characters.qml") << false; - QTest::newRow("default") << TESTDATA("mouseselectionmode_default.qml") << false; + QTest::newRow("SelectWords") << testFile("mouseselectionmode_words.qml") << true; + QTest::newRow("SelectCharacters") << testFile("mouseselectionmode_characters.qml") << false; + QTest::newRow("default") << testFile("mouseselectionmode_default.qml") << false; } void tst_qquicktextedit::mouseSelectionMode() @@ -1639,7 +1628,7 @@ void tst_qquicktextedit::mouseSelectionMode() void tst_qquicktextedit::inputMethodHints() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("inputmethodhints.qml"))); + QQuickView canvas(testFileUrl("inputmethodhints.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -1653,7 +1642,7 @@ void tst_qquicktextedit::inputMethodHints() void tst_qquicktextedit::positionAt() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("positionAt.qml"))); + QQuickView canvas(testFileUrl("positionAt.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); canvas.requestActivateWindow(); @@ -1711,7 +1700,7 @@ void tst_qquicktextedit::positionAt() void tst_qquicktextedit::linkActivated() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("linkActivated.qml"))); + QQuickView canvas(testFileUrl("linkActivated.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); canvas.requestActivateWindow(); @@ -1748,7 +1737,7 @@ void tst_qquicktextedit::linkActivated() void tst_qquicktextedit::cursorDelegate() { - QQuickView view(QUrl::fromLocalFile(TESTDATA("cursorTest.qml"))); + QQuickView view(testFileUrl("cursorTest.qml")); view.show(); view.requestActivateWindow(); QQuickTextEdit *textEditObject = view.rootObject()->findChild<QQuickTextEdit*>("textEditObject"); @@ -1816,7 +1805,7 @@ void tst_qquicktextedit::cursorDelegate() void tst_qquicktextedit::cursorVisible() { - QQuickView view(QUrl::fromLocalFile(TESTDATA("cursorVisible.qml"))); + QQuickView view(testFileUrl("cursorVisible.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -1882,9 +1871,9 @@ void tst_qquicktextedit::delegateLoading() QFETCH(QString, error); TestHTTPServer server(42332); - server.serveDirectory(TESTDATA("httpfail"), TestHTTPServer::Disconnect); - server.serveDirectory(TESTDATA("httpslow"), TestHTTPServer::Delay); - server.serveDirectory(TESTDATA("http")); + server.serveDirectory(testFile("httpfail"), TestHTTPServer::Disconnect); + server.serveDirectory(testFile("httpslow"), TestHTTPServer::Delay); + server.serveDirectory(testFile("http")); QQuickView view(QUrl(QLatin1String("http://localhost:42332/") + qmlfile)); view.show(); @@ -1923,7 +1912,7 @@ the extent of the text, then they should ignore the keys. */ void tst_qquicktextedit::navigation() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("navigation.qml"))); + QQuickView canvas(testFileUrl("navigation.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -2043,7 +2032,7 @@ void tst_qquicktextedit::canPasteEmpty() { void tst_qquicktextedit::readOnly() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("readOnly.qml"))); + QQuickView canvas(testFileUrl("readOnly.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -2079,7 +2068,7 @@ void tst_qquicktextedit::simulateKey(QQuickView *view, int key, Qt::KeyboardModi void tst_qquicktextedit::textInput() { - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputMethodEvent.qml"))); + QQuickView view(testFileUrl("inputMethodEvent.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2139,7 +2128,7 @@ void tst_qquicktextedit::openInputPanel() QInputPanelPrivate *inputPanelPrivate = QInputPanelPrivate::get(qApp->inputPanel()); inputPanelPrivate->testContext = &platformInputContext; - QQuickView view(QUrl::fromLocalFile(TESTDATA("openInputPanel.qml"))); + QQuickView view(testFileUrl("openInputPanel.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2229,7 +2218,7 @@ void tst_qquicktextedit::openInputPanel() void tst_qquicktextedit::geometrySignals() { - QDeclarativeComponent component(&engine, TESTDATA("geometrySignals.qml")); + QDeclarativeComponent component(&engine, testFileUrl("geometrySignals.qml")); QObject *o = component.create(); QVERIFY(o); QCOMPARE(o->property("bindingWidth").toInt(), 400); @@ -2340,7 +2329,7 @@ void tst_qquicktextedit::preeditCursorRectangle() { QString preeditText = "super"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputMethodEvent.qml"))); + QQuickView view(testFileUrl("inputMethodEvent.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2401,7 +2390,7 @@ void tst_qquicktextedit::inputMethodComposing() { QString text = "supercalifragisiticexpialidocious!"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputContext.qml"))); + QQuickView view(testFileUrl("inputContext.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2437,7 +2426,7 @@ void tst_qquicktextedit::inputMethodComposing() void tst_qquicktextedit::cursorRectangleSize() { - QQuickView *canvas = new QQuickView(QUrl::fromLocalFile(TESTDATA("positionAt.qml"))); + QQuickView *canvas = new QQuickView(testFileUrl("positionAt.qml")); QVERIFY(canvas->rootObject() != 0); QQuickTextEdit *textEdit = qobject_cast<QQuickTextEdit *>(canvas->rootObject()); @@ -3634,7 +3623,7 @@ void tst_qquicktextedit::undo_keypressevents() void tst_qquicktextedit::emptytags_QTBUG_22058() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("qtbug-22058.qml"))); + QQuickView canvas(testFileUrl("qtbug-22058.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); diff --git a/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro index f81da61634..3c21307f02 100644 --- a/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquicktextinput macx:CONFIG -= app_bundle -SOURCES += tst_qquicktextinput.cpp +SOURCES += tst_qquicktextinput.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp index 266b0d4a33..f07e8fd8ee 100644 --- a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp @@ -71,7 +71,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual) { // XXX This will be replaced by some clever persistent platform image store. - QString persistent_dir = TESTDATA(""); + QString persistent_dir = QDeclarativeDataTest::instance()->dataDirectory(); QString arch = "unknown-architecture"; // QTest needs to help with this. QString expectfile = persistent_dir + QDir::separator() + filebasename + "-" + arch + ".png"; @@ -95,7 +95,7 @@ template <typename T> static T evaluate(QObject *scope, const QString &expressio typedef QPair<int, QChar> Key; -class tst_qquicktextinput : public QObject +class tst_qquicktextinput : public QDeclarativeDataTest { Q_OBJECT @@ -103,8 +103,6 @@ public: tst_qquicktextinput(); private slots: - void initTestCase(); - void cleanupTestCase(); void cleanup(); void text(); void width(); @@ -244,14 +242,6 @@ QList<Key> &operator <<(QList<Key> &keys, Qt::Key key) return keys; } -void tst_qquicktextinput::initTestCase() -{ -} - -void tst_qquicktextinput::cleanupTestCase() -{ -} - void tst_qquicktextinput::cleanup() { // ensure not even skipped tests with custom input context leave it dangling @@ -1095,7 +1085,7 @@ void tst_qquicktextinput::moveCursorSelectionSequence() void tst_qquicktextinput::dragMouseSelection() { - QString qmlfile = TESTDATA("mouseselection_true.qml"); + QString qmlfile = testFile("mouseselection_true.qml"); QQuickView canvas(QUrl::fromLocalFile(qmlfile)); @@ -1140,9 +1130,9 @@ void tst_qquicktextinput::mouseSelectionMode_data() QTest::addColumn<bool>("selectWords"); // import installed - QTest::newRow("SelectWords") << TESTDATA("mouseselectionmode_words.qml") << true; - QTest::newRow("SelectCharacters") << TESTDATA("mouseselectionmode_characters.qml") << false; - QTest::newRow("default") << TESTDATA("mouseselectionmode_default.qml") << false; + QTest::newRow("SelectWords") << testFile("mouseselectionmode_words.qml") << true; + QTest::newRow("SelectCharacters") << testFile("mouseselectionmode_characters.qml") << false; + QTest::newRow("default") << testFile("mouseselectionmode_default.qml") << false; } void tst_qquicktextinput::mouseSelectionMode() @@ -1196,7 +1186,7 @@ void tst_qquicktextinput::horizontalAlignment() QFETCH(int, hAlign); QFETCH(QString, expectfile); - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("horizontalAlignment.qml"))); + QQuickView canvas(testFileUrl("horizontalAlignment.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -1216,7 +1206,7 @@ void tst_qquicktextinput::horizontalAlignment() void tst_qquicktextinput::horizontalAlignment_RightToLeft() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("horizontalAlignment_RightToLeft.qml"))); + QQuickView canvas(testFileUrl("horizontalAlignment_RightToLeft.qml")); QQuickTextInput *textInput = canvas.rootObject()->findChild<QQuickTextInput*>("text"); QVERIFY(textInput != 0); canvas.show(); @@ -1326,7 +1316,7 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft() void tst_qquicktextinput::verticalAlignment() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("horizontalAlignment.qml"))); + QQuickView canvas(testFileUrl("horizontalAlignment.qml")); QQuickTextInput *textInput = canvas.rootObject()->findChild<QQuickTextInput*>("text"); QVERIFY(textInput != 0); canvas.show(); @@ -1351,7 +1341,7 @@ void tst_qquicktextinput::verticalAlignment() void tst_qquicktextinput::positionAt() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("positionAt.qml"))); + QQuickView canvas(testFileUrl("positionAt.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); canvas.requestActivateWindow(); @@ -1439,7 +1429,7 @@ void tst_qquicktextinput::positionAt() void tst_qquicktextinput::maxLength() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("maxLength.qml"))); + QQuickView canvas(testFileUrl("maxLength.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); canvas.requestActivateWindow(); @@ -1470,7 +1460,7 @@ void tst_qquicktextinput::masks() { //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit) //QString componentStr = "import QtQuick 2.0\nTextInput { inputMask: 'HHHHhhhh'; }"; - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("masks.qml"))); + QQuickView canvas(testFileUrl("masks.qml")); canvas.show(); canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); @@ -1495,7 +1485,7 @@ void tst_qquicktextinput::validators() // so you may need to run their tests first. All validators are checked // here to ensure that their exposure to QML is working. - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("validators.qml"))); + QQuickView canvas(testFileUrl("validators.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -1599,7 +1589,7 @@ void tst_qquicktextinput::validators() void tst_qquicktextinput::inputMethods() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("inputmethods.qml"))); + QQuickView canvas(testFileUrl("inputmethods.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -1676,7 +1666,7 @@ the extent of the text, then they should ignore the keys. */ void tst_qquicktextinput::navigation() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("navigation.qml"))); + QQuickView canvas(testFileUrl("navigation.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -1715,7 +1705,7 @@ void tst_qquicktextinput::navigation() void tst_qquicktextinput::navigation_RTL() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("navigation.qml"))); + QQuickView canvas(testFileUrl("navigation.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -1962,7 +1952,7 @@ void tst_qquicktextinput::passwordCharacter() void tst_qquicktextinput::cursorDelegate() { - QQuickView view(QUrl::fromLocalFile(TESTDATA("cursorTest.qml"))); + QQuickView view(testFileUrl("cursorTest.qml")); view.show(); view.requestActivateWindow(); QQuickTextInput *textInputObject = view.rootObject()->findChild<QQuickTextInput*>("textInputObject"); @@ -1989,7 +1979,7 @@ void tst_qquicktextinput::cursorDelegate() void tst_qquicktextinput::cursorVisible() { - QQuickView view(QUrl::fromLocalFile(TESTDATA("cursorVisible.qml"))); + QQuickView view(testFileUrl("cursorVisible.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2142,7 +2132,7 @@ void tst_qquicktextinput::cursorRectangle() void tst_qquicktextinput::readOnly() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("readOnly.qml"))); + QQuickView canvas(testFileUrl("readOnly.qml")); canvas.show(); canvas.requestActivateWindow(); @@ -2169,7 +2159,7 @@ void tst_qquicktextinput::readOnly() void tst_qquicktextinput::echoMode() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("echoMode.qml"))); + QQuickView canvas(testFileUrl("echoMode.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -2239,7 +2229,7 @@ void tst_qquicktextinput::echoMode() #ifdef QT_GUI_PASSWORD_ECHO_DELAY void tst_qquicktextinput::passwordEchoDelay() { - QQuickView canvas(QUrl::fromLocalFile(TESTDATA("echoMode.qml"))); + QQuickView canvas(testFileUrl("echoMode.qml")); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -2344,7 +2334,7 @@ void tst_qquicktextinput::openInputPanel() QInputPanelPrivate *inputPanelPrivate = QInputPanelPrivate::get(qApp->inputPanel()); inputPanelPrivate->testContext = &platformInputContext; - QQuickView view(QUrl::fromLocalFile(TESTDATA("openInputPanel.qml"))); + QQuickView view(testFileUrl("openInputPanel.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2484,7 +2474,7 @@ void tst_qquicktextinput::focusOutClearSelection() void tst_qquicktextinput::geometrySignals() { - QDeclarativeComponent component(&engine, TESTDATA("geometrySignals.qml")); + QDeclarativeComponent component(&engine, testFileUrl("geometrySignals.qml")); QObject *o = component.create(); QVERIFY(o); QCOMPARE(o->property("bindingWidth").toInt(), 400); @@ -2546,7 +2536,7 @@ void tst_qquicktextinput::preeditAutoScroll() { QString preeditText = "califragisiticexpialidocious!"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("preeditAutoScroll.qml"))); + QQuickView view(testFileUrl("preeditAutoScroll.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2633,7 +2623,7 @@ void tst_qquicktextinput::preeditCursorRectangle() { QString preeditText = "super"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputMethodEvent.qml"))); + QQuickView view(testFileUrl("inputMethodEvent.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2688,7 +2678,7 @@ void tst_qquicktextinput::inputContextMouseHandler() inputPanelPrivate->testContext = &platformInputContext; QString text = "supercalifragisiticexpialidocious!"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputContext.qml"))); + QQuickView view(testFileUrl("inputContext.qml")); QQuickTextInput *input = qobject_cast<QQuickTextInput *>(view.rootObject()); QVERIFY(input); @@ -2731,7 +2721,7 @@ void tst_qquicktextinput::inputMethodComposing() { QString text = "supercalifragisiticexpialidocious!"; - QQuickView view(QUrl::fromLocalFile(TESTDATA("inputContext.qml"))); + QQuickView view(testFileUrl("inputContext.qml")); view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); @@ -2764,7 +2754,7 @@ void tst_qquicktextinput::inputMethodComposing() void tst_qquicktextinput::cursorRectangleSize() { - QQuickView *canvas = new QQuickView(QUrl::fromLocalFile(TESTDATA("positionAt.qml"))); + QQuickView *canvas = new QQuickView(testFileUrl("positionAt.qml")); QVERIFY(canvas->rootObject() != 0); QQuickTextInput *textInput = qobject_cast<QQuickTextInput *>(canvas->rootObject()); @@ -2806,7 +2796,7 @@ void tst_qquicktextinput::cursorRectangleSize() void tst_qquicktextinput::tripleClickSelectsAll() { - QString qmlfile = TESTDATA("positionAt.qml"); + QString qmlfile = testFile("positionAt.qml"); QQuickView view(QUrl::fromLocalFile(qmlfile)); view.show(); view.requestActivateWindow(); @@ -3371,7 +3361,7 @@ void tst_qquicktextinput::QTBUG_19956() { QFETCH(QString, url); - QQuickView canvas(QUrl::fromLocalFile(TESTDATA(url))); + QQuickView canvas(testFileUrl(url)); canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); @@ -3405,7 +3395,7 @@ void tst_qquicktextinput::QTBUG_19956() void tst_qquicktextinput::QTBUG_19956_regexp() { - QUrl url = QUrl::fromLocalFile(TESTDATA("qtbug-19956regexp.qml")); + QUrl url = testFileUrl("qtbug-19956regexp.qml"); QString warning = url.toString() + ":11: Unable to assign [undefined] to QRegExp"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); diff --git a/tests/auto/qtquick2/qquickview/qquickview.pro b/tests/auto/qtquick2/qquickview/qquickview.pro index d4e7c064fa..90ad693eb0 100644 --- a/tests/auto/qtquick2/qquickview/qquickview.pro +++ b/tests/auto/qtquick2/qquickview/qquickview.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickview macx:CONFIG -= app_bundle -SOURCES += tst_qquickview.cpp +SOURCES += tst_qquickview.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickview/tst_qquickview.cpp b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp index 953374dcab..fff1cc9bed 100644 --- a/tests/auto/qtquick2/qquickview/tst_qquickview.cpp +++ b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp @@ -48,7 +48,7 @@ #include <QtGui/QWindow> #include <QtCore/QDebug> -class tst_QQuickView : public QObject +class tst_QQuickView : public QDeclarativeDataTest { Q_OBJECT public: @@ -73,7 +73,7 @@ void tst_QQuickView::resizemodeitem() QVERIFY(canvas); canvas->setResizeMode(QQuickView::SizeRootObjectToView); QCOMPARE(QSize(0,0), canvas->initialSize()); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); QQuickItem* item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); window.show(); @@ -119,7 +119,7 @@ void tst_QQuickView::resizemodeitem() canvas = new QQuickView(&window); QVERIFY(canvas); canvas->setResizeMode(QQuickView::SizeViewToRootObject); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); window.show(); @@ -166,7 +166,7 @@ void tst_QQuickView::resizemodeitem() canvas->resize(300, 300); canvas->setResizeMode(QQuickView::SizeRootObjectToView); QCOMPARE(QSize(0,0), canvas->initialSize()); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizemodeitem.qml"))); + canvas->setSource(testFileUrl("resizemodeitem.qml")); canvas->resize(300, 300); item = qobject_cast<QQuickItem*>(canvas->rootObject()); QVERIFY(item); @@ -194,7 +194,7 @@ void tst_QQuickView::errors() QQuickView *canvas = new QQuickView; QVERIFY(canvas); QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler); - canvas->setSource(QUrl::fromLocalFile(TESTDATA("error1.qml"))); + canvas->setSource(testFileUrl("error1.qml")); qInstallMsgHandler(old); QVERIFY(canvas->status() == QQuickView::Error); QVERIFY(canvas->errors().count() == 1); diff --git a/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro index 8e87e10a97..3a194c54d6 100644 --- a/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -2,7 +2,9 @@ CONFIG += testcase TARGET = tst_qquickvisualdatamodel macx:CONFIG -= app_bundle -SOURCES += tst_qquickvisualdatamodel.cpp +SOURCES += tst_qquickvisualdatamodel.cpp \ + ../../shared/util.cpp +HEADERS += ../../shared/util.h testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index dfd8c753eb..a4db71a527 100644 --- a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -112,7 +112,7 @@ protected: }; -class tst_qquickvisualdatamodel : public QObject +class tst_qquickvisualdatamodel : public QDeclarativeDataTest { Q_OBJECT public: @@ -182,6 +182,7 @@ Q_DECLARE_METATYPE(QDeclarativeChangeSet) void tst_qquickvisualdatamodel::initTestCase() { + QDeclarativeDataTest::initTestCase(); qRegisterMetaType<QDeclarativeChangeSet>(); } @@ -251,7 +252,7 @@ tst_qquickvisualdatamodel::tst_qquickvisualdatamodel() void tst_qquickvisualdatamodel::rootIndex() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("visualdatamodel.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("visualdatamodel.qml")); QStandardItemModel model; initStandardTreeModel(&model); @@ -279,8 +280,8 @@ void tst_qquickvisualdatamodel::updateLayout_data() { QTest::addColumn<QUrl>("source"); - QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml")); - QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml")); + QTest::newRow("item delegate") << testFileUrl("datalist.qml"); + QTest::newRow("package delegate") << testFileUrl("datalist-package.qml"); } void tst_qquickvisualdatamodel::updateLayout() @@ -329,8 +330,8 @@ void tst_qquickvisualdatamodel::childChanged_data() { QTest::addColumn<QUrl>("source"); - QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml")); - QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml")); + QTest::newRow("item delegate") << testFileUrl("datalist.qml"); + QTest::newRow("package delegate") << testFileUrl("datalist-package.qml"); } void tst_qquickvisualdatamodel::childChanged() @@ -403,7 +404,7 @@ void tst_qquickvisualdatamodel::objectListModel() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); - view.setSource(QUrl::fromLocalFile(TESTDATA("objectlist.qml"))); + view.setSource(testFileUrl("objectlist.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -431,7 +432,7 @@ void tst_qquickvisualdatamodel::singleRole() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole1.qml"))); + view.setSource(testFileUrl("singlerole1.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -453,7 +454,7 @@ void tst_qquickvisualdatamodel::singleRole() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml"))); + view.setSource(testFileUrl("singlerole2.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -475,7 +476,7 @@ void tst_qquickvisualdatamodel::singleRole() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml"))); + view.setSource(testFileUrl("singlerole2.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -501,7 +502,7 @@ void tst_qquickvisualdatamodel::modelProperties() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml"))); + view.setSource(testFileUrl("modelproperties.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -534,7 +535,7 @@ void tst_qquickvisualdatamodel::modelProperties() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); - view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml"))); + view.setSource(testFileUrl("modelproperties.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -563,7 +564,7 @@ void tst_qquickvisualdatamodel::modelProperties() view.rootContext()->setContextProperty("myModel", &model); - QUrl source(QUrl::fromLocalFile(TESTDATA("modelproperties2.qml"))); + QUrl source(testFileUrl("modelproperties2.qml")); //3 items, 3 i each QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: Can't find variable: modelData"); @@ -604,8 +605,8 @@ void tst_qquickvisualdatamodel::noDelegate_data() { QTest::addColumn<QUrl>("source"); - QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml")); - QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml")); + QTest::newRow("item delegate") << testFileUrl("datalist.qml"); + QTest::newRow("package delegate") << testFileUrl("datalist-package.qml"); } void tst_qquickvisualdatamodel::noDelegate() @@ -636,10 +637,10 @@ void tst_qquickvisualdatamodel::itemsDestroyed_data() { QTest::addColumn<QUrl>("source"); - QTest::newRow("listView") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_listView.qml")); - QTest::newRow("package") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_package.qml")); - QTest::newRow("pathView") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_pathView.qml")); - QTest::newRow("repeater") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_repeater.qml")); + QTest::newRow("listView") << testFileUrl("itemsDestroyed_listView.qml"); + QTest::newRow("package") << testFileUrl("itemsDestroyed_package.qml"); + QTest::newRow("pathView") << testFileUrl("itemsDestroyed_pathView.qml"); + QTest::newRow("repeater") << testFileUrl("itemsDestroyed_repeater.qml"); } void tst_qquickvisualdatamodel::itemsDestroyed() @@ -674,7 +675,7 @@ void tst_qquickvisualdatamodel::packagesDestroyed() QQuickView view; view.rootContext()->setContextProperty("testModel", &model); - QString filename(TESTDATA("packageView.qml")); + QString filename(testFile("packageView.qml")); view.setSource(QUrl::fromLocalFile(filename)); qApp->processEvents(); @@ -746,7 +747,7 @@ void tst_qquickvisualdatamodel::qaimRowsMoved() QFETCH(int, expectCount); QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("visualdatamodel.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("visualdatamodel.qml")); SingleRoleModel model; model.list.clear(); @@ -811,10 +812,10 @@ void tst_qquickvisualdatamodel::remove_data() QTest::addColumn<QString>("package delegate"); QTest::newRow("item delegate") - << QUrl::fromLocalFile(TESTDATA("groups.qml")) + << testFileUrl("groups.qml") << QString(); QTest::newRow("package") - << QUrl::fromLocalFile(TESTDATA("groups-package.qml")) + << testFileUrl("groups-package.qml") << QString("package."); } @@ -840,7 +841,7 @@ void tst_qquickvisualdatamodel::remove() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml"))); + view.setSource(testFileUrl("groups.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -921,10 +922,10 @@ void tst_qquickvisualdatamodel::move_data() QTest::addColumn<QString>("package delegate"); QTest::newRow("item delegate") - << QUrl::fromLocalFile(TESTDATA("groups.qml")) + << testFileUrl("groups.qml") << QString(); QTest::newRow("package") - << QUrl::fromLocalFile(TESTDATA("groups-package.qml")) + << testFileUrl("groups-package.qml") << QString("package."); } @@ -950,7 +951,7 @@ void tst_qquickvisualdatamodel::move() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml"))); + view.setSource(testFileUrl("groups.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -1074,10 +1075,10 @@ void tst_qquickvisualdatamodel::groups_data() QTest::addColumn<QString>("part"); QTest::newRow("item delegate") - << QUrl::fromLocalFile(TESTDATA("groups.qml")) + << testFileUrl("groups.qml") << QString(); QTest::newRow("package") - << QUrl::fromLocalFile(TESTDATA("groups-package.qml")) + << testFileUrl("groups-package.qml") << QString("visualModel.parts.package."); } @@ -1461,7 +1462,7 @@ void tst_qquickvisualdatamodel::get() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml"))); + view.setSource(testFileUrl("groups.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -1592,7 +1593,7 @@ void tst_qquickvisualdatamodel::get() void tst_qquickvisualdatamodel::invalidGroups() { - QUrl source = QUrl::fromLocalFile(TESTDATA("groups-invalid.qml")); + QUrl source = testFileUrl("groups-invalid.qml"); QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("Group names must start with a lower case letter")).toUtf8()); QDeclarativeComponent component(&engine, source); @@ -1714,7 +1715,7 @@ void tst_qquickvisualdatamodel::onChanged() QFETCH(QString, expression); QFETCH(QStringList, tests); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("onChanged.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("onChanged.qml")); QScopedPointer<QObject> object(component.create()); QVERIFY(object); @@ -1758,7 +1759,7 @@ void tst_qquickvisualdatamodel::create() QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); - view.setSource(QUrl::fromLocalFile(TESTDATA("create.qml"))); + view.setSource(testFileUrl("create.qml")); QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject()); QVERIFY(listview != 0); @@ -1876,7 +1877,7 @@ void tst_qquickvisualdatamodel::incompleteModel() // harmlessly ignored until then. QDeclarativeComponent component(&engine); - component.setData("import QtQuick 2.0\n VisualDataModel {}", QUrl::fromLocalFile(TESTDATA(""))); + component.setData("import QtQuick 2.0\n VisualDataModel {}", testFileUrl("")); QScopedPointer<QObject> object(component.beginCreate(engine.rootContext())); diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp new file mode 100644 index 0000000000..a9d4bbce30 --- /dev/null +++ b/tests/auto/shared/util.cpp @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** 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 "util.h" + +#include <QtDeclarative/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeError> +#include <QtDeclarative/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtCore/QTextStream> + +QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; + +QDeclarativeDataTest::QDeclarativeDataTest() : + m_dataDirectory(QFINDTESTDATA("data")), + m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) +{ + m_instance = this; +} + +QDeclarativeDataTest::~QDeclarativeDataTest() +{ + m_instance = 0; +} + +void QDeclarativeDataTest::initTestCase() +{ + QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found"); + m_directory = QFileInfo(m_dataDirectory).absolutePath(); + QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); +} + +QString QDeclarativeDataTest::testFile(const QString &fileName) const +{ + if (m_directory.isEmpty()) + qFatal("QDeclarativeDataTest::initTestCase() not called."); + QString result = m_dataDirectory; + result += QLatin1Char('/'); + result += fileName; + return result; +} + +QByteArray QDeclarativeDataTest::msgComponentError(const QDeclarativeComponent &c, + const QDeclarativeEngine *engine /* = 0 */) +{ + QString result; + const QList<QDeclarativeError> errors = c.errors(); + QTextStream str(&result); + str << "Component '" << c.url().toString() << "' has " << errors.size() + << " errors: '"; + for (int i = 0; i < errors.size(); ++i) { + if (i) + str << ", '"; + str << errors.at(i).toString() << '\''; + + } + if (!engine) + if (QDeclarativeContext *context = c.creationContext()) + engine = context->engine(); + if (engine) { + str << " Import paths: (" << engine->importPathList().join(QStringLiteral(", ")) + << ") Plugin paths: (" << engine->pluginPathList().join(QStringLiteral(", ")) + << ')'; + } + return result.toLocal8Bit(); +} diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h index eac2c4ec12..3d710cd6c3 100644 --- a/tests/auto/shared/util.h +++ b/tests/auto/shared/util.h @@ -42,44 +42,49 @@ #ifndef QDECLARATIVETESTUTILS_H #define QDECLARATIVETESTUTILS_H -#include <QtCore/qdir.h> -#include <QtCore/qcoreapplication.h> +#include <QtCore/QDir> +#include <QtCore/QUrl> +#include <QtCore/QCoreApplication> +#include <QtTest/QTest> -namespace QDeclarativeTestUtils +QT_FORWARD_DECLARE_CLASS(QDeclarativeComponent) +QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) + +/* Base class for tests with data that are located in a "data" subfolder. */ + +class QDeclarativeDataTest : public QObject { - /* - Returns the path to some testdata file. + Q_OBJECT +public: + QDeclarativeDataTest(); + virtual ~QDeclarativeDataTest(); + + QString testFile(const QString &fileName) const; + inline QString testFile(const char *fileName) const + { return testFile(QLatin1String(fileName)); } + inline QUrl testFileUrl(const QString &fileName) const + { return QUrl::fromLocalFile(testFile(fileName)); } + inline QUrl testFileUrl(const char *fileName) const + { return testFileUrl(QLatin1String(fileName)); } - We first check relative to the binary, and then look in the source tree. + inline QString dataDirectory() const { return m_dataDirectory; } + inline QUrl dataDirectoryUrl() const { return m_dataDirectoryUrl; } + inline QString directory() const { return m_directory; } - Note we are looking for a _directory_ which exists, but the _file_ itself need not exist, - to support the case of finding a path to a testdata file which doesn't exist yet (i.e. - a file we are about to create). - */ - QString testdata(QString const& name, const char *sourceFile) - { - // Try to find it relative to the binary. - QFileInfo relative = QDir(QCoreApplication::applicationDirPath()).filePath(QLatin1String("data/") + name); - if (relative.dir().exists()) { - return relative.absoluteFilePath(); - } + static inline QDeclarativeDataTest *instance() { return m_instance; } - // Else try to find it in the source tree - QFileInfo from_source = QFileInfo(sourceFile).absoluteDir().filePath(QLatin1String("data/") + name); - if (from_source.dir().exists()) { - return from_source.absoluteFilePath(); - } + static QByteArray msgComponentError(const QDeclarativeComponent &, + const QDeclarativeEngine *engine = 0); - qWarning("requested testdata %s could not be found (looked at: %s, %s)", - qPrintable(name), - qPrintable(relative.filePath()), - qPrintable(from_source.filePath()) - ); +public slots: + virtual void initTestCase(); - return QString(); - } -} +private: + static QDeclarativeDataTest *m_instance; -#define TESTDATA(name) QDeclarativeTestUtils::testdata(name, __FILE__) + const QString m_dataDirectory; + const QUrl m_dataDirectoryUrl; + QString m_directory; +}; #endif // QDECLARATIVETESTUTILS_H |