1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix qfile:invalidFile() test.

Browse Source 
The test expects 'fail:invalid' to be an invalid file,
which it no longer is on Windows 7. It also assumes that
f: is an invalid drive. Fix by picking a drive that does not exist.

Task-number: QTBUG-27306
Change-Id: I9d9b36c50fc31d2561d3c4eec66f65d96084f0d7
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
Friedemann Kleint 2012-10-26 17:18:22 +02:00 committed by The Qt Project
parent b626b98b95
commit 8fedf68369
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -1027,14 +1027,44 @@ void tst_QFile::ungetChar()
QCOMPARE(buf[2], '4'); QCOMPARE(buf[2], '4');
} }
#ifdef Q_OS_WIN
QString driveLetters()
{
wchar_t volumeName[MAX_PATH];
wchar_t path[MAX_PATH];
const HANDLE h = FindFirstVolumeW(volumeName, MAX_PATH);
if (h == INVALID_HANDLE_VALUE)
return QString();
QString result;
do {
if (GetVolumePathNamesForVolumeNameW(volumeName, path, MAX_PATH, NULL)) {
if (path[1] == L':')
result.append(QChar(path[0]));
}
} while (FindNextVolumeW(h, volumeName, MAX_PATH));
FindVolumeClose(h);
return result;
}
static inline QChar invalidDriveLetter()
{
const QString drives = driveLetters().toLower();
for (char c = 'a'; c <= 'z'; ++c)
if (!drives.contains(QLatin1Char(c)))
return QLatin1Char(c);
Q_ASSERT(false); // All drive letters used?!
return QChar();
}
#endif // Q_OS_WIN
void tst_QFile::invalidFile_data() void tst_QFile::invalidFile_data()
{ {
QTest::addColumn<QString>("fileName"); QTest::addColumn<QString>("fileName");
#if !defined(Q_OS_WIN) #if !defined(Q_OS_WIN)
QTest::newRow( "x11" ) << QString( "qwe//" ); QTest::newRow( "x11" ) << QString( "qwe//" );
#else #else
QTest::newRow( "colon1" ) << QString( "fail:invalid" ); QTest::newRow( "colon2" ) << invalidDriveLetter() + QString::fromLatin1(":ail:invalid");
QTest::newRow( "colon2" ) << QString( "f:ail:invalid" );
QTest::newRow( "colon3" ) << QString( ":failinvalid" ); QTest::newRow( "colon3" ) << QString( ":failinvalid" );
QTest::newRow( "forwardslash" ) << QString( "fail/invalid" ); QTest::newRow( "forwardslash" ) << QString( "fail/invalid" );
QTest::newRow( "asterisk" ) << QString( "fail*invalid" ); QTest::newRow( "asterisk" ) << QString( "fail*invalid" );
@ -1050,8 +1080,7 @@ void tst_QFile::invalidFile()
{ {
QFETCH( QString, fileName ); QFETCH( QString, fileName );
QFile f( fileName ); QFile f( fileName );
QEXPECT_FAIL("colon1", "QTBUG-27306", Continue); QVERIFY2( !f.open( QIODevice::ReadWrite ), qPrintable(fileName) );
QVERIFY( !f.open( QIODevice::ReadWrite ) );
} }
void tst_QFile::createFile() void tst_QFile::createFile()