Add a convenience function QTemporaryDir::filePath()

It allows to write more readable code:
    QString filePath = tmpDir.filePath(fileName);
instead of
    QString filePath = tmpDir.path() + QLatin1Char('/') + fileName;

Change-Id: I85aa54fd365e3bdd3ca41018ead7ed8741352b16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index 487c13be94..758bbead84 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -57,6 +57,8 @@ private slots:
     void fileTemplate_data();
     void getSetCheck();
     void fileName();
+    void filePath_data();
+    void filePath();
     void autoRemove();
     void nonWritableCurrentDir();
     void openOnRootDrives();
@@ -204,6 +206,29 @@ void tst_QTemporaryDir::fileName()
     QCOMPARE(absoluteFilePath, absoluteTempPath);
 }
 
+void tst_QTemporaryDir::filePath_data()
+{
+    QTest::addColumn<QString>("templatePath");
+    QTest::addColumn<QString>("fileName");
+
+    QTest::newRow("0") << QString() << "/tmpfile";
+    QTest::newRow("1") << QString() << "tmpfile";
+    QTest::newRow("2") << "XXXXX" << "tmpfile";
+    QTest::newRow("3") << "YYYYY" << "subdir/file";
+}
+
+void tst_QTemporaryDir::filePath()
+{
+    QFETCH(QString, templatePath);
+    QFETCH(QString, fileName);
+
+    QTemporaryDir dir(templatePath);
+    const QString filePath = dir.filePath(fileName);
+    const QString expectedFilePath = QDir::isAbsolutePath(fileName) ?
+                                     QString() : dir.path() + QLatin1Char('/') + fileName;
+    QCOMPARE(filePath, expectedFilePath);
+}
+
 void tst_QTemporaryDir::autoRemove()
 {
     // Test auto remove