summaryrefslogtreecommitdiffstats
path: root/harmony-tests/src/test/java
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Remove test for unsupported GregorianCalendar functionality.Narayan Kamath2014-05-121-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds an explanatory comment and makes the intent of the implementation clearer without changing any of the functionality. TL;DR - there doesn't appear to be any sensible way to provide any sort of consisent semantics if we plan on supporting these fields. bug: 12778197 Change-Id: Iadaaaa5d4bdddec4aceca498ffc870edf2cbefed
* | | | | am 3ac87904: am c2ec0af0: am f7892a21: Merge "Fix UnicodeBlockTest."Narayan Kamath2014-05-121-81/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3ac87904eeb5f902a02da18d2994fe87ae97bf6c': Fix UnicodeBlockTest.
| * | | | am c2ec0af0: am f7892a21: Merge "Fix UnicodeBlockTest."Narayan Kamath2014-05-121-81/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c2ec0af034d1f432c38b3bf61b03ea8c266921d1': Fix UnicodeBlockTest.
| | * | | Fix UnicodeBlockTest.Narayan Kamath2014-05-121-81/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove negative tests for blocks that weren't assigned in Java6 but are currently assigned. Those tests weren't very useful anyway, since this class must serve as a test of our ICU glue and not of the underlying ICU data. Also removes a test for the deprecated SURROGATES_AREA member which we don't support to remain consistent with ICU's treatment of blocks in patterns. bug: 12491302 Change-Id: I9301cab55913df635128fe77f820729c34aa6fe3
* | | | | resolved conflicts for merge of 2b6c9f55 to masterNarayan Kamath2014-05-121-5/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I7bd8df2f8679fe85bb95a371fc9cc564581fa29b
| * | | | resolved conflicts for merge of e111e5a4 to klp-modular-dev-plus-aospNarayan Kamath2014-05-121-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Iaf9c22378a35a0bd2d9e20c6afeb208c468234ab
| | * | | Blacklist a known failure in GregorianCalendarTest.Narayan Kamath2014-05-121-5/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issues here relate to how we deal with ambiguous wall clock times, i.e, wall clock values that we "skip" when we move the clock forward when transitioning into daylight savings, and wall clock times that occur twice when we move the clock backward This isn't a regression. We've never handled this correctly. bug: 12778197 Change-Id: Ida79583c02c6895096a8afdd8f59b1002b282d32
* | | | am 00c64297: am 469b6955: am 567dcb29: Merge "Fix various errors in ↵Narayan Kamath2014-05-091-19/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | FileURLConnectionTest." * commit '00c642971127aa804eca93bf770eb9802fb5a159': Fix various errors in FileURLConnectionTest.
| * | | am 469b6955: am 567dcb29: Merge "Fix various errors in FileURLConnectionTest."Narayan Kamath2014-05-091-19/+52
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '469b6955a8ee5039a61eb195a034684f513f6b21': Fix various errors in FileURLConnectionTest.
| | * | Fix various errors in FileURLConnectionTest.Narayan Kamath2014-05-091-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - First, the test was broken pretty badly. It would pass a Jar style URL to a FileURLConnection and expect it to work, this is out of spec and seems wrong in general (file:///foo.apk!resources/foo.txt). - The RI supports various "headers" on file URL connections (sigh). As if the getHeaderField(int) and getHeaderFieldKey(int) APIs weren't bad enough. This has now been implemented with a naive implementation. - Fixes FileURLConnection to populate a header map for information it provides (content length, content type etc.) bug: 11664881 Change-Id: I7a3e9aaa79bf125abbcfe8367574115ce54718e3
* | | | resolved conflicts for merge of 9687e46b to masterKenny Root2014-04-301-4/+11
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iaeaea9b44423257e8ccbcf631f40720d3035cecd
| * | | am 42db8377: am 15e6f173: am d353b8e2: am ddc91700: am 0a0379d4: am ↵Kenny Root2014-04-301-4/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 297a7de2: am 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit '42db8377fdd20cdff6cac1994b25382551270a26': JarFile: make test chain 3 long
| | * | am 15e6f173: am d353b8e2: am ddc91700: am 0a0379d4: am 297a7de2: am ↵Kenny Root2014-04-301-4/+16
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit '15e6f173de11133e1a61090635e350303ac0481a': JarFile: make test chain 3 long
| | * | | DO NOT MERGE Fix for ThreadGroup CTS test.Neil Fuller2014-04-251-527/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the test for UncaughtExceptionHandler. This was actually several tests in one. Each has been broken out. The ones that were failing were a result of the CTS test runner executing as an instrumented Android app. The default behavior (configured in com.android.internal.os.RuntimeInit) is to kill an app if an uncaught exception reaches the top-most handler. The solution was to set an alternative default UncaughtExceptionHandler on Thread to suppress this behavior for the duration of the test by installing an alternative handler. This handler could also then be used to confirm the ThreadGroup behavior of "if an exception is handled by the ThreadGroup hierarchy, use the Thread default UncaughtExceptionHandler". The functionality changes are in: 1) setUp()/tearDown() - installing, uninstalling the handler and removing a Thread.sleep(50). 2) test_uncaughtException_* methods split out. Additional tests were added and one was removed. 3) Tidied up test_list(), which was relying on particular thread names and would have used Thread.stop() (which is unimplemented) if those threads were found. The remaining changes were refactorings to pull out common code, remove unneccessary newlines / comments / semi-colons, reformat to 100 chars width, remove == true / == false conditions, delete dead code. All pure functions have been made static to make it clearer they have no side-effects. What remains is still not nice, but is improved and ~300 lines shorter. Bug: 13748422 (cherry picked from commit 071ba8eb49cc6ea63dc913aab145076dbeff0049) Change-Id: I995553a909974cb0bb6b9521a6a39fd0d6014a3f
* | | | | JarFile: remove tests for chainCheck hidden API, part 2Kenny Root2014-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hidden API was reverted since the fix is now in PackageManagerService. This was PS#2 of the original change, but didn't get uploaded. Bug: 13678484 Change-Id: Ic488ec5cd7c0d1bf6fb2d7aba16deaee8b6f98a5
* | | | | JarFile: remove tests for chainCheck hidden APIKenny Root2014-04-291-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hidden API was reverted since the fix is now in PackageManagerService. Bug: 13678484 Change-Id: I9b5478af9145df82eea01e768d02945f14524bf7
* | | | | am 8f5ff15d: am 97e35de3: Merge "1.7 interoperability changes for FileLock"Neil Fuller2014-04-292-0/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8f5ff15dc0428bbef5911776ae1f4d2730de4ed4': 1.7 interoperability changes for FileLock
| * | | | am 97e35de3: Merge "1.7 interoperability changes for FileLock"Neil Fuller2014-04-292-0/+16
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '97e35de30fcddd7eaa0d6eb7a100bcf9bdd824a1': 1.7 interoperability changes for FileLock
| | * | | 1.7 interoperability changes for FileLockNeil Fuller2014-04-292-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding acquiredBy(). This method is effectively a synonym for channel(). Change-Id: Ifa0b89debb42a7181f1f5f188ae7175970286adb
* | | | | am fee4f2a7: am edbc606d: Merge "SSLEngine: update harmony tests"Kenny Root2014-04-261-465/+193
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fee4f2a76db67900455049d81d241852ea6fb041': SSLEngine: update harmony tests
| * | | | am edbc606d: Merge "SSLEngine: update harmony tests"Kenny Root2014-04-261-465/+193
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'edbc606d8ff8a32d17f26da4d4fbfbe8e2363955': SSLEngine: update harmony tests
| | * | | SSLEngine: update harmony testsKenny Root2014-04-251-465/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old tests were broken and difficult to debug because of catching exceptions and calling fail() Change-Id: Idad6774e5f0839242b0667be1a25784b7ec70aef
* | | | | Merge "JarFile: Add tests for ambiguous chains"Kenny Root2014-04-231-0/+11
|\ \ \ \ \
| * | | | | JarFile: Add tests for ambiguous chainsKenny Root2014-04-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some chains using the old code will have incorrect splits between CodeSigner paths. Bug: 13678484 Change-Id: Ia77b7cbcde9394e0d48a6f082bbd1cdfd880d74b
* | | | | | am e9d51850: am 2e667679: Merge "Removal of a broken CTS test"Neil Fuller2014-04-231-29/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'e9d51850d10bac6ab5e2ba5a113d1b0b8e9ee198': Removal of a broken CTS test
| * | | | | am 2e667679: Merge "Removal of a broken CTS test"Neil Fuller2014-04-231-29/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '2e667679740a2a204b7f0566d2ba334b3fb2acc1': Removal of a broken CTS test
| | * | | | Merge "Removal of a broken CTS test"Neil Fuller2014-04-231-29/+0
| | |\ \ \ \
| | | * | | | Removal of a broken CTS testNeil Fuller2014-04-231-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of the failure is that the test asserts that the entrySet() Set from an UnmodifiableMap is Serializable, when it is not. The test fails under the RI as well so I have removed it. Bug: 11668227 Change-Id: Ife3ce848f77d6f63931852792e0f6f0db83382a8
* | | | | | | am 50765f55: am 5f38b08c: Merge "Fix for ThreadGroup CTS test."Neil Fuller2014-04-231-527/+212
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | * commit '50765f55fc3cc18d7b8aa40113935c6d3419aab0': Fix for ThreadGroup CTS test.
| * | | | | am 5f38b08c: Merge "Fix for ThreadGroup CTS test."Neil Fuller2014-04-231-527/+212
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5f38b08cb74495fbab7b541040de3248a3d49593': Fix for ThreadGroup CTS test.
| | * | | | Fix for ThreadGroup CTS test.Neil Fuller2014-04-231-527/+212
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the test for UncaughtExceptionHandler. This was actually several tests in one. Each has been broken out. The ones that were failing were a result of the CTS test runner executing as an instrumented Android app. The default behavior (configured in com.android.internal.os.RuntimeInit) is to kill an app if an uncaught exception reaches the top-most handler. The solution was to set an alternative default UncaughtExceptionHandler on Thread to suppress this behavior for the duration of the test by installing an alternative handler. This handler could also then be used to confirm the ThreadGroup behavior of "if an exception is handled by the ThreadGroup hierarchy, use the Thread default UncaughtExceptionHandler". The functionality changes are in: 1) setUp()/tearDown() - installing, uninstalling the handler and removing a Thread.sleep(50). 2) test_uncaughtException_* methods split out. Additional tests were added and one was removed. 3) Tidied up test_list(), which was relying on particular thread names and would have used Thread.stop() (which is unimplemented) if those threads were found. The remaining changes were refactorings to pull out common code, remove unneccessary newlines / comments / semi-colons, reformat to 100 chars width, remove == true / == false conditions, delete dead code. All pure functions have been made static to make it clearer they have no side-effects. What remains is still not nice, but is improved and ~300 lines shorter. Bug: 13748422 Change-Id: I995553a909974cb0bb6b9521a6a39fd0d6014a3f
* | | | | Add tests for getCodeSignersKenny Root2014-04-221-16/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: I2bf7449eb72319a547abfd439cabfcc41982d668
* | | | | am 5978b692: am 0779dcac: am 008fbfd0: am a317f758: am ced71a50: am ↵Kenny Root2014-04-221-0/+58
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 99a25a47: am 5321ebb7: am 6d949cbf: am 951aa4f4: am 531968cf: am cb11b9ff: Tests for API to check certificate chain signatures * commit '5978b69274677753bc3049b4dc89625291a66912': Tests for API to check certificate chain signatures
| * | | | am 0779dcac: am 008fbfd0: am a317f758: am ced71a50: am 99a25a47: am ↵Kenny Root2014-04-221-0/+58
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | 5321ebb7: am 6d949cbf: am 951aa4f4: am 531968cf: am cb11b9ff: Tests for API to check certificate chain signatures * commit '0779dcac1bdc0d6d02ef6e4843a312aa03081f03': Tests for API to check certificate chain signatures
| | * | am 008fbfd0: am a317f758: am ced71a50: am 99a25a47: am 5321ebb7: am ↵Kenny Root2014-04-221-0/+58
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | 6d949cbf: am 951aa4f4: am 531968cf: am cb11b9ff: Tests for API to check certificate chain signatures * commit '008fbfd0ff37cb88047825d56d2116d0f62b69a5': Tests for API to check certificate chain signatures
| | | * Clean up CharsetDecoder and CharsetEncoder.Elliott Hughes2013-11-086-112/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also fixes a few bugs, and a few test bugs, and then the bugs exposed by fixing those tests. (cherry picked from commit 6ad37f500b023ef09fd177ad8cd8e2ba0b842cae) Change-Id: Ia58d30e414cc59c27a1d259e8056523d6df2c6bc
| | | * Fix java.util.Scanner bugs.Elliott Hughes2013-08-201-1074/+967
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improve the documentation for java.util.regex.Matcher and unify the Scanner tests. Bug: 10310707 Bug: https://code.google.com/p/android/issues/detail?id=40555 (cherry picked from commit 56ff05b16d4a82bc2386082409c78c3d94e0df01) Change-Id: I4d7ff44a77768821970c9bab560d5facdb75e1b9
| | | * Fix a bunch of Charset tests.Elliott Hughes2013-08-164-1370/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isRegistered test is still failing. The problem is that icu4c's convrtrs.txt has names like "windows-1252" that are both the canonical name for one charset and an alias for another legacy charset. I need to work out how to resolve that. Bug: 10210999 (cherry picked from commit ea1caf4ccc5c2255f384c0774aa9e055763a6a41) Change-Id: I83cf1b9ae1d29f9956f443ef914a3e473e0f4692
| | | * More Charset test fixes.Elliott Hughes2013-08-141-72/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10210999 (cherry picked from commit c44b103bfd1a79762811d2125e9b94ce37300a44) Change-Id: If28d9e2eb3d1d148863f0a08c1e17371918fcaa2
| | * | DO NOT MERGE Fix another set of file related tests.Narayan Kamath2014-04-0712-401/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get rid of Support_PlatformFile, use File.createTempFile instead. - Replace numerous uses of "user.dir" / "user.home" etc. with File.createTempFile - Replace calls to Process / chmod with Libcore.os.chmod. The calls wouldn't have worked anyway, since chmod on android doesn't understand the incremental (+w, -x) syntax. (cherry picked from commit 2b7c83942a5e28c53698232182193d5118028e6c) Bug: 13763685 Bug: 13763900 Change-Id: Ic6944568bbee6a548da6dcb4364b882636f2959f
| | * | DO NOT MERGE Fix PropertiesTest.Narayan Kamath2014-04-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test case was using HashTable.get instead of Properties.getProperty. The problem is that Properties.propertyNames will enumerate all properties from the object as well as from the "default" Properties object it was constructed with. The get method derived from HashTable isn't aware of default properties though, so it will fail. Using composition instead of inheritance would've resulted in a cleaner design. (cherry picked from commit 79395265fdd07388849b16695c437583415b7a6b) Bug: 13763685 Bug: 13763900 Change-Id: I58323767e6872ed1722167d2a4a6d89a98d26ec7
| | * | DO NOT MERGE Fix for ClassLoaderTest under CTSNeil Fuller2014-04-072-61/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests could not work given the arrangement of classloaders in Android apps. This also fixes a known failure case in ClassLoaderTest which was due to missing resources. Also updated ClassTest. (cherry picked from commit 63291dd98b3df687d87c7a95b8813e1cd75f3715) Change-Id: I114aa9b1a177911aed0aef87819d93a260f0b8d1 Bug: 12491655
| | * | DO NOT MERGE Fix broken CTS HttpCookie testNeil Fuller2014-04-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some test cases and corrected the test to conform to the RI behavior. (cherry picked from commit 154d3fb470158aa01cae000781d0d65cf4c186dd) Change-Id: Ib32baf2e923c50fca1a5a4cb7cbd7f55ed70e760 Bug: 13748507
| | * | Tidy up Console, fix ConsoleTestNarayan Kamath2014-02-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a more specific exception type. The use of IOException led me to believe that the constructor was performing i/o ops on the underlying file descriptors. (They were not.) - Delete a test that asserted that System.console() was always non-null. It will be non-null only for command line apps (tests run from vogar), and not for "regular" android apps (tests run from CTS) because stdin / stdout will not be TTY devices regular apps. bug: 12490236 (cherry-picked from 7fbd82c654d1ad2348769b9340a1181abfa98fe9) Change-Id: I8c1e37bcb21de5862dc8ea198852995a020437a7
* | | | am 5c3502f3: am 0d18ebc5: Merge "Change DecimalFormat.setRoundingMode() ↵Neil Fuller2014-04-221-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | behavior to stay in spec" * commit '5c3502f3d13ef2bebdeba86b9d7839ad834ce583': Change DecimalFormat.setRoundingMode() behavior to stay in spec
| * | | Merge "Change DecimalFormat.setRoundingMode() behavior to stay in spec"Neil Fuller2014-04-221-2/+2
| |\ \ \
| | * | | Change DecimalFormat.setRoundingMode() behavior to stay in specNeil Fuller2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The serialization tests revealed that some DecimalFormat instances could not be round-tripped. The reason is that the setRoundingMode() method was setting a non-zero rounding increment, which cannot be persisted, and also creates patterns that are outside of the DecimalFormat spec. Addressed the fact that ICU4C appears to support RoundingMode.UNNECESSARY now by deleting special-case code. Changed SerializationStressTest to use canonical DecimalFormat patterns: The ones chosen had a couple things that were not ideal: 1) Putting '-' in quotes causes ICU (for non-obvious reasons) treat the negative pattern prefix as not being default. Default in this case means "the positive prefix with a preceding '-'. Removing the quotes meant it would recognize the pattern as not needing everything after ;., so the pattern would be shrunk. 2) The positive pattern was also not one ICU could deal with fully. ICU changed "#.#" to "#0.#" at parse time (which can be corrected with a setMinimumIntegerDigits(0)). It's not clear why ICU cannot deal with parsing "#.#" when it can produce it, but there is a long comment in decimfmt.cc suggesting it is intentional and to avoid format producing empty strings. The pattern has been changed to one that ICU can handle and would choose when the various serialized fields are read back. This is necessary because NativeDecimalFormat compares the patterns and not just the serialized fields. Leaving the pattern check part of equals() means that two non-spec patterns will not be considered equal(), which is important while Android allows non-spec patterns. Restricting support in DecimalFormat to the documented subset of characters is not worth the effort and may cause problems elsewhere. Change-Id: I2de588458b86619733c0dc1692d526f179059910 Bug: 11668227
* | | | | am 2f727a24: am 2704e87d: Merge "Allow empty rules in a RuleBasedCollator."Elliott Hughes2014-04-221-9/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2f727a24d92062997e71f1067b2d4ad589c4e58c': Allow empty rules in a RuleBasedCollator.
| * | | | Allow empty rules in a RuleBasedCollator.Elliott Hughes2014-04-211-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is allowed by the CLDR specification, and we were already allowing most forms of empty rules, just not the zero-length string. Change-Id: I3c2a020aac23e54f8044defbfe2e2a5b600e454c
* | | | | am 3df173cd: am 5d51965a: Merge "Update collation tests for icu4c 53."Elliott Hughes2014-04-223-58/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3df173cd6c2e73219c754dbb80be5a362f2e8f54': Update collation tests for icu4c 53.