From fd18d13612dd74ddd8747fd28905ad791eb4f4ff Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 12 Feb 2015 13:35:03 +0100 Subject: Use qrc for test data in QFileInfo test on all platforms To make the test compatible with cross-compilation, we need to bundle test data in qrc, and then extract files to the file system during initialization. We did this for Android before, but the change is required on many platforms and since it will also work on desktop platforms, we consistently just do it this way everywhere. Change-Id: I7f65bd9e1dd6f217e6adffda44a40da7599cfe72 Reviewed-by: Christian Stromme --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 39 +++++++---------------- 1 file changed, 11 insertions(+), 28 deletions(-) (limited to 'tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp') diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 0c71675e1a..05546eb2b7 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -265,40 +265,22 @@ private slots: private: const QString m_currentDir; + QString m_dataPath; QString m_sourceFile; + QString m_proFile; QString m_resourcesDir; QTemporaryDir m_dir; }; void tst_QFileInfo::initTestCase() { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) - QString dataPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); - QString resourceSourcePath = QStringLiteral(":/android_testdata"); - QDirIterator it(resourceSourcePath, QDirIterator::Subdirectories); - while (it.hasNext()) { - it.next(); - - QFileInfo fileInfo = it.fileInfo(); - if (!fileInfo.isDir()) { - QString destination = dataPath + QLatin1Char('/') + fileInfo.filePath().mid(resourceSourcePath.length()); - QFileInfo destinationFileInfo(destination); - if (!destinationFileInfo.exists()) { - QDir().mkpath(destinationFileInfo.path()); - if (!QFile::copy(fileInfo.filePath(), destination)) - qWarning("Failed to copy %s", qPrintable(fileInfo.filePath())); - } - } - } - m_sourceFile = dataPath + QStringLiteral("/tst_qfileinfo.cpp"); - m_resourcesDir = dataPath + QStringLiteral("/resources"); -#else - m_sourceFile = QFINDTESTDATA("tst_qfileinfo.cpp"); - m_resourcesDir = QFINDTESTDATA("resources"); -#endif + m_dataPath = QEXTRACTTESTDATA("/testdata"); + QVERIFY(!m_dataPath.isEmpty()); + + m_sourceFile = m_dataPath + QStringLiteral("/tst_qfileinfo.cpp"); + m_resourcesDir = m_dataPath + QStringLiteral("/resources"); + m_proFile = m_dataPath + QStringLiteral("/tst_qfileinfo.pro"); - QVERIFY(!m_sourceFile.isEmpty()); - QVERIFY(!m_resourcesDir.isEmpty()); QVERIFY(m_dir.isValid()); QVERIFY(QDir::setCurrent(m_dir.path())); } @@ -306,6 +288,7 @@ void tst_QFileInfo::initTestCase() void tst_QFileInfo::cleanupTestCase() { QDir::setCurrent(m_currentDir); // Release temporary directory so that it can be deleted on Windows + QDir(m_dataPath).removeRecursively(); } // Testing get/set functions @@ -1622,7 +1605,7 @@ void tst_QFileInfo::isExecutable() QFileInfo fi(appPath); QCOMPARE(fi.isExecutable(), true); - QCOMPARE(QFileInfo(QFINDTESTDATA("qfileinfo.pro")).isExecutable(), false); + QCOMPARE(QFileInfo(m_proFile).isExecutable(), false); #ifdef Q_OS_UNIX QFile::remove("link.lnk"); @@ -1634,7 +1617,7 @@ void tst_QFileInfo::isExecutable() QFile::remove("link.lnk"); // Symlink to .pro file - QFile proFile(QFINDTESTDATA("qfileinfo.pro")); + QFile proFile(m_proFile); QVERIFY(proFile.link("link.lnk")); QCOMPARE(QFileInfo("link.lnk").isExecutable(), false); QFile::remove("link.lnk"); -- cgit v1.2.3