diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-21 09:06:26 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-21 15:35:22 +0100 |
commit | 8249c72213bc7d212c05aa086b3145a5742706a3 (patch) | |
tree | 4a34b97b0d57a05707c65b7328d5ab1bf4254920 /tests/auto/declarative/qdeclarativetranslation | |
parent | 3c211558f6b571555558bd1fc59774e36a6da710 (diff) |
QDeclarative tests: Introduce base class for data tests.
In tests/auto/shared/util.* replace macros/find functions by
a base class QDeclarativeDataTest with accessors for the
data directory helper functions to create URLs from it.
The class relies on QFINDTESTDATA, which is the standard
way of locating test data. Using the class should reduce
the number of calls to QFileInfo.exists(), etc significantly.
In addition, provide utility functions for messages.
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Change-Id: Id2beacb157922ee9412f9e45cf9695cec1f8379a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetranslation')
-rw-r--r-- | tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp | 15 |
2 files changed, 8 insertions, 11 deletions
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); |