diff options
| author | Fredrik Roubert <roubert@google.com> | 2017-02-15 18:15:41 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2017-02-15 21:48:53 +0100 |
| commit | 137142e3137e8360ba2add765d4cc4b3dc05b799 (patch) | |
| tree | bfb4815fb1f5752e8dc60968aed1898b8a790b38 /android_icu4j | |
| parent | 1643ae492f33ea93b6763f2f4a55ba4564520cc0 (diff) | |
| download | icu-137142e3137e8360ba2add765d4cc4b3dc05b799.tar.gz | |
Android patch: Amend: Increase timeout for Transliterator Test.
Remove Java 7 specific syntax from this local Android patch:
https://android.googlesource.com/platform/external/icu/+/394a854
ICU4J is still built as Java 6, as specified here:
https://android.googlesource.com/platform/external/icu/+/394a854/icu4j/main/shared/build/common.properties#25
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: Ie9864509f1fdd4494a470daedb6f43d398ec0114
Diffstat (limited to 'android_icu4j')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 a7c32ac62..312aedf11 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 @@ -165,7 +165,7 @@ public class TransliteratorTest extends TestFmwk { } // Android-changed: increase timeout. - @Test(timeout = 3_000_000L) + @Test(timeout = 3000000L) public void TestInstantiation() { long ms = System.currentTimeMillis(); String ID; |