From 6b497734df0c4f13f6b7185801fc69ce680c698c Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 12 Oct 2011 13:46:02 +1000 Subject: Use TESTDATA macro in declarative tests. Includes a few other minor cleanups as well. Task-number: QTBUG-21721 Change-Id: I5b1c2c116e63748c6b4199183212de8a00037af1 Reviewed-on: http://codereview.qt-project.org/6473 Reviewed-by: Rohan McGovern --- .../declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp') diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index 7e27146609..224426e2ec 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -50,11 +50,11 @@ #include #include #include +#include "../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { - QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); + return QUrl::fromLocalFile(TESTDATA(filename)); } inline QUrl TEST_FILE(const char *filename) @@ -95,7 +95,7 @@ private: QVERIFY(!component.isError()); \ QVERIFY(component.errors().isEmpty()); \ } else { \ - QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \ + QFile file(TESTDATA(errorfile)); \ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ file.close(); \ -- cgit v1.2.3