From d8374aebc6f1c4fdeae2028ceba0f2c52ef32ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 8 Dec 2011 15:51:19 +0100 Subject: [PATCH] Fixes for tst_QTemporary(File|Dir)::nonWritableCurrentDir - Check path/fileName is empty upon failure, variable was unused - Use /home instead of /, as / is writable by admins on Mac Change-Id: I705471fda8b73843e98b30eb52aa0a73634ec075 Reviewed-by: David Faure --- tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp | 5 ++--- tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp index f47a7db29c..60c7174f3a 100644 --- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp +++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp @@ -238,14 +238,13 @@ void tst_QTemporaryDir::nonWritableCurrentDir() }; ChdirOnReturn cor(QDir::currentPath()); - QDir::setCurrent("/"); + QDir::setCurrent("/home"); // QTemporaryDir("tempXXXXXX") is probably a bad idea in any app // where the current dir could anything... - QString fileName; QTemporaryDir dir("tempXXXXXX"); dir.setAutoRemove(true); QVERIFY(!dir.isValid()); - fileName = dir.path(); + QVERIFY(dir.path().isEmpty()); #endif } diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp index c713eb51d4..a1e9d98461 100644 --- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp @@ -266,14 +266,13 @@ void tst_QTemporaryFile::nonWritableCurrentDir() }; ChdirOnReturn cor(QDir::currentPath()); - QDir::setCurrent("/"); + QDir::setCurrent("/home"); // QTemporaryFile("tempXXXXXX") is probably a bad idea in any app // where the current dir could anything... - QString fileName; QTemporaryFile file("tempXXXXXX"); file.setAutoRemove(true); QVERIFY(!file.open()); - fileName = file.fileName(); + QVERIFY(file.fileName().isEmpty()); #endif }