AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix leaking of link in tst_QFileInfo::canonicalFilePath().

Browse Source 
Give the link a name containing time stamp and ensure
it is deleted.

Change-Id: I846c58095acbcd92e7daccfd43a69dd97e95e7b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-06-08 14:45:03 +02:00
parent 83d952c2d0
commit 4fe332f543
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -609,6 +609,16 @@ void tst_QFileInfo::canonicalPath()
QCOMPARE(fi.canonicalPath(), QFileInfo(QDir::tempPath()).canonicalFilePath());
}
class FileDeleter {
Q_DISABLE_COPY(FileDeleter)
public:
explicit FileDeleter(const QString fileName) : m_fileName(fileName) {}
~FileDeleter() { QFile::remove(m_fileName); }
private:
const QString m_fileName;
};
void tst_QFileInfo::canonicalFilePath()
{
const QString fileName("tmp.canon");
@ -639,9 +649,13 @@ void tst_QFileInfo::canonicalFilePath()
QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath());
}
}
const QString dirSymLinkName = QLatin1String("tst_qfileinfo")
+ QDateTime::currentDateTime().toString(QLatin1String("yyMMddhhmmss"));
const QString link(QDir::tempPath() + QLatin1Char('/') + dirSymLinkName);
FileDeleter dirSymLinkDeleter(link);
{
const QString link(QDir::tempPath() + QDir::separator() + "tst_qfileinfo");
QFile::remove(link);
QFile file(QDir::currentPath());
if (file.link(link)) {
QFile tempfile("tempfile.txt");
@ -666,12 +680,12 @@ void tst_QFileInfo::canonicalFilePath()
}
}
{
QString link(QDir::tempPath() + QDir::separator() + "tst_qfileinfo"
+ QDir::separator() + "link_to_tst_qfileinfo");
QString link(QDir::tempPath() + QLatin1Char('/') + dirSymLinkName
+ "/link_to_tst_qfileinfo");
QFile::remove(link);
QFile file(QDir::tempPath() + QDir::separator() + "tst_qfileinfo"
+ QDir::separator() + "tst_qfileinfo.cpp");
QFile file(QDir::tempPath() + QLatin1Char('/') + dirSymLinkName
+ "tst_qfileinfo.cpp");
if (file.link(link))
{
QFileInfo info1("tst_qfileinfo.cpp");