From d1f6d99972e36d59730fc6c5ecb0edbe8847a2bb Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Wed, 12 Jun 2002 03:55:49 +0000 Subject: [PATCH] ICU-1781 test isNormalized() X-SVN-Rev: 8854 --- icu4c/source/test/intltest/normconf.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/icu4c/source/test/intltest/normconf.cpp b/icu4c/source/test/intltest/normconf.cpp index 8725e7d85b0..e4e9b7d5c6e 100644 --- a/icu4c/source/test/intltest/normconf.cpp +++ b/icu4c/source/test/intltest/normconf.cpp @@ -248,21 +248,38 @@ UBool NormalizerConformanceTest::checkConformance(const UnicodeString* field, // test quick checks if(UNORM_NO == Normalizer::quickCheck(field[1], UNORM_NFC, status)) { errln("Normalizer error: quickCheck(NFC(s), UNORM_NFC) is UNORM_NO"); - pass = UNORM_NO; + pass = FALSE; } if(UNORM_NO == Normalizer::quickCheck(field[2], UNORM_NFD, status)) { errln("Normalizer error: quickCheck(NFD(s), UNORM_NFD) is UNORM_NO"); - pass = UNORM_NO; + pass = FALSE; } if(UNORM_NO == Normalizer::quickCheck(field[3], UNORM_NFKC, status)) { errln("Normalizer error: quickCheck(NFKC(s), UNORM_NFKC) is UNORM_NO"); - pass = UNORM_NO; + pass = FALSE; } if(UNORM_NO == Normalizer::quickCheck(field[4], UNORM_NFKD, status)) { errln("Normalizer error: quickCheck(NFKD(s), UNORM_NFKD) is UNORM_NO"); pass = FALSE; } + if(!Normalizer::isNormalized(field[1], UNORM_NFC, status)) { + errln("Normalizer error: isNormalized(NFC(s), UNORM_NFC) is FALSE"); + pass = FALSE; + } + if(field[0]!=field[1] && Normalizer::isNormalized(field[0], UNORM_NFC, status)) { + errln("Normalizer error: isNormalized(s, UNORM_NFC) is TRUE"); + pass = FALSE; + } + if(!Normalizer::isNormalized(field[3], UNORM_NFKC, status)) { + errln("Normalizer error: isNormalized(NFKC(s), UNORM_NFKC) is FALSE"); + pass = FALSE; + } + if(field[0]!=field[3] && Normalizer::isNormalized(field[0], UNORM_NFKC, status)) { + errln("Normalizer error: isNormalized(s, UNORM_NFKC) is TRUE"); + pass = FALSE; + } + // test FCD quick check and "makeFCD" Normalizer::normalize(field[0], UNORM_FCD, 0, fcd, status); if(UNORM_NO == Normalizer::quickCheck(fcd, UNORM_FCD, status)) {