QDir and QFileInfo shouldn't lose properties when detaching

For QFileInfo, the caching state was being lost on the different setFile
overloads. QDir::cd and ::makeAbsolute were losing filters and sorting
flags.

QDir issues were introduced with these patches:

    "Simplify QDir::cd"
    "QDir::makeAbsolute could self-destruct on failure"

Reviewed-by: Prasanth Ullattil

2 files changed, 147 insertions, 0 deletions

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 661a4c7..9678868 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -173,6 +173,8 @@ private slots:
 
     void updateFileLists();
 
+    void detachingOperations();
+
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     void isRoot_data();
     void isRoot();
@@ -1561,6 +1563,103 @@ void tst_QDir::updateFileLists()
     QCOMPARE(dir.entryList(), QStringList() << "sub-dir1" << "sub-dir2" << "file1.txt");
 }
 
+void tst_QDir::detachingOperations()
+{
+    QString const defaultPath(".");
+    QStringList const defaultNameFilters = QStringList("*");
+    QDir::SortFlags const defaultSorting = QDir::Name | QDir::IgnoreCase;
+    QDir::Filters const defaultFilter = QDir::AllEntries;
+
+    QString const path1("..");
+    QString const path2("./foo");
+    QStringList const nameFilters = QStringList(QString("*.txt"));
+    QDir::SortFlags const sorting = QDir::Name | QDir::DirsLast | QDir::Reversed;
+    QDir::Filters const filter = QDir::Writable;
+
+    QDir dir1;
+
+    QCOMPARE(dir1.path(), defaultPath);
+    QCOMPARE(dir1.filter(), defaultFilter);
+    QCOMPARE(dir1.nameFilters(), defaultNameFilters);
+    QCOMPARE(dir1.sorting(), defaultSorting);
+
+    dir1.setPath(path1);
+    QCOMPARE(dir1.path(), path1);
+    QCOMPARE(dir1.filter(), defaultFilter);
+    QCOMPARE(dir1.nameFilters(), defaultNameFilters);
+    QCOMPARE(dir1.sorting(), defaultSorting);
+
+    dir1.setFilter(filter);
+    QCOMPARE(dir1.path(), path1);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), defaultNameFilters);
+    QCOMPARE(dir1.sorting(), defaultSorting);
+
+    dir1.setNameFilters(nameFilters);
+    QCOMPARE(dir1.path(), path1);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), defaultSorting);
+
+    dir1.setSorting(sorting);
+    QCOMPARE(dir1.path(), path1);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), sorting);
+
+    dir1.setPath(path2);
+    QCOMPARE(dir1.path(), path2);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), sorting);
+
+    {
+        QDir dir2(dir1);
+        QCOMPARE(dir2.path(), path2);
+        QCOMPARE(dir2.filter(), filter);
+        QCOMPARE(dir2.nameFilters(), nameFilters);
+        QCOMPARE(dir2.sorting(), sorting);
+    }
+
+    {
+        QDir dir2;
+        QCOMPARE(dir2.path(), defaultPath);
+        QCOMPARE(dir2.filter(), defaultFilter);
+        QCOMPARE(dir2.nameFilters(), defaultNameFilters);
+        QCOMPARE(dir2.sorting(), defaultSorting);
+
+        dir2 = dir1;
+        QCOMPARE(dir2.path(), path2);
+        QCOMPARE(dir2.filter(), filter);
+        QCOMPARE(dir2.nameFilters(), nameFilters);
+        QCOMPARE(dir2.sorting(), sorting);
+
+        dir2 = path1;
+        QCOMPARE(dir2.path(), path1);
+        QCOMPARE(dir2.filter(), filter);
+        QCOMPARE(dir2.nameFilters(), nameFilters);
+        QCOMPARE(dir2.sorting(), sorting);
+    }
+
+    dir1.refresh();
+    QCOMPARE(dir1.path(), path2);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), sorting);
+
+    QString const currentPath = QDir::currentPath();
+    QVERIFY(dir1.cd(currentPath));
+    QCOMPARE(dir1.path(), currentPath);
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), sorting);
+
+    QVERIFY(dir1.cdUp());
+    QCOMPARE(dir1.filter(), filter);
+    QCOMPARE(dir1.nameFilters(), nameFilters);
+    QCOMPARE(dir1.sorting(), sorting);
+}
+
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 void tst_QDir::isRoot_data()
 {
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 32aa671..7659a75 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -181,6 +181,8 @@ private slots:
     void equalOperator() const;
     void equalOperatorWithDifferentSlashes() const;
     void notEqualOperator() const;
+
+    void detachingOperations();
 };
 
 tst_QFileInfo::tst_QFileInfo()
@@ -1545,5 +1547,51 @@ void tst_QFileInfo::notEqualOperator() const
     QVERIFY(QFileInfo() != QFileInfo());
 }
 
+void tst_QFileInfo::detachingOperations()
+{
+    QFileInfo info1;
+    QVERIFY(info1.caching());
+    info1.setCaching(false);
+
+    {
+        QFileInfo info2 = info1;
+
+        QVERIFY(!info1.caching());
+        QVERIFY(!info2.caching());
+
+        info2.setCaching(true);
+        QVERIFY(info2.caching());
+
+        info1.setFile("foo");
+        QVERIFY(!info1.caching());
+    }
+
+    {
+        QFile file("foo");
+        info1.setFile(file);
+        QVERIFY(!info1.caching());
+    }
+
+    info1.setFile(QDir(), "foo");
+    QVERIFY(!info1.caching());
+
+    {
+        QFileInfo info3;
+        QVERIFY(info3.caching());
+
+        info3 = info1;
+        QVERIFY(!info3.caching());
+    }
+
+    info1.refresh();
+    QVERIFY(!info1.caching());
+
+    QVERIFY(info1.makeAbsolute());
+    QVERIFY(!info1.caching());
+
+    info1.detach();
+    QVERIFY(!info1.caching());
+}
+
 QTEST_MAIN(tst_QFileInfo)
 #include "tst_qfileinfo.moc"