diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-12 17:46:44 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-19 17:44:43 +0200 |
commit | 78b58d4de1cceb538cc3983346383440734b00b4 (patch) | |
tree | 092b1ef69e28bdf37a38a8b2a731cdf86747d8c9 /tests/auto | |
parent | f2cd9d9ddbf0a1c7cea248972d2808ab38960af7 (diff) |
Tidy up tst_QLocale::ctor(), reduce needless repetition
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 <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
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 } |