AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3189 test ucnv_fromUChars() and ucnv_toUChars() on ISO-2022-JP/CN with all-ASCII text

Browse Source 
X-SVN-Rev: 14073
This commit is contained in:
Markus Scherer 2003-12-10 05:54:05 +00:00
parent a1578a9fa1
commit 981c9d4701
2 changed files with 118 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
icu4c/source/test/intltest/convtest.cpp
View File

@ -749,6 +749,7 @@ ConversionTest::ToUnicodeCase(ConversionCase &cc, UConverterToUCallback callback
int32_t resultOffsets[200];
UChar result[200];
int32_t resultLength;
UBool ok;
static const struct {
int32_t step;
@ -768,7 +769,8 @@ ConversionTest::ToUnicodeCase(ConversionCase &cc, UConverterToUCallback callback
};
int32_t i, step;
for(i=0; i<LENGTHOF(steps); ++i) {
ok=TRUE;
for(i=0; i<LENGTHOF(steps) && ok; ++i) {
step=steps[i].step;
if(step<0 && !cc.finalFlush) {
// skip ucnv_getNextUChar() if !finalFlush because
@ -784,14 +786,11 @@ ConversionTest::ToUnicodeCase(ConversionCase &cc, UConverterToUCallback callback
result, LENGTHOF(result),
step==0 ? resultOffsets : NULL,
step, &errorCode);
if(!checkToUnicode(
ok=checkToUnicode(
cc, cnv, steps[i].name,
result, resultLength,
cc.offsets!=NULL ? resultOffsets : NULL,
errorCode)
) {
return FALSE;
}
errorCode);
if(U_FAILURE(errorCode) || !cc.finalFlush) {
// reset if an error occurred or we did not flush
// otherwise do nothing to make sure that flushing resets
@ -799,6 +798,43 @@ ConversionTest::ToUnicodeCase(ConversionCase &cc, UConverterToUCallback callback
}
}
// not a real loop, just a convenience for breaking out of the block
while(ok && cc.finalFlush) {
// test ucnv_toUChars()
memset(result, 0, sizeof(result));
errorCode=U_ZERO_ERROR;
resultLength=ucnv_toUChars(cnv,
result, LENGTHOF(result),
(const char *)cc.bytes, cc.bytesLength,
&errorCode);
ok=checkToUnicode(
cc, cnv, "toUChars",
result, resultLength,
NULL,
errorCode);
if(!ok) {
break;
}
// test preflighting
// keep the correct result for simple checking
errorCode=U_ZERO_ERROR;
resultLength=ucnv_toUChars(cnv,
NULL, 0,
(const char *)cc.bytes, cc.bytesLength,
&errorCode);
if(errorCode==U_STRING_NOT_TERMINATED_WARNING || errorCode==U_BUFFER_OVERFLOW_ERROR) {
errorCode=U_ZERO_ERROR;
}
ok=checkToUnicode(
cc, cnv, "preflight toUChars",
result, resultLength,
NULL,
errorCode);
break;
}
ucnv_close(cnv);
return TRUE;
}
@ -1019,6 +1055,7 @@ ConversionTest::FromUnicodeCase(ConversionCase &cc, UConverterFromUCallback call
int32_t resultOffsets[200];
char result[200];
int32_t resultLength;
UBool ok;
static const struct {
int32_t step;
@ -1031,7 +1068,8 @@ ConversionTest::FromUnicodeCase(ConversionCase &cc, UConverterFromUCallback call
};
int32_t i, step;
for(i=0; i<LENGTHOF(steps); ++i) {
ok=TRUE;
for(i=0; i<LENGTHOF(steps) && ok; ++i) {
step=steps[i].step;
if(step!=0) {
// bulk test is first, then offsets are not checked any more
@ -1042,14 +1080,11 @@ ConversionTest::FromUnicodeCase(ConversionCase &cc, UConverterFromUCallback call
result, LENGTHOF(result),
step==0 ? resultOffsets : NULL,
step, &errorCode);
if(!checkFromUnicode(
ok=checkFromUnicode(
cc, cnv, steps[i].name,
(uint8_t *)result, resultLength,
cc.offsets!=NULL ? resultOffsets : NULL,
errorCode)
) {
return FALSE;
}
errorCode);
if(U_FAILURE(errorCode) || !cc.finalFlush) {
// reset if an error occurred or we did not flush
// otherwise do nothing to make sure that flushing resets
@ -1057,6 +1092,43 @@ ConversionTest::FromUnicodeCase(ConversionCase &cc, UConverterFromUCallback call
}
}
// not a real loop, just a convenience for breaking out of the block
while(ok && cc.finalFlush) {
// test ucnv_fromUChars()
memset(result, 0, sizeof(result));
errorCode=U_ZERO_ERROR;
resultLength=ucnv_fromUChars(cnv,
result, LENGTHOF(result),
cc.unicode, cc.unicodeLength,
&errorCode);
ok=checkFromUnicode(
cc, cnv, "fromUChars",
(uint8_t *)result, resultLength,
NULL,
errorCode);
if(!ok) {
break;
}
// test preflighting
// keep the correct result for simple checking
errorCode=U_ZERO_ERROR;
resultLength=ucnv_fromUChars(cnv,
NULL, 0,
cc.unicode, cc.unicodeLength,
&errorCode);
if(errorCode==U_STRING_NOT_TERMINATED_WARNING || errorCode==U_BUFFER_OVERFLOW_ERROR) {
errorCode=U_ZERO_ERROR;
}
ok=checkFromUnicode(
cc, cnv, "preflight fromUChars",
(uint8_t *)result, resultLength,
NULL,
errorCode);
break;
}
ucnv_close(cnv);
return TRUE;
}

34
icu4c/source/test/testdata/conversion.txt vendored
View File

@ -43,6 +43,23 @@ conversion {
toUnicode {
Headers { "charset", "bytes", "unicode", "offsets", "flush", "fallbacks", "errorCode", "callback", "invalidChars" }
Cases {
// test that ISO-2022-JP encodes ASCII as itself
{
"ISO-2022-JP",
:bin{ 3f4041424344454647 },
"?@ABCDEFG",
:intvector{ 0,1,2,3,4,5,6,7,8 },
:int{1}, :int{1}, "", "?", :bin{""}
}
// test that ISO-2022-CN encodes ASCII as itself
{
"ISO-2022-CN",
:bin{ 3f4041424344454647 },
"?@ABCDEFG",
:intvector{ 0,1,2,3,4,5,6,7,8 },
:int{1}, :int{1}, "", "?", :bin{""}
}
// ISO-2022-KR
// truncated, partial escape sequence
@ -420,6 +437,23 @@ conversion {
fromUnicode {
Headers { "charset", "unicode", "bytes", "offsets", "flush", "fallbacks", "errorCode", "callback", "invalidUChars" }
Cases {
// test that ISO-2022-JP encodes ASCII as itself
{
"ISO-2022-JP",
"?@ABCDEFG",
:bin{ 3f4041424344454647 },
:intvector{ 0,1,2,3,4,5,6,7,8 },
:int{1}, :int{1}, "", "?", ""
}
// test that ISO-2022-CN encodes ASCII as itself
{
"ISO-2022-CN",
"?@ABCDEFG",
:bin{ 3f4041424344454647 },
:intvector{ 0,1,2,3,4,5,6,7,8 },
:int{1}, :int{1}, "", "?", ""
}
// moved from cintltst /tsconv/nccbtst/TestSkipCallBack
{
"iso-2022-jp",