organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-16 18:25:57 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 10

ICU-96 fixed French errors

Browse source 
X-SVN-Rev: 3127
This commit is contained in:
Vladimir Weinstein 2000-12-05 01:05:46 +00:00
parent 3c933af3d1
commit 5364911f5f
2 changed files with 64 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
icu4c/source/test/intltest/frcoll.cpp
View file

@ -80,39 +80,67 @@ const Collator::EComparisonResult CollationFrenchTest::results[] =
Collator::GREATER,
Collator::GREATER,
Collator::GREATER,
Collator::GREATER,
Collator::GREATER
Collator::LESS,
Collator::LESS
};
// 0x0300 is grave, 0x0301 is acute
// the order of elements in this array must be different than the order in CollationEnglishTest
const UChar CollationFrenchTest::testAcute[][CollationFrenchTest::MAX_TOKEN_LEN] =
{
{0x65, 0x65, 0},
{0x65, 0x0301, 0x65, 0},
{0x65, 0x0301, 0x0300, 0x65, 0},
{0x65, 0x0300, 0x65, 0},
{0x65, 0x0300, 0x0301, 0x65, 0},
{0x65, 0x65, 0x0301, 0},
{0x65, 0x0301, 0x65, 0x0301, 0},
{0x65, 0x0301, 0x0300, 0x65, 0x0301, 0},
{0x65, 0x0300, 0x65, 0x0301, 0},
{0x65, 0x0300, 0x0301, 0x65, 0x0301, 0},
{0x65, 0x65, 0x0301, 0x0300, 0},
{0x65, 0x0301, 0x65, 0x0301, 0x0300, 0},
{0x65, 0x0301, 0x0300, 0x65, 0x0301, 0x0300, 0},
{0x65, 0x0300, 0x65, 0x0301, 0x0300, 0},
{0x65, 0x0300, 0x0301, 0x65, 0x0301, 0x0300, 0},
{0x65, 0x65, 0x0300, 0},
{0x65, 0x0301, 0x65, 0x0300, 0},
{0x65, 0x0301, 0x0300, 0x65, 0x0300, 0},
{0x65, 0x0300, 0x65, 0x0300, 0},
{0x65, 0x0300, 0x0301, 0x65, 0x0300, 0},
{0x65, 0x65, 0x0300, 0x0301, 0},
{0x65, 0x0301, 0x65, 0x0300, 0x0301, 0},
{0x65, 0x0301, 0x0300, 0x65, 0x0300, 0x0301, 0},
{0x65, 0x0300, 0x65, 0x0300, 0x0301, 0},
{0x65, 0x0300, 0x0301, 0x65, 0x0300, 0x0301, 0}
/*00*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0000},
/*01*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0000},
/*02*/ {0x0065/*'e'*/, 0x0300, 0x0301, 0x0065/*'e'*/, 0x0000},
/*03*/ {0x0065/*'e'*/, 0x0300, 0x0065/*'e'*/, 0x0000},
/*04*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0000},
/*05*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0301, 0x0000},
/*06*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0301, 0x0000},
/*07*/ {0x0065/*'e'*/, 0x0300, 0x0301, 0x0065/*'e'*/, 0x0301, 0x0000},
/*08*/ {0x0065/*'e'*/, 0x0300, 0x0065/*'e'*/, 0x0301, 0x0000},
/*09*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0301, 0x0000},
/*0a*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0300, 0x0301, 0x0000},
/*0b*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0300, 0x0301, 0x0000},
/*0c*/ {0x0065/*'e'*/, 0x0300, 0x0301, 0x0065/*'e'*/, 0x0300, 0x0301, 0x0000},
/*0d*/ {0x0065/*'e'*/, 0x0300, 0x0065/*'e'*/, 0x0300, 0x0301, 0x0000},
/*0e*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0300, 0x0301, 0x0000},
/*0f*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0300, 0x0000},
/*10*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0300, 0x0000},
/*11*/ {0x0065/*'e'*/, 0x0300, 0x0301, 0x0065/*'e'*/, 0x0300, 0x0000},
/*12*/ {0x0065/*'e'*/, 0x0300, 0x0065/*'e'*/, 0x0300, 0x0000},
/*13*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0300, 0x0000},
/*14*/ {0x0065/*'e'*/, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000},
/*15*/ {0x0065/*'e'*/, 0x0301, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000},
/*16*/ {0x0065/*'e'*/, 0x0300, 0x0301, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000},
/*17*/ {0x0065/*'e'*/, 0x0300, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000},
/*18*/ {0x0065/*'e'*/, 0x0301, 0x0300, 0x0065/*'e'*/, 0x0301, 0x0300, 0x0000}
#if 0
/*00*/ {0x65, 0x65, 0},
/*01*/ {0x65, 0x0301, 0x65, 0},
/*02*/ {0x65, 0x0301, 0x0300, 0x65, 0},
/*03*/ {0x65, 0x0300, 0x65, 0},
/*04*/ {0x65, 0x0300, 0x0301, 0x65, 0},
/*05*/ {0x65, 0x65, 0x0301, 0},
/*06*/ {0x65, 0x0301, 0x65, 0x0301, 0},
/*07*/ {0x65, 0x0301, 0x0300, 0x65, 0x0301, 0},
/*08*/ {0x65, 0x0300, 0x65, 0x0301, 0},
/*09*/ {0x65, 0x0300, 0x0301, 0x65, 0x0301, 0},
/*0a*/ {0x65, 0x65, 0x0301, 0x0300, 0},
/*0b*/ {0x65, 0x0301, 0x65, 0x0301, 0x0300, 0},
/*0c*/ {0x65, 0x0301, 0x0300, 0x65, 0x0301, 0x0300, 0},
/*0d*/ {0x65, 0x0300, 0x65, 0x0301, 0x0300, 0},
/*0e*/ {0x65, 0x0300, 0x0301, 0x65, 0x0301, 0x0300, 0},
/*0f*/ {0x65, 0x65, 0x0300, 0},
/*10*/ {0x65, 0x0301, 0x65, 0x0300, 0},
/*11*/ {0x65, 0x0301, 0x0300, 0x65, 0x0300, 0},
/*12*/ {0x65, 0x0300, 0x65, 0x0300, 0},
/*13*/ {0x65, 0x0300, 0x0301, 0x65, 0x0300, 0},
/*14*/ {0x65, 0x65, 0x0300, 0x0301, 0},
/*15*/ {0x65, 0x0301, 0x65, 0x0300, 0x0301, 0},
/*16*/ {0x65, 0x0301, 0x0300, 0x65, 0x0300, 0x0301, 0},
/*17*/ {0x65, 0x0300, 0x65, 0x0300, 0x0301, 0},
/*18*/ {0x65, 0x0300, 0x0301, 0x65, 0x0300, 0x0301, 0}
#endif
};
const UChar CollationFrenchTest::testBugs[][CollationFrenchTest::MAX_TOKEN_LEN] =

