From 7f8af7a2030c0f4ae7ad79eee93bd68a29f285d3 Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Mon, 11 Oct 2010 16:35:58 +0200
Subject: Add test to test QDir caching behavior.

Also fix the qfileenginemodel test to be less fragile

Reviewed-by: Prasanth Ullattil
---
 tests/auto/qdir/tst_qdir.cpp                         | 13 +++++++++++++
 tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 2bb0a3e..d540f29 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -175,6 +175,8 @@ private slots:
 
     void detachingOperations();
 
+    void testCaching();
+
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     void isRoot_data();
     void isRoot();
@@ -1663,6 +1665,17 @@ void tst_QDir::detachingOperations()
     QCOMPARE(dir1.sorting(), sorting);
 }
 
+void tst_QDir::testCaching()
+{
+    QString dirName = QString::fromLatin1("testCaching");
+    QDir::current().rmdir(dirName); // cleanup a previous run.
+    QDir dir(dirName);
+    QVERIFY(!dir.exists());
+    QDir::current().mkdir(dirName);
+    QVERIFY(QDir(dirName).exists()); // dir exists
+    QVERIFY(dir.exists()); // QDir doesn't cache the 'exist' between calls.
+}
+
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 void tst_QDir::isRoot_data()
 {
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index c234c96..aa632c7 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -992,8 +992,8 @@ void tst_QFileSystemModel::dirsBeforeFiles()
         }
         dir.rmdir(dirPath);
     }
-    dir.mkpath(dirPath);
-    QVERIFY(dir.exists());
+    QVERIFY(dir.mkpath(dirPath));
+    QVERIFY(QDir(dirPath).exists());
 
     for (int i = 0; i < 3; ++i) {
         QLatin1Char c('a' + i);
-- 
cgit v0.12


From 69d1025d7c506350dd90b5fb35510b1036847db7 Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Mon, 11 Oct 2010 16:50:09 +0200
Subject: Fix caching of metadata in QDir to not change behavior

In 4.7 and before a QDir::exists() always stats and a refresh() call would
flush metadata, restore this behavior again.

Reviewed-by: Prasanth Ullattil
---
 src/corelib/io/qdir.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index bbe9226..827294c 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -131,9 +131,8 @@ QDirPrivate::QDirPrivate(const QDirPrivate &copy)
 bool QDirPrivate::exists() const
 {
     if (fileEngine.isNull()) {
-        if (!metaData.hasFlags(QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType))
-            QFileSystemEngine::fillMetaData(dirEntry, metaData,
-                    QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType);
+        QFileSystemEngine::fillMetaData(dirEntry, metaData,
+                QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType); // always stat
         return metaData.exists() && metaData.isDirectory();
     }
     const QAbstractFileEngine::FileFlags info =
@@ -2094,6 +2093,7 @@ bool QDir::isRelativePath(const QString &path)
 void QDir::refresh() const
 {
     QDirPrivate *d = const_cast<QDir*>(this)->d_ptr.data();
+    d->metaData.clear();
     d->initFileEngine();
     d->clearFileLists();
 }
-- 
cgit v0.12


From a3550bce43bcf70f3c763f6fcae28ba5d1a31305 Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Mon, 11 Oct 2010 17:43:04 +0200
Subject: Test QDir::mkdir/mkpath return codes

---
 tests/auto/qdir/tst_qdir.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index d540f29..9521921 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -103,6 +103,8 @@ private slots:
     void mkdir_data();
     void mkdir();
 
+    void makedirReturnCode();
+
     void rmdir_data();
     void rmdir();
 
@@ -295,6 +297,17 @@ void tst_QDir::mkdir()
     QVERIFY(fi.exists() && fi.isDir());
 }
 
+void tst_QDir::makedirReturnCode()
+{
+    QString dirName = QString::fromLatin1("makedirReturnCode");
+    QDir::current().rmdir(dirName); // cleanup a previous run.
+    QDir dir(dirName);
+    QVERIFY(!dir.exists());
+    QVERIFY(QDir::current().mkdir(dirName));
+    QVERIFY(!QDir::current().mkdir(dirName)); // calling mkdir on an existing dir will fail.
+    QVERIFY(QDir::current().mkpath(dirName)); // calling mkpath on an existing dir will pass
+}
+
 void tst_QDir::rmdir_data()
 {
     QTest::addColumn<QString>("path");
-- 
cgit v0.12