diff options
| author | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-02-04 13:14:24 +0100 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-02-05 07:07:59 +0000 |
| commit | 37e40d3ae296ed8a4ad4f2a641c984897316671f (patch) | |
| tree | b70f1a33939c82c5bab62e24338390f3592f4312 | |
| parent | 91b829f55f892bc5a9179a659655688305be8eca (diff) | |
Autotest: Use resources for test filesv1.1.1
Change-Id: I4e1aac17ea5d0c4e24e8e1cc5b6ee128e5be3184
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| -rw-r--r-- | tests/auto/common/testfiles.qrc | 5 | ||||
| -rw-r--r-- | tests/auto/enginioclient/enginioclient.pro | 2 | ||||
| -rw-r--r-- | tests/auto/enginiomodel/enginiomodel.pro | 2 | ||||
| -rw-r--r-- | tests/auto/files/files.pro | 5 | ||||
| -rw-r--r-- | tests/auto/files/tst_files.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/common/testfiles.qrc b/tests/auto/common/testfiles.qrc new file mode 100644 index 0000000..6a04189 --- /dev/null +++ b/tests/auto/common/testfiles.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file alias="enginio.png">enginio.png</file> + </qresource> +</RCC> diff --git a/tests/auto/enginioclient/enginioclient.pro b/tests/auto/enginioclient/enginioclient.pro index 772662b..7c07d2e 100644 --- a/tests/auto/enginioclient/enginioclient.pro +++ b/tests/auto/enginioclient/enginioclient.pro @@ -1,8 +1,6 @@ QT += testlib enginio QT -= gui -DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\" - TARGET = tst_enginioclient CONFIG += console testcase CONFIG -= app_bundle diff --git a/tests/auto/enginiomodel/enginiomodel.pro b/tests/auto/enginiomodel/enginiomodel.pro index 64c0742..ea2c8a6 100644 --- a/tests/auto/enginiomodel/enginiomodel.pro +++ b/tests/auto/enginiomodel/enginiomodel.pro @@ -1,7 +1,5 @@ QT += testlib enginio widgets -DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\" - TARGET = tst_enginiomodel CONFIG += console testcase CONFIG -= app_bundle diff --git a/tests/auto/files/files.pro b/tests/auto/files/files.pro index ae191b7..e739874 100644 --- a/tests/auto/files/files.pro +++ b/tests/auto/files/files.pro @@ -1,7 +1,5 @@ QT += testlib enginio enginio-private core-private -DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\" - TARGET = tst_files CONFIG += console testcase CONFIG -= app_bundle @@ -10,4 +8,5 @@ include(../common/common.pri) TEMPLATE = app -SOURCES += tst_files.cpp
\ No newline at end of file +SOURCES += tst_files.cpp +RESOURCES += ../common/testfiles.qrc diff --git a/tests/auto/files/tst_files.cpp b/tests/auto/files/tst_files.cpp index 236f489..3e5daf6 100644 --- a/tests/auto/files/tst_files.cpp +++ b/tests/auto/files/tst_files.cpp @@ -138,7 +138,7 @@ void tst_Files::fileUploadDownload() QVERIFY(!_id.isEmpty()); QString fileName = QStringLiteral("test.png"); - QString filePath = QStringLiteral(TEST_FILE_PATH); + QString filePath = QFINDTESTDATA(QStringLiteral("enginio.png")); QFile file(filePath); QVERIFY(file.exists()); QString fileId; |