11
icu4c/source/test/intltest/regcoll.cpp
View file

@ -481,11 +481,18 @@ void CollationRegressionTest::Test4066696(/* char* par */)
String[] tests = {
"\u00e0", "<", "\u01fa", // a-grave < A-ring-acute
};
should be:
String[] tests = {
"\u00e0", ">", "\u01fa", // a-grave < A-ring-acute
};
*/
static const UChar tests[][CollationRegressionTest::MAX_TOKEN_LEN] =
{
{0x00E0, 0}, {0x3c, 0}, {0x01FA, 0}
{0x00E0, 0}, {0x3e, 0}, {0x01FA, 0}
};
compareArray(*c, tests, ARRAY_LENGTH(tests));
@ -854,7 +861,7 @@ void CollationRegressionTest::Test4132736(/* char* par */)
static const UChar test1[][CollationRegressionTest::MAX_TOKEN_LEN] =
{
{0x65, 0x0300, 0x65, 0x0301, 0}, {0x3c, 0}, {0x65, 0x0301, 0x65, 0x0300, 0},
{0x65, 0x0300, 0x0301, 0}, {0x3e, 0}, {0x65, 0x0301, 0x0300, 0}
{0x65, 0x0300, 0x0301, 0}, {0x3c, 0}, {0x65, 0x0301, 0x0300, 0}
};
compareArray(*c, test1, ARRAY_LENGTH(test1));