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

ICU-2449 allow setting of subchar in data-driven conversion tests

Browse source 
X-SVN-Rev: 12664
This commit is contained in:
Markus Scherer 2003-07-24 00:16:27 +00:00
parent 2a53fc8a87
commit 8a10fff2ea
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,8 +159,9 @@ ConversionTest::TestFromUnicode() {
TestDataModule *dataModule;
TestData *testData;
const DataMap *testCase;
const UChar *p;
UErrorCode errorCode;
int32_t i;
int32_t i, length;
errorCode=U_ZERO_ERROR;
dataModule=TestDataModule::getTestDataModule("conversion", testLog, errorCode);
@ -204,6 +205,31 @@ ConversionTest::TestFromUnicode() {
}
s=testCase->getString("callback", errorCode);
// read NUL-separated subchar first, if any
length=u_strlen(p=s.getTerminatedBuffer());
if(++length<s.length()) {
// copy the subchar from Latin-1 characters
// start after the NUL
p+=length;
length=s.length()-length;
if(length>=sizeof(cc.subchar)) {
errorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else {
for(i=0; i<length; ++i) {
cc.subchar[i]=(char)p[i];
}
// NUL-terminate the subchar
cc.subchar[i]=0;
}
// remove the NUL and subchar from s
s.truncate(u_strlen(s.getBuffer()));
} else {
// no subchar
cc.subchar[0]=0;
}
s.extract(0, 0x7fffffff, cbopt, sizeof(cbopt), "");
cc.cbopt=cbopt;
switch(cbopt[0]) {
@ -775,6 +801,19 @@ ConversionTest::FromUnicodeCase(ConversionCase &cc, UConverterFromUCallback call
// TODO change with Jitterbug 2401, then add a similar call for toUnicode too
ucnv_setFallback(cnv, cc.fallbacks);
// set the subchar
int32_t length;
if((length=strlen(cc.subchar))!=0) {
ucnv_setSubstChars(cnv, cc.subchar, (int8_t)length, &errorCode);
if(U_FAILURE(errorCode)) {
errln("fromUnicode[%d](%s cb=\"%s\" fb=%d flush=%d) ucnv_setSubChars() failed - %s",
cc.caseNr, cc.charset, cc.cbopt, cc.fallbacks, cc.finalFlush, u_errorName(errorCode));
ucnv_close(cnv);
return FALSE;
}
}
int32_t resultOffsets[200];
char result[200];
int32_t resultLength;

1
icu4c/source/test/intltest/convtest.h
View file

@ -26,6 +26,7 @@
struct ConversionCase {
int32_t caseNr;
const char *charset, *cbopt, *name;
char subchar[8];
const uint8_t *bytes;
int32_t bytesLength;