diff options
| author | Neil Fuller <nfuller@google.com> | 2016-09-20 13:48:05 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-09-20 13:59:43 +0100 |
| commit | 5f246fd1a2f707ac4b09e94abf9d6284d3ab3be9 (patch) | |
| tree | c0d98e895e3836066e533ec20c4ff82403f73883 | |
| parent | da50ef15b5daa820971caa691d258ded96019d79 (diff) | |
| download | icu-5f246fd1a2f707ac4b09e94abf9d6284d3ab3be9.tar.gz | |
Add missing test change for Unicode 9 / emoji change
commit da50ef15b5daa820971caa691d258ded96019d79 was missing
a test change.
Bug: 30652865
Test: Ran cts module CtsIcuTestCases
Change-Id: I9d851d15717a909acd11d08ce24064524e21c8ee
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/lang/UCharacterTest.java | 4 | ||||
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/lang/UCharacterTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/lang/UCharacterTest.java index 05e3ab064..8551643c1 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/lang/UCharacterTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/lang/UCharacterTest.java @@ -792,7 +792,9 @@ public final class UCharacterTest extends TestFmwk } byte bdir = (byte)dir; - if (UCharacter.getDirectionality(ch) != bdir) + // Android patch (http://b30652865/) start. + if (UCharacter.getDirectionality(ch) != bdir && !UNICODE9_BIDI_SET.contains(ch)) + // Android patch (http://b30652865/) end. { errln("FAIL \\u" + hex(ch) + " expected directionality " + bdir + " but got " + diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java index c9a004f87..12546d3f5 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java @@ -788,7 +788,9 @@ public final class UCharacterTest extends TestFmwk } byte bdir = (byte)dir; - if (UCharacter.getDirectionality(ch) != bdir) + // Android patch (http://b30652865/) start. + if (UCharacter.getDirectionality(ch) != bdir && !UNICODE9_BIDI_SET.contains(ch)) + // Android patch (http://b30652865/) end. { errln("FAIL \\u" + hex(ch) + " expected directionality " + bdir + " but got " + |