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

ICU-12985 undo ICU 59 mix-version test hacks; 0860..086F now defaults to AL

Browse source 
X-SVN-Rev: 40081
This commit is contained in:
Markus Scherer 2017-04-26 22:10:48 +00:00
parent edce2be62c
commit 9e9bfda19c
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/test/cintltst/cucdtst.c
View file

@ -1017,12 +1017,9 @@ unicodeDataLineFn(void *context,
/* get BiDi category, field 4 */
*fields[4][1]=0;
i=MakeDir(fields[4][0]);
#if U_ICU_VERSION_MAJOR_NUM!=59
// TODO: Remove this version check, see ticket #13061.
if(i!=u_charDirection(c) || i!=u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)) {
log_err("error: u_charDirection(U+%04lx)==%u instead of %u (%s)\n", c, u_charDirection(c), MakeDir(fields[4][0]), fields[4][0]);
}
#endif
/* get Decomposition_Type & Decomposition_Mapping, field 5 */
d=NULL;
@ -1220,6 +1217,8 @@ enumDefaultsRange(const void *context, UChar32 start, UChar32 limit, UCharCatego
{ 0x0590, U_LEFT_TO_RIGHT },
{ 0x0600, U_RIGHT_TO_LEFT },
{ 0x07C0, U_RIGHT_TO_LEFT_ARABIC },
{ 0x0860, U_RIGHT_TO_LEFT },
{ 0x0870, U_RIGHT_TO_LEFT_ARABIC }, // Unicode 10 changes U+0860..U+086F from R to AL.
{ 0x08A0, U_RIGHT_TO_LEFT },
{ 0x0900, U_RIGHT_TO_LEFT_ARABIC }, /* Unicode 6.1 changes U+08A0..U+08FF from R to AL */
{ 0x20A0, U_LEFT_TO_RIGHT },
@ -1277,15 +1276,12 @@ enumDefaultsRange(const void *context, UChar32 start, UChar32 limit, UCharCatego
shouldBeDir=(UCharDirection)defaultBidi[i][1];
}
#if U_ICU_VERSION_MAJOR_NUM!=59
// TODO: Remove this version check, see ticket #13061.
if( u_charDirection(c)!=shouldBeDir ||
u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)!=shouldBeDir
) {
log_err("error: u_charDirection(unassigned/PUA U+%04lx)=%s should be %s\n",
c, dirStrings[u_charDirection(c)], dirStrings[shouldBeDir]);
}
#endif
++c;
}
}

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
View file

@ -1542,6 +1542,8 @@ public final class UCharacterTest extends TestFmwk
{ 0x0590, UCharacterDirection.LEFT_TO_RIGHT },
{ 0x0600, UCharacterDirection.RIGHT_TO_LEFT },
{ 0x07C0, UCharacterDirection.RIGHT_TO_LEFT_ARABIC },
{ 0x0860, UCharacterDirection.RIGHT_TO_LEFT },
{ 0x0870, UCharacterDirection.RIGHT_TO_LEFT_ARABIC }, // Unicode 10 changes U+0860..U+086F from R to AL.
{ 0x08A0, UCharacterDirection.RIGHT_TO_LEFT },
{ 0x0900, UCharacterDirection.RIGHT_TO_LEFT_ARABIC }, /* Unicode 6.1 changes U+08A0..U+08FF from R to AL */
{ 0x20A0, UCharacterDirection.LEFT_TO_RIGHT },
@ -1635,8 +1637,6 @@ public final class UCharacterTest extends TestFmwk
shouldBeDir=defaultBidi[i][1];
}
// TODO: Remove this version check, see ticket #13061.
if (VersionInfo.ICU_VERSION.getMajor() != 59)
if (UCharacter.getDirection(c) != shouldBeDir
|| UCharacter.getIntPropertyValue(c,
UProperty.BIDI_CLASS)