organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8624 Fixed a collation key copression problem. A tertiary key value was incorrect with a long string when case first option is enabled.

Browse source 
X-SVN-Rev: 30219
This commit is contained in:
Yoshito Umaoka 2011-06-20 14:39:30 +00:00
parent 88e94ca0b0
commit 53aae67b42
2 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
View file

@ -4146,7 +4146,7 @@ public final class RuleBasedCollator extends Collator {
}
// Set the compression values
int total3 = m_top3_ - COMMON_BOTTOM_3_ - 1;
int total3 = m_top3_ - m_bottom3_ - 1;
// we multilply double with int, but need only int
m_topCount3_ = (int) (PROPORTION_3_ * total3);
m_bottomCount3_ = total3 - m_topCount3_;

58
icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationRegressionTest.java
View file

@ -1182,7 +1182,63 @@ public class CollationRegressionTest extends TestFmwk {
return sb;
}
/*
* Test case for ticket#8624
* Bad collation key with upper first option.
*/
public void TestCaseFirstCompression() {
RuleBasedCollator col = (RuleBasedCollator)Collator.getInstance(Locale.US);
// default
caseFirstCompressionSub(col);
// Upper first
col.setUpperCaseFirst(true);
caseFirstCompressionSub(col);
// Lower first
col.setLowerCaseFirst(true);
caseFirstCompressionSub(col);
}
/*
* Compare two strings - "aaa...A" and "aaa...a" with
* Collation#compare and CollationKey#compareTo, called from
* TestCaseFirstCompression.
*/
private void caseFirstCompressionSub(Collator col) {
final int maxLength = 50;
StringBuilder buf1 = new StringBuilder();
StringBuilder buf2 = new StringBuilder();
String str1, str2;
for (int n = 1; n < maxLength; n++) {
buf1.setLength(0);
buf2.setLength(0);
for (int i = 0; i < n - 1; i++) {
buf1.append('a');
buf2.append('a');
}
buf1.append('A');
buf2.append('a');
str1 = buf1.toString();
str2 = buf2.toString();
CollationKey key1 = col.getCollationKey(str1);
CollationKey key2 = col.getCollationKey(str2);
int cmpKey = key1.compareTo(key2);
int cmpCol = col.compare(str1, str2);
if ((cmpKey < 0 && cmpCol >= 0) || (cmpKey > 0 && cmpCol <= 0) || (cmpKey == 0 && cmpCol != 0)) {
errln("Inconsistent comparison: str1=" + str1 + ", str2=" + str2 + ", cmpKey=" + cmpKey + " , cmpCol=" + cmpCol);
}
}
}
/* RuleBasedCollator not subclassable
* @bug 4146160
//