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

test: Remove QSKIP from tst_QSettings::fileName()

Browse Source 
Change-Id: I24ed2d182faff989f62f192246ebf95ca492c10d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Sergio Ahumada 2012-10-21 23:26:44 +02:00 committed by The Qt Project
parent cdd75e9e4b
commit 048d28a674
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,9 @@ private slots:
void testThreadSafety(); void testThreadSafety();
void testEmptyData(); void testEmptyData();
void testResourceFiles(); void testResourceFiles();
#ifdef Q_OS_MAC
void fileName(); void fileName();
#endif
void isWritable_data(); void isWritable_data();
void isWritable(); void isWritable();
void registerFormat(); void registerFormat();
@ -2576,9 +2578,10 @@ void tst_QSettings::testCaseSensitivity()
} }
} }
#ifdef Q_OS_MAC
// Please write a fileName() test for the other platforms
void tst_QSettings::fileName() void tst_QSettings::fileName()
{ {
#ifdef Q_OS_MAC
QSettings s1(QSettings::UserScope, "Apple", "Console"); QSettings s1(QSettings::UserScope, "Apple", "Console");
QSettings s2(QSettings::UserScope, "Apple"); QSettings s2(QSettings::UserScope, "Apple");
QSettings s3(QSettings::SystemScope, "Apple", "Console"); QSettings s3(QSettings::SystemScope, "Apple", "Console");
@ -2642,10 +2645,8 @@ void tst_QSettings::fileName()
QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console"); QSettings s21(QSettings::SystemScope, QLatin1String(" ") + QChar(0xbd) + QLatin1String("Foo//:/Bar,,, Baz!()#"), "Console");
QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist")); QCOMPARE(s21.fileName(), QString("/Library/Preferences/com.foo-bar-baz.Console.plist"));
#else
QSKIP("Please write a fileName() test for the other platforms");
#endif
} }
#endif
void tst_QSettings::isWritable_data() void tst_QSettings::isWritable_data()
{ {