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

Package up a repeated piece of testing in a macro

Browse Source 
In the process, change it to use QCOMPARE(A, B) rather than QVERIFY(A == B).

Change-Id: I26c64100b08aef43c56f5266c0de71f5cde12816
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-01-09 19:50:51 +01:00
parent 7310d2bd55
commit cee1c620d5
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -333,6 +333,13 @@ void tst_QLocale::defaulted_ctor()
QCOMPARE(l.territory(), QLocale::AnyTerritory); QCOMPARE(l.territory(), QLocale::AnyTerritory);
} }
#define CHECK_DEFAULT(lang, terr) \
do { \
const QLocale l; \
QCOMPARE(l.language(), lang); \
QCOMPARE(l.territory(), terr); \
} while (false)
#define TEST_CTOR(req_lang, req_country, exp_lang, exp_country) \ #define TEST_CTOR(req_lang, req_country, exp_lang, exp_country) \
{ \ { \
QLocale l(QLocale::req_lang, QLocale::req_country); \ QLocale l(QLocale::req_lang, QLocale::req_country); \
@ -356,12 +363,7 @@ void tst_QLocale::defaulted_ctor()
QLocale::LatinAmerica) QLocale::LatinAmerica)
QLocale::setDefault(QLocale(QLocale::English, QLocale::France)); QLocale::setDefault(QLocale(QLocale::English, QLocale::France));
CHECK_DEFAULT(QLocale::English, QLocale::UnitedStates);
{
QLocale l;
QVERIFY(l.language() == QLocale::English);
QVERIFY(l.territory() == QLocale::UnitedStates);
}
TEST_CTOR(French, France, QLocale::French, QLocale::France) TEST_CTOR(French, France, QLocale::French, QLocale::France)
TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
@ -372,12 +374,7 @@ void tst_QLocale::defaulted_ctor()
TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedStates) TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedStates)
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom)); QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom));
CHECK_DEFAULT(QLocale::English, QLocale::UnitedKingdom);
{
QLocale l;
QVERIFY(l.language() == QLocale::English);
QVERIFY(l.territory() == QLocale::UnitedKingdom);
}
TEST_CTOR(French, France, QLocale::French, QLocale::France) TEST_CTOR(French, France, QLocale::French, QLocale::France)
TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
@ -386,12 +383,7 @@ void tst_QLocale::defaulted_ctor()
TEST_CTOR(C, France, QLocale::C, QLocale::AnyTerritory) TEST_CTOR(C, France, QLocale::C, QLocale::AnyTerritory)
QLocale::setDefault(QLocale(QLocale::Aymara, QLocale::France)); QLocale::setDefault(QLocale(QLocale::Aymara, QLocale::France));
CHECK_DEFAULT(QLocale::English, QLocale::UnitedKingdom);
{
QLocale l;
QVERIFY(l.language() == QLocale::English);
QVERIFY(l.territory() == QLocale::UnitedKingdom);
}
TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedKingdom)
TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom)
@ -406,12 +398,7 @@ void tst_QLocale::defaulted_ctor()
TEST_CTOR(C, France, QLocale::C, QLocale::AnyTerritory) TEST_CTOR(C, France, QLocale::C, QLocale::AnyTerritory)
QLocale::setDefault(QLocale(QLocale::Aymara, QLocale::AnyTerritory)); QLocale::setDefault(QLocale(QLocale::Aymara, QLocale::AnyTerritory));
CHECK_DEFAULT(QLocale::English, QLocale::UnitedKingdom);
{
QLocale l;
QVERIFY(l.language() == QLocale::English);
QVERIFY(l.territory() == QLocale::UnitedKingdom);
}
TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(Aymara, AnyTerritory, QLocale::English, QLocale::UnitedKingdom)
TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom) TEST_CTOR(Aymara, France, QLocale::English, QLocale::UnitedKingdom)
@ -527,6 +514,7 @@ void tst_QLocale::defaulted_ctor()
TEST_CTOR("ru_Cyrl", Russian, CyrillicScript, RussianFederation) TEST_CTOR("ru_Cyrl", Russian, CyrillicScript, RussianFederation)
#undef TEST_CTOR #undef TEST_CTOR
#undef CHECK_DEFAULT
} }
#if QT_CONFIG(process) #if QT_CONFIG(process)