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

tst_QLocale: Avoid manual deletes

Browse Source 
Also use data-driven test to reduce duplication.

Change-Id: I9516e52267cb3c7b239030fd73dbbf23ac8f52f7
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Kari Oikarinen 2018-03-23 12:59:40 +02:00
parent 11adeb24ff
commit b32d16d468
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -137,6 +137,7 @@ private slots:
void formattedDataSize(); void formattedDataSize();
void bcp47Name(); void bcp47Name();
void systemLocale_data();
void systemLocale(); void systemLocale();
// *** ORDER-DEPENDENCY *** (This Is Bad.) // *** ORDER-DEPENDENCY *** (This Is Bad.)
@ -2682,27 +2683,31 @@ private:
const QLocale m_locale; const QLocale m_locale;
}; };
void tst_QLocale::systemLocale_data()
{
QTest::addColumn<QString>("name");
QTest::addColumn<QLocale::Language>("language");
QTest::addRow("catalan") << QString("ca") << QLocale::Catalan;
QTest::addRow("ukrainian") << QString("uk") << QLocale::Ukrainian;
QTest::addRow("german") << QString("de") << QLocale::German;
}
void tst_QLocale::systemLocale() void tst_QLocale::systemLocale()
{ {
QLocale originalLocale; QLocale originalLocale;
QLocale originalSystemLocale = QLocale::system();
MySystemLocale *sLocale = new MySystemLocale(QLocale("uk")); QFETCH(QString, name);
QCOMPARE(QLocale().language(), QLocale::Ukrainian); QFETCH(QLocale::Language, language);
QCOMPARE(QLocale::system().language(), QLocale::Ukrainian);
delete sLocale;
sLocale = new MySystemLocale(QLocale("ca")); {
QCOMPARE(QLocale().language(), QLocale::Catalan); MySystemLocale sLocale(name);
QCOMPARE(QLocale::system().language(), QLocale::Catalan); QCOMPARE(QLocale().language(), language);
delete sLocale; QCOMPARE(QLocale::system().language(), language);
}
sLocale = new MySystemLocale(QLocale("de"));
QCOMPARE(QLocale().language(), QLocale::German);
QCOMPARE(QLocale::system().language(), QLocale::German);
delete sLocale;
QCOMPARE(QLocale(), originalLocale); QCOMPARE(QLocale(), originalLocale);
QCOMPARE(QLocale::system(), originalLocale); QCOMPARE(QLocale::system(), originalSystemLocale);
} }
QTEST_MAIN(tst_QLocale) QTEST_MAIN(tst_QLocale)