diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/internal/util/HanziToPinyinTest.java | 4 | ||||
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/internal/util/HanziToPinyinTest.java b/tests/AndroidTests/src/com/android/unit_tests/internal/util/HanziToPinyinTest.java index 8e1ff0b..71a8ea7 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/internal/util/HanziToPinyinTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/internal/util/HanziToPinyinTest.java @@ -17,6 +17,7 @@ package com.android.unit_tests.internal.util; import java.text.Collator; +import java.util.Arrays; import java.util.ArrayList; import java.util.Locale; @@ -37,6 +38,9 @@ public class HanziToPinyinTest extends TestCase { @SmallTest public void testGetToken() throws Exception { + if (!Arrays.asList(Collator.getAvailableLocales()).contains(Locale.CHINA)) { + return; + } ArrayList<Token> tokens = HanziToPinyin.getInstance().get(ONE_HANZI); assertEquals(tokens.size(), 1); assertEquals(tokens.get(0).type, Token.PINYIN); diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java index 297b963..506de83 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java @@ -95,7 +95,8 @@ public class FileFilter { ignoreResultList.add("http/tests/appcache/max-size.html"); // no layoutTestController.setAppCacheMaximumSize ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky ignoreResultList.add("http/tests/appcache/whitelist-wildcard.html"); // file not found - ignoreResultList.add("storage/database-lock-after-reload.html"); // failure + ignoreResultList.add("storage/database-lock-after-reload.html"); // Succeeds but DumpRenderTree does not read result correctly + ignoreResultList.add("storage/hash-change-with-xhr.html"); // Succeeds but DumpRenderTree does not read result correctly // Will always fail ignoreResultList.add("dom/svg/level3/xpath"); // XPath not supported @@ -116,6 +117,9 @@ public class FileFilter { ignoreResultList.add("fast/workers/shared-worker-shared.html"); // shared workers not supported ignoreResultList.add("fast/workers/shared-worker-simple.html"); // shared workers not supported ignoreResultList.add("fast/xpath"); // XPath not supported + ignoreResultList.add("storage/domstorage/localstorage/private-browsing-affects-storage.html"); // private browsing not supported + ignoreResultList.add("storage/domstorage/sessionstorage/private-browsing-affects-storage.html"); // private browsing not supported + ignoreResultList.add("storage/private-browsing-readonly.html"); // private browsing not supported // TODO: These need to be triaged ignoreResultList.add("fast/css/case-transform.html"); // will not fix #619707 @@ -189,9 +193,6 @@ public class FileFilter { ignoreResultList.add("fast/replaced/image-map.html"); // requires eventSender.mouseDown(),mouseUp() ignoreResultList.add("fast/text/plain-text-line-breaks.html"); // extra spacing because iFrames rendered next to each other on Apple ignoreResultList.add("profiler"); // profiler is not supported - ignoreResultList.add("storage/domstorage/localstorage/private-browsing-affects-storage.html"); // No notion of private browsing. - ignoreResultList.add("storage/domstorage/sessionstorage/private-browsing-affects-storage.html"); // No notion of private browsing. - ignoreResultList.add("storage/private-browsing-readonly.html"); // No notion of private browsing. ignoreResultList.add("svg"); // svg is not supported } |