From 78b58d4de1cceb538cc3983346383440734b00b4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 12 Oct 2020 17:46:44 +0200 Subject: Tidy up tst_QLocale::ctor(), reduce needless repetition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test macro's first three parameters were given a QLocale:: prefix by the macro, but the last three weren't. Save uses of the macro the need to repeat the prefix in all parameters, thereby making the test cases easier to read. Also, we can compare enum values, rather than casting them to int; and, when a test fails, reporting the enum name is far more informative than reporting the integer that represents it. Change-Id: Ib0360c51049333b4a00ea84e271c99db6724334f Reviewed-by: Mårten Nordheim --- tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index c21da6a1df..b488104c69 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -233,56 +233,56 @@ void tst_QLocale::ctor() } #define TEST_CTOR(req_lang, req_script, req_country, exp_lang, exp_script, exp_country) \ - { \ + do { \ QLocale l(QLocale::req_lang, QLocale::req_script, QLocale::req_country); \ - QCOMPARE((int)l.language(), (int)exp_lang); \ - QCOMPARE((int)l.script(), (int)exp_script); \ - QCOMPARE((int)l.country(), (int)exp_country); \ - } + QCOMPARE(l.language(), QLocale::exp_lang); \ + QCOMPARE(l.script(), QLocale::exp_script); \ + QCOMPARE(l.country(), QLocale::exp_country); \ + } while (false) // Exact matches TEST_CTOR(Chinese, SimplifiedHanScript, China, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, TraditionalHanScript, Taiwan, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); TEST_CTOR(Chinese, TraditionalHanScript, HongKong, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::HongKong); + Chinese, TraditionalHanScript, HongKong); // Best match for AnyCountry TEST_CTOR(Chinese, SimplifiedHanScript, AnyCountry, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, TraditionalHanScript, AnyCountry, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); // Best match for AnyScript (and change country to supported one, if necessary) TEST_CTOR(Chinese, AnyScript, China, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, AnyScript, Taiwan, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); TEST_CTOR(Chinese, AnyScript, HongKong, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::HongKong); + Chinese, TraditionalHanScript, HongKong); TEST_CTOR(Chinese, AnyScript, UnitedStates, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); // Fully-specified not found; find best alternate country TEST_CTOR(Chinese, SimplifiedHanScript, Taiwan, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, SimplifiedHanScript, UnitedStates, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, TraditionalHanScript, China, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); TEST_CTOR(Chinese, TraditionalHanScript, UnitedStates, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); // Fully-specified not found; find best alternate script TEST_CTOR(Chinese, LatinScript, China, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); TEST_CTOR(Chinese, LatinScript, Taiwan, - QLocale::Chinese, QLocale::TraditionalHanScript, QLocale::Taiwan); + Chinese, TraditionalHanScript, Taiwan); // Fully-specified not found; find best alternate country and script TEST_CTOR(Chinese, LatinScript, UnitedStates, - QLocale::Chinese, QLocale::SimplifiedHanScript, QLocale::China); + Chinese, SimplifiedHanScript, China); #undef TEST_CTOR } -- cgit v1.2.3