diff options
Diffstat (limited to 'tests/auto/qsettings/tst_qsettings.cpp')
-rw-r--r-- | tests/auto/qsettings/tst_qsettings.cpp | 697 |
1 files changed, 0 insertions, 697 deletions
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 8974b2576b..bd16aad8f8 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -101,7 +101,6 @@ private slots: void testArrays_data(); void testArrays(); void testEscapes(); - void testCompatFunctions(); void testCaseSensitivity_data(); void testCaseSensitivity(); void testErrorHandling_data(); @@ -136,52 +135,11 @@ private slots: void qtbug_13249(); #endif - /* - These tests were developed for the Qt 3 QSettings class. - */ -#ifdef QT3_SUPPORT - void oldWriteEntryIni_data(); - void oldWriteEntryIni(); - void oldReadEntryIni_data(); - void oldReadEntryIni(); - void oldBeginGroup_data(); - void oldBeginGroup(); - void oldEndGroup_data(); - void oldEndGroup(); - void oldResetGroup_data(); - void oldResetGroup(); - void oldEntryList_data(); - void oldEntryList(); - void oldWriteEntry_QString_bool_data(); - void oldWriteEntry_QString_bool(); - void oldWriteEntry_QString_double_data(); - void oldWriteEntry_QString_double(); - void oldWriteEntry_QString_int_data(); - void oldWriteEntry_QString_int(); - void oldWriteEntry_QString_QString_data(); - void oldWriteEntry_QString_QString(); - void oldWriteEntry_QString_QStringList_data(); - void oldWriteEntry_QString_QStringList(); - void oldWriteEntry_QString_QStringList_QChar_data(); - void oldWriteEntry_QString_QStringList_QChar(); - void oldReadListEntry_QString(); - void oldReadListEntry_QString_QChar(); - void oldReadEntry(); - void oldReadNumEntry(); - void oldReadDoubleEntry(); - void oldReadBoolEntry(); - void oldGlobalVersusLocal(); - void oldRemoveEntry(); -#endif - void testVariantTypes_data(); void testVariantTypes(); void rainersSyncBugOnMac_data(); void rainersSyncBugOnMac(); void recursionBug(); -#ifdef QT3_SUPPORT - void setPathBug(); -#endif void testByteArray_data(); void testByteArray(); @@ -2529,104 +2487,6 @@ void tst_QSettings::testEscapes() #endif } -void tst_QSettings::testCompatFunctions() -{ -#ifdef QT3_SUPPORT - QSettings settings1("software.org", "KillerAPP"); - - bool ok; - ok = settings1.writeEntry("/root/bool", true); - QVERIFY(ok); - ok = settings1.writeEntry("/root/double", 1.4); - QVERIFY(ok); - ok = settings1.writeEntry("/root/int", 66666); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */1", "Hello"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */2", ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */3", (const char *)0); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/1", QString("Hello")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/2", QString("")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/3", QString()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/1", QStringList()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/2", QStringList() << ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/3", QStringList() << "a" << "" << "b"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/4", QStringList() << "a" << "" << "b", ':'); - QVERIFY(ok); - - QCOMPARE(settings1.readBoolEntry("/root/bool"), true); - QCOMPARE(settings1.readDoubleEntry("/root/double"), 1.4); - QCOMPARE(settings1.readNumEntry("/root/int"), 66666); - QCOMPARE(settings1.readEntry("/root/const char */1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/const char */2"), QString("")); - QCOMPARE(settings1.readEntry("/root/const char */3"), QString()); - QCOMPARE(settings1.readEntry("/root/QString/1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/QString/2"), QString("")); - QCOMPARE(settings1.readEntry("/root/QString/3"), QString()); - QCOMPARE(settings1.readListEntry("/root/QStringList/1"), QStringList()); - QCOMPARE(settings1.readListEntry("/root/QStringList/2"), QStringList() << ""); - QCOMPARE(settings1.readListEntry("/root/QStringList/3"), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readListEntry("/root/QStringList/4", ':'), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readEntry("/root/QStringList/4"), QString("a::b")); - - QStringList actual, expectedSubKey, expectedEntry; - - settings1.clear(); - QStringList initialKeys = settings1.allKeys(); - settings1.setValue("/alpha/beta", 5); - settings1.setValue("/alpha/beta/gamma", 5); - settings1.setValue("/alpha/beta/delta", 5); - settings1.setValue("/alpha/epsilon/zeta/eta", 5); - settings1.setValue("/alpha/theta", 5); - - settings1.beginGroup("/alpha"); - QCOMPARE(settings1.group(), QString("alpha")); - - actual = settings1.entryList(""); - actual.sort(); - expectedEntry = QStringList() << "beta" << "theta"; - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList(""); - actual.sort(); - expectedSubKey = QStringList() << "beta" << "epsilon"; - QCOMPARE(actual, expectedSubKey); - - settings1.endGroup(); - - actual = settings1.entryList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedSubKey); - - actual = settings1.entryList(""); - QVERIFY(containsSubList(initialKeys, actual)); - - actual = settings1.subkeyList(""); - QVERIFY(actual.contains("alpha")); - - actual = settings1.subkeyList("foo/bar/baz"); - QVERIFY(actual.isEmpty()); - - actual = settings1.subkeyList("alpha/epsilon"); - expectedSubKey = QStringList() << "zeta"; - QCOMPARE(actual, expectedSubKey); -#else - QSKIP("Compiled without Qt3Support", SkipAll); -#endif -} - void tst_QSettings::testCaseSensitivity_data() { populateWithFormats(); @@ -2711,550 +2571,6 @@ void tst_QSettings::testCaseSensitivity() } } -#ifdef QT3_SUPPORT -void tst_QSettings::oldEntryList_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntry_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntry_data() -{ - // define the test elements we're going to use - QTest::addColumn<QString>("string"); - QTest::addColumn<QString>("empty"); - QTest::addColumn<QString>("unicode"); - QTest::addColumn<int>("integer"); - QTest::addColumn<bool>("boolean"); - QTest::addColumn<double>("floating"); - QTest::addColumn<QStringList>("list"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << QString("blah") << QString("") << QString( QChar(0x0E12) ) << 99 << TRUE << 3.1415 << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << QString("foo") << QString("") << QString( QChar(0xFEFC) ) << -150 << FALSE << 0.0 << list1; -} - -void tst_QSettings::oldWriteEntryHelper( QSettings &settings ) -{ - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/String", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Empty", empty ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Unicode", unicode ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Integer", integer ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", boolean ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Floating", floating ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/List", list ) ); -} - -void tst_QSettings::oldReadEntryHelper( QSettings &settings ) -{ - bool ok; - - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Empty", QString::null, &ok ), empty ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Unicode", QString::null, &ok ), unicode ); - QVERIFY( ok ); - QCOMPARE( settings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), integer ); - QVERIFY( ok ); - QCOMPARE( settings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), boolean ); - QVERIFY( ok ); - QCOMPARE( settings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), floating ); - QVERIFY( ok ); - QCOMPARE( settings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), list ); - QVERIFY( ok ); - - settings.readListEntry( "/Trolltech/QSettingsTesting/NonExistingValue", &ok ); - QVERIFY( !ok ); -} - -void tst_QSettings::oldWriteEntryIni() -{ - QSettings settings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper(settings); -} - -void tst_QSettings::oldReadEntryIni() -{ - { - QSettings writeSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - { - QSettings readSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldReadEntryHelper( readSettings ); - } -} - - -void tst_QSettings::oldEndGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldResetGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldBeginGroup_data() -{ - // define the test elements we're going to use - QTest::addColumn<QString>("group"); - QTest::addColumn<QString>("value"); - - QTest::newRow( "data0") << QString("blah") << "value"; - QTest::newRow( "data1") << QString("") << "first/value"; - QTest::newRow( "data2") << QString("first/second") << "value"; - QTest::newRow( "data3") << QString("first/second/third") << "value"; - QTest::newRow( "data4") << QString("first/second/third") << "value"; -} - -void tst_QSettings::oldBeginGroup() -{ - bool ok; - - QFETCH( QString, group ); - QFETCH( QString, value ); - - QSettings settings("software.org", "KillerAPP"); - - QCOMPARE(settings.group(), QString()); - settings.beginGroup( group ); - QCOMPARE(settings.group(), group); - - QVERIFY( settings.writeEntry( "/" + value, value ) ); - QCOMPARE( settings.readEntry( "/" + value ), value ); - settings.endGroup(); - QCOMPARE( settings.readEntry( group + "/" + value, QString::null, &ok ), value ); - QVERIFY( ok ); -} - -void tst_QSettings::oldEndGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - QTest::ignoreMessage(QtWarningMsg, "QSettings::endGroup: No matching beginGroup()"); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldResetGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - settings.beginGroup( group ); - - settings.resetGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldEntryList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - - QStringList entryKeys; - entryKeys << "String" << "Empty" << "Unicode" << "Integer" << "Boolean" << "Floating" << "List"; - - QSettings readSettings("software.org", "KillerAPP"); - QStringList entryList = readSettings.entryList( "/Trolltech/QSettingsTesting/" ); - entryKeys.sort(); - entryList.sort(); - QCOMPARE( entryKeys, entryList ); -} - -void tst_QSettings::oldWriteEntry_QString_bool_data() -{ - QTest::addColumn<bool>("b"); - QTest::newRow( "false" ) << bool(FALSE); - QTest::newRow( "true" ) << bool(TRUE); -} - -void tst_QSettings::oldWriteEntry_QString_bool() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", b ) ); - } - - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - bool ok = FALSE; - QCOMPARE( readSettings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), b ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_double_data() -{ - QTest::addColumn<double>("f"); - QTest::newRow( "data0" ) << 3.1415; - QTest::newRow( "data1" ) << 0.0; - QTest::newRow( "data2" ) << 0.0000000000000000000000000001; -} - -void tst_QSettings::oldWriteEntry_QString_double() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Floating", f ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - bool ok = FALSE; - QCOMPARE( readSettings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), f ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_int_data() -{ - QTest::addColumn<int>("i"); - QTest::newRow( "data0" ) << int(0); - QTest::newRow( "data1" ) << int(1); - QTest::newRow( "data2" ) << int(11); - QTest::newRow( "data3" ) << int(111); - QTest::newRow( "data4" ) << int(1111); - QTest::newRow( "data5" ) << int(11111); - QTest::newRow( "data6" ) << int(-1); - QTest::newRow( "data7" ) << int(-11); - QTest::newRow( "data8" ) << int(-111); - QTest::newRow( "data9" ) << int(-1111); - QTest::newRow( "data10" ) << int(-11111); -} - -void tst_QSettings::oldWriteEntry_QString_int() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Integer", i ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - bool ok = FALSE; - QCOMPARE( readSettings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), i ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QString_data() -{ - QTest::addColumn<QString>("s"); - QTest::newRow( "data0" ) << QString( "blah" ); - QTest::newRow( "data1" ) << QString( "" ); - QTest::newRow( "data2" ) << QString( QChar(0x0E12) ); // unicode - QTest::newRow( "data3" ) << QString("foo"); -// QTest::newRow( "data4" ) << QString::null; // nul string (not supported on Windows!) - QTest::newRow( "data5" ) << QString( QChar(0xFEFC) ); // more unicode - QTest::newRow( "data6" ) << QString( "This is s short string" ); - QTest::newRow( "data7" ) << QString( "This is a string with a cr\nand some text on the second line" ); - QTest::newRow( "data8" ) << QString( "\n" ); - QTest::newRow( "data9" ) << QString( "01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<" ); -} - -void tst_QSettings::oldWriteEntry_QString_QString() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/String", s ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - bool ok = FALSE; - QCOMPARE( readSettings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), s ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_data() -{ - QTest::addColumn<QStringList>("l"); - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << list1; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<"; - list1 << QString(); - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data2") << list2; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - bool ok = FALSE; - QCOMPARE( readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), l ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar_data() -{ - QTest::addColumn<QStringList>("l"); - QTest::addColumn<QString>("sep"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data00") << list0 << "\\"; - QTest::newRow( "data01") << list0 << "/"; - QTest::newRow( "data02") << list0 << " "; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << "elem3"; - QTest::newRow( "data10") << list1 << "\\"; - QTest::newRow( "data11") << list1 << "/"; - QTest::newRow( "data12") << list1 << "&"; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^*()_+=-[{]}\\|/'\":;?.>,<"; - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data20") << list2 << "&"; - - // an empty stringlist should be stored as an empty string (and return an empty stringlist?) - QStringList list3; - QTest::newRow( "data30") << list3 << "/"; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar() -{ - // edba: - // data10, data11, data12, data20, data21 and data22 currently fail. - // This is because the list DOES contain the separator which is a fail IMO, so i - // expect the writeEntry to return FALSE (but it doesn't). - // If my interpretation of the doc is wrong, then the separators should be deleted from - // data10 .. data22. - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l, QChar(sep[0]) ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - bool ok = FALSE; - QStringList actual; - actual = readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", QChar(sep[0]), &ok ); - QVERIFY2( ok, "Read the stringlist from the settings" ); - QCOMPARE( actual, l ); - } -} - -void tst_QSettings::oldReadListEntry_QString() -{ - DEPENDS_ON( "writeEntry_QString_QStringList" ); -} - -void tst_QSettings::oldReadListEntry_QString_QChar() -{ - DEPENDS_ON( "writeEntry_QString_QStringList_QChar" ); -} - -void tst_QSettings::oldReadEntry() -{ - DEPENDS_ON( "writeEntry_QString_QString" ); -} - -void tst_QSettings::oldReadNumEntry() -{ - DEPENDS_ON( "writeEntry_QString_int" ); -} - -void tst_QSettings::oldReadDoubleEntry() -{ - DEPENDS_ON( "writeEntry_QString_double" ); -} - -void tst_QSettings::oldReadBoolEntry() -{ - DEPENDS_ON( "writeEntry_QString_bool" ); -} - -void tst_QSettings::oldRemoveEntry() -{ - // we'll use this one later - QSettings firstSettings("software.org", "KillerAPP"); - - // first write a key - { - QSettings writeSettings("software.org", "KillerAPP"); - writeSettings.writeEntry( "/Trolltech/QSettingsTesting/removeEntry", "foobar" ); - } - - // check that the key exists - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok ); - QVERIFY( foo == "foobar" ); - - // and remove it - QVERIFY( readSettings.removeEntry( "/Trolltech/QSettingsTesting/removeEntry") ); - - // check that it is gone - QString foo2 = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo2 == "" ); - } - - // Take another chance with a fresh instance - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } - - // and another chance with an instance that existed already - { - bool ok = FALSE; - QString foo = firstSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } -} - -void tst_QSettings::oldGlobalVersusLocal() -{ - { //write global - QSettings settings("foo"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - settings.writeEntry("/vs/just_global/", "from Global"); - settings.writeEntry("/vs/local_and_global/", "from Global"); - } - { //write local - QSettings settings("bar"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - settings.writeEntry("/vs/local_and_global/", "from User"); - } - bool ok; - { - QSettings settings("baz"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from User")); - } - { - QSettings settings("bat"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from Global")); - } -} -#endif // QT3_SUPPORT - void tst_QSettings::fileName() { #ifdef Q_OS_MAC @@ -3792,19 +3108,6 @@ void tst_QSettings::recursionBug() } } -#ifdef QT3_SUPPORT -void tst_QSettings::setPathBug() -{ - QSettings settings("software.org", "KillerAPP", this); - settings.setPath("foo.org", "Bar", QSettings::User); - QVERIFY(settings.parent() == this); - settings.setValue("blah", "BAZ"); - settings.setPath("bar.org", "Baz", QSettings::User); - settings.setValue("blah", "BAZ"); - QVERIFY(settings.parent() == this); -} -#endif - #if defined(Q_OS_WIN) static DWORD readKeyType(HKEY handle, const QString &rSubKey) |