AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup of QTest::qFindTestData

Browse Source 
- braces on same line as else where applicable
- const where possible
- Same extended logging format for all cases

Change-Id: If0c91f270ce2a9be1d295f42a915900f3b1838cf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Oliver Wolff 2019-02-28 11:41:55 +01:00
parent 9ab25792b5
commit 02c1f67fc3
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/testlib/qtestcase.cpp
View File

@ -2171,13 +2171,12 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
if (found.isEmpty()) { if (found.isEmpty()) {
const char *testObjectName = QTestResult::currentTestObjectName(); const char *testObjectName = QTestResult::currentTestObjectName();
if (testObjectName) { if (testObjectName) {
QString testsPath = QLibraryInfo::location(QLibraryInfo::TestsPath); const QString testsPath = QLibraryInfo::location(QLibraryInfo::TestsPath);
QString candidate = QString::fromLatin1("%1/%2/%3") const QString candidate = QString::fromLatin1("%1/%2/%3")
.arg(testsPath, QFile::decodeName(testObjectName).toLower(), base); .arg(testsPath, QFile::decodeName(testObjectName).toLower(), base);
if (QFileInfo::exists(candidate)) { if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} } else if (QTestLog::verboseLevel() >= 2) {
else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in tests install path [%2]; " QString::fromLatin1("testdata %1 not found in tests install path [%2]; "
"checking next location") "checking next location")
@ -2199,11 +2198,10 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
} }
const QString canonicalPath = srcdir.canonicalFilePath(); const QString canonicalPath = srcdir.canonicalFilePath();
QString candidate = QString::fromLatin1("%1/%2").arg(canonicalPath, base); const QString candidate = QString::fromLatin1("%1/%2").arg(canonicalPath, base);
if (!canonicalPath.isEmpty() && QFileInfo::exists(candidate)) { if (!canonicalPath.isEmpty() && QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} } else if (QTestLog::verboseLevel() >= 2) {
else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found relative to source path [%2]") QString::fromLatin1("testdata %1 not found relative to source path [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
@ -2213,31 +2211,48 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
// 4. Try resources // 4. Try resources
if (found.isEmpty()) { if (found.isEmpty()) {
QString candidate = QString::fromLatin1(":/%1").arg(base); const QString candidate = QString::fromLatin1(":/%1").arg(base);
if (QFileInfo::exists(candidate)) if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in resources [%2]")
.arg(base, QDir::toNativeSeparators(candidate))),
file, line);
}
} }
// 5. Try current directory // 5. Try current directory
if (found.isEmpty()) { if (found.isEmpty()) {
const QString candidate = QDir::currentPath() + QLatin1Char('/') + base; const QString candidate = QDir::currentPath() + QLatin1Char('/') + base;
if (QFileInfo::exists(candidate)) if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in current directory [%2]")
.arg(base, QDir::toNativeSeparators(candidate))),
file, line);
}
} }
// 6. Try main source directory // 6. Try main source directory
if (found.isEmpty()) { if (found.isEmpty()) {
QString candidate = QTest::mainSourcePath % QLatin1Char('/') % base; const QString candidate = QTest::mainSourcePath % QLatin1Char('/') % base;
if (QFileInfo::exists(candidate)) if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in main source directory [%2]")
.arg(base, QDir::toNativeSeparators(candidate))),
file, line);
}
} }
if (found.isEmpty()) { if (found.isEmpty()) {
QTest::qWarn(qPrintable( QTest::qWarn(qPrintable(
QString::fromLatin1("testdata %1 could not be located!").arg(base)), QString::fromLatin1("testdata %1 could not be located!").arg(base)),
file, line); file, line);
} } else if (QTestLog::verboseLevel() >= 1) {
else if (QTestLog::verboseLevel() >= 1) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 was located at %2").arg(base, QDir::toNativeSeparators(found))), QString::fromLatin1("testdata %1 was located at %2").arg(base, QDir::toNativeSeparators(found))),
file, line); file, line);