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

tests: fix tst_QSettings on Mac

Browse Source 
* Add a check for the case sensitivity of the file system, so that
unit tests can determine whether names of preference files with
different case should generate an error or not.
* Add check for OS X native file format in rainersSyncBugOnMac().

Task-number: QTBUG-32655
Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I76821653dd4ebc00e20abdbb5b79c1a80290dece
Reviewed-by: Liang Qi <liang.qi@digia.com>
This commit is contained in:
Kurt Pattyn 2013-11-18 00:15:02 +01:00 committed by The Qt Project
parent 73ef64fb5f
commit 76580659e6
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -507,32 +507,26 @@ void tst_QSettings::ctor()
QCOMPARE(settings1.value("%General/%General").toInt(), 11); QCOMPARE(settings1.value("%General/%General").toInt(), 11);
/* /*
Test that the organization and product parameters is Test that the organization and product parameters are
case-insensitive on Windows and Mac, case-sensitive on case-insensitive on case-insensitive file systems.
Unix.
*/ */
QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp"); QSettings settings5(format, QSettings::UserScope, "SoftWare.ORG", "killerApp");
bool caseSensitive = true;
#if defined(Q_OS_MAC)
if (format == QSettings::NativeFormat) { if (format == QSettings::NativeFormat) {
#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) // more details in QMacSettingsPrivate::QMacSettingsPrivate(), organization was comify()-ed
# ifdef Q_OS_OSX caseSensitive = settings5.fileName().contains("SoftWare.ORG");;
if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
QEXPECT_FAIL("native", "See QTBUG-32655", Continue);
# endif // Q_OS_OSX
QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
#else
QVERIFY(!settings5.contains("key 1"));
#endif
} else { } else {
#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) caseSensitive = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE);
# ifdef Q_OS_OSX
if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
QEXPECT_FAIL("", "See QTBUG-32655", Continue);
# endif // Q_OS_OSX
QCOMPARE(settings5.value("key 1").toString(), QString("gurgle"));
#else
QVERIFY(!settings5.contains("key 1"));
#endif
} }
#elif defined(Q_OS_WIN32)
caseSensitive = false;
#endif
if (caseSensitive)
QVERIFY(!settings5.contains("key 1"));
else
QVERIFY(settings5.contains("key 1"));
} }
{ {
@ -3168,6 +3162,11 @@ void tst_QSettings::rainersSyncBugOnMac()
{ {
QFETCH(QSettings::Format, format); QFETCH(QSettings::Format, format);
#ifdef Q_OS_OSX
if (format == QSettings::NativeFormat)
QSKIP("OSX does not support direct reads from and writes to .plist files, due to caching and background syncing. See QTBUG-34899.");
#endif
QString fileName; QString fileName;
{ {
@ -3183,10 +3182,6 @@ void tst_QSettings::rainersSyncBugOnMac()
{ {
QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP"); QSettings s3(format, QSettings::UserScope, "software.org", "KillerAPP");
#ifdef Q_OS_OSX
if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8)
QEXPECT_FAIL("native", "See QTBUG-32655", Continue);
#endif
QCOMPARE(s3.value("key1", 30).toInt(), 25); QCOMPARE(s3.value("key1", 30).toInt(), 25);
} }
} }