summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2011-08-11 13:49:37 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2011-08-26 12:06:42 (GMT)
commitdcee6e1371d899eb79717b8e3f3eec08b765db82 (patch)
treef34d4d7d6a05fb1939fbcb5d707496fdea095b38 /tests
parent7b693627ee2a17718cb6d8bee5e3deb5a97b307f (diff)
downloadQt-dcee6e1371d899eb79717b8e3f3eec08b765db82.zip
Qt-dcee6e1371d899eb79717b8e3f3eec08b765db82.tar.gz
Qt-dcee6e1371d899eb79717b8e3f3eec08b765db82.tar.bz2
Fix QDir::operator==(const QDir &) const
We can't rely on absolute paths when comparing directories for equality as these don't take into account symbolic links and may also bypass ../ and ./ simplification. Instead, canonical paths must be computed and can then be compared according to the case sensitivity rules for the platform or file engine, as is done in QFileInfo. Task-number: QTBUG-20495 Reviewed-by: Prasanth Ullattil
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdir/tst_qdir.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 0a42a97..419eaae 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -444,9 +444,15 @@ void tst_QDir::QDir_default()
void tst_QDir::compare()
{
// operator==
+
+ // Not using QCOMPARE to test result of QDir::operator==
+
QDir dir;
dir.makeAbsolute();
QVERIFY(dir == QDir::currentPath());
+
+ QVERIFY(QDir() == QDir(QDir::currentPath()));
+ QVERIFY(QDir("../") == QDir(QDir::currentPath() + "/.."));
}
static QStringList filterLinks(const QStringList &list)