organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 01:42:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9602 tell ICU4J to ignore conversion test data for good one-way mappings

Browse source 
X-SVN-Rev: 33249
This commit is contained in:
Markus Scherer 2013-02-16 00:16:09 +00:00
parent a1296b9947
commit dba8bad06b
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/test/intltest/convtest.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2010, International Business Machines
* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -652,11 +652,13 @@ ConversionTest::TestGetUnicodeSet2() {
UConverter *
ConversionTest::cnv_open(const char *name, UErrorCode &errorCode) {
if(name!=NULL && *name=='+') {
// Converter names that start with '+' are ignored in ICU4J tests.
++name;
}
if(name!=NULL && *name=='*') {
/* loadTestData(): set the data directory */
return ucnv_openPackage(loadTestData(errorCode), name+1, &errorCode);
} else if(name!=NULL && *name=='+') {
return ucnv_open((name+1), &errorCode);
} else {
return ucnv_open(name, &errorCode);
}

8
icu4c/source/test/testdata/conversion.txt vendored
View file

@ -1007,13 +1007,13 @@ conversion:table(nofallback) {
// Test ticket 9602: Add "good one-way" mapping type (|4).
// Such mappings are used regardless of the fallback flag.
{
"*test3", "##\uFE0E#\uFE0F",
"+*test3", "##\uFE0E#\uFE0F",
:bin{ 010204010204010204 }, :intvector{ 0,0,0,1,1,1,3,3,3 },
:int{1}, :int{0}, // no fallbacks
"", "?", ""
}
{
"*test3", "##\uFE0E#\uFE0F",
"+*test3", "##\uFE0E#\uFE0F",
:bin{ 010204010204010204 }, :intvector{ 0,0,0,1,1,1,3,3,3 },
:int{1}, :int{1}, // with fallbacks
"", "?", ""
@ -1850,13 +1850,13 @@ conversion:table(nofallback) {
// Test ticket 9602: Add "good one-way" mapping type (|4).
// Excluded from roundtrip set, included in the set with fallbacks.
{
"*test3",
"+*test3",
"[{#\uFE0F}]",
"[#{#\uFE0E}]",
:int{0}
}
{
"*test3",
"+*test3",
"[#{#\uFE0E}{#\uFE0F}]",
"[]",
:int{1}