1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QFileInfo: replace a portion of a macro with a lambda

Browse Source 
It's very hard to debug a macro.

Change-Id: I2b24e1d3cad44897906efffd17803b8eac9bd844
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 9e8c93fac10b802448b6b7938054220984734434)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2023-08-30 11:09:03 -07:00 committed by Qt Cherry-pick Bot
parent 641459e986
commit 66dfbea290
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -2303,13 +2303,15 @@ void tst_QFileInfo::stdfilesystem()
// We compare using absoluteFilePath since QFileInfo::operator== ends up using // We compare using absoluteFilePath since QFileInfo::operator== ends up using
// canonicalFilePath which evaluates to empty-string for non-existent paths causing // canonicalFilePath which evaluates to empty-string for non-existent paths causing
// these tests to always succeed. // these tests to always succeed.
#define COMPARE_CONSTRUCTION(filepath) \
QCOMPARE(QFileInfo(fs::path(filepath)).absoluteFilePath(), \
QFileInfo(QString::fromLocal8Bit(filepath)).absoluteFilePath()); \
QCOMPARE(QFileInfo(base, fs::path(filepath)).absoluteFilePath(), \
QFileInfo(base, QString::fromLocal8Bit(filepath)).absoluteFilePath())
QDir base{ "../" }; // Used for the QFileInfo(QDir, <path>) ctor QDir base{ "../" }; // Used for the QFileInfo(QDir, <path>) ctor
auto doCompare = [&base](const char *filepath) {
QCOMPARE(QFileInfo(fs::path(filepath)).absoluteFilePath(),
QFileInfo(QString::fromLocal8Bit(filepath)).absoluteFilePath());
QCOMPARE(QFileInfo(base, fs::path(filepath)).absoluteFilePath(),
QFileInfo(base, QString::fromLocal8Bit(filepath)).absoluteFilePath());
};
#define COMPARE_CONSTRUCTION(filepath) \
doCompare(filepath); if (QTest::currentTestFailed()) return
COMPARE_CONSTRUCTION("./file"); COMPARE_CONSTRUCTION("./file");