1 files changed, 28 insertions, 0 deletions
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index cc55fd721c..e35a9f7c7a 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -89,6 +89,7 @@ private slots:
     void showFiles();
     void resetFiltering();
     void refresh();
+    void cdUp();
 #if defined (Q_OS_WIN) && !defined (Q_OS_WINCE)
     // WinCE does not have drive concept, so lets execute this test only on desktop Windows.
     void changeDrive();
@@ -219,6 +220,33 @@ void tst_qquickfolderlistmodel::refresh()
     QTRY_COMPARE(removeEnd, count-1); // wait for refresh
 }
 
+void tst_qquickfolderlistmodel::cdUp()
+{
+    enum { maxIterations = 50 };
+    QQmlComponent component(&engine, testFileUrl("basic.qml"));
+    checkNoErrors(component);
+
+    QAbstractListModel *flm = qobject_cast<QAbstractListModel*>(component.create());
+    QVERIFY(flm != 0);
+    const QUrl startFolder = flm->property("folder").toUrl();
+    QVERIFY(startFolder.isValid());
+
+    // QTBUG-32139: Ensure navigating upwards terminates cleanly and does not
+    // return invalid Urls like "file:".
+    for (int i = 0; ; ++i) {
+        const QVariant folderV = flm->property("parentFolder");
+        const QUrl folder = folderV.toUrl();
+        if (!folder.isValid())
+            break;
+        QVERIFY(folder.toString() != QLatin1String("file:"));
+        QVERIFY2(i < maxIterations,
+                 qPrintable(QString::fromLatin1("Unable to reach root after %1 iterations starting from %2, stuck at %3")
+                            .arg(maxIterations).arg(QDir::toNativeSeparators(startFolder.toLocalFile()),
+                                                    QDir::toNativeSeparators(folder.toLocalFile()))));
+        flm->setProperty("folder", folderV);
+    }
+}
+
 #if defined (Q_OS_WIN) && !defined (Q_OS_WINCE)
 void tst_qquickfolderlistmodel::changeDrive()
 {