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

Expect tst_QSettings::ctor(native) failures on Mac OS X

Browse Source 
The default constructor for QSettings does not set NoAccess status, even
if the organization domain, organization name, and application name are
empty. Instead of trying to fix QSettings, keep the existing behavior,
and test for it.

Failures from tst_QSettings no longer need to be ignored, so
mac:CONFIG+=insignificant_test has been removed from the .pro file.

Task-number: QTBUG-22745
Change-Id: Ic9f8b6821c483c217e1ef2ece704be2da169e340
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Bradley T. Hughes 2012-02-14 08:46:22 +01:00 committed by Qt by Nokia
parent 4cf0deef73
commit 2c3b2b4703
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/corelib/io/qsettings/qsettings.pro
View File

@ -6,5 +6,4 @@ RESOURCES += qsettings.qrc
win32-msvc*:LIBS += advapi32.lib
mac: CONFIG += insignificant_test # QTBUG-22745
win32: CONFIG += insignificant_test # QTBUG-24145

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

@ -580,6 +580,9 @@ void tst_QSettings::ctor()
QCoreApplication::instance()->setOrganizationName("");
QCoreApplication::instance()->setApplicationName("");
QSettings settings;
#ifdef Q_OS_MAC
QEXPECT_FAIL("native", "Default settings on Mac are valid, despite organization domain, name, and app name being null", Continue);
#endif
QCOMPARE(settings.status(), QSettings::AccessError);
QCoreApplication::instance()->setOrganizationName("software.org");
QCoreApplication::instance()->setApplicationName("KillerAPP");
@ -592,6 +595,9 @@ void tst_QSettings::ctor()
}
QSettings settings(format, QSettings::UserScope, "", "");
#ifdef Q_OS_MAC
QEXPECT_FAIL("native", "Default settings on Mac are valid, despite organization domain, name, and app name being null", Continue);
#endif
QCOMPARE(settings.status(), QSettings::AccessError);
QSettings settings2(format, QSettings::UserScope, "software.org", "KillerAPP");
QCOMPARE(settings2.status(), QSettings::NoError);