| commit | 6ba78219d8229d6c80a371c734d2ba089ecaf479 | [log] [tgz] |
|---|---|---|
| author | Fredrik Roubert <roubert@google.com> | Wed Mar 21 22:08:39 2018 +0100 |
| committer | Fredrik Roubert <roubert@google.com> | Wed Mar 21 22:15:50 2018 +0100 |
| tree | 252b5fb97eedbc930b67568b2a497401695939f0 | |
| parent | 531526ac66d7d9a8fd8803ab9feed0d2d0fb0618 [diff] |
Android patch: Amend: Increase timeout for TransliteratorTest#TestSourceTargetSet2 Remove Java 7 specific syntax from this local Android patch: https://android.googlesource.com/platform/external/icu/+/02a8b1c ICU4J is still built as Java 6, as specified here: https://android.googlesource.com/platform/external/icu/+/dcdfae8/icu4j/main/shared/build/common.properties#23 Using Java 7 specific syntax in ICU4J code breaks the ICU4J build, used for running the ICU4J test suite (ant check). Test: ant check Change-Id: Idb6ec602fa382367e75e078cd2fdc19866a5ea98
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java index 8f72f48..a9a63bd 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java
@@ -2994,7 +2994,7 @@ // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices // with the default. http://b/65468170 - @Test(timeout = 3_000_000L) + @Test(timeout = 3000000L) public void TestSourceTargetSet2() {
diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index 648dc5c..64327de 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java
@@ -2991,7 +2991,7 @@ // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices // with the default. http://b/65468170 - @Test(timeout = 3_000_000L) + @Test(timeout = 3000000L) public void TestSourceTargetSet2() {