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

ICU-5765 Fix windows-1252 partial surrogate conversion error behavior.

Browse Source 
X-SVN-Rev: 21951
This commit is contained in:
George Rhoten 2007-07-12 06:21:02 +00:00
parent 02840a5978
commit 7c46afb68c
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/src/com/ibm/icu/charset/CharsetEncoderICU.java
View File

@ -155,6 +155,9 @@ public abstract class CharsetEncoderICU extends CharsetEncoder {
*/
protected CoderResult encodeLoop(CharBuffer in, ByteBuffer out) {
if(!in.hasRemaining()){
// We were called a second time by the framework.
// We should have already handled this state.
fromUChar32 = 0;
return CoderResult.UNDERFLOW;
}
in.position(in.position()+fromUCountPending());
@ -163,6 +166,7 @@ public abstract class CharsetEncoderICU extends CharsetEncoder {
setSourcePosition(in);
return ret;
}
/**
* Implements ICU semantics of buffer management
* @param source

42
icu4j/src/com/ibm/icu/dev/test/charset/TestConversion.java
View File

@ -183,10 +183,8 @@ public class TestConversion extends ModuleTest {
}
logln("TestFromUnicode[" + cc.caseNr + "] " + cc.charset);
FromUnicodeCase(cc);
return;
}
private void FromUnicodeCase(ConversionCase cc) {
// create charset encoder for conversion test
@ -201,8 +199,14 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
logln("Skipping test:(" + cc.charset
+ ") due to ICU Charset not supported at this time");
// TODO implement loading of test data.
if (skipIfBeforeICU(3,7,2)) {
logln("Skipping test:(" + cc.charset
+ ") due to ICU Charset not supported at this time");
}
else {
errln(cc.charset + " was not found");
}
return;
}
@ -513,8 +517,15 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
logln("Skipping test:(" + cc.charset
+ ") due to ICU Charset not supported at this time");
// TODO implement loading of test data.
if (skipIfBeforeICU(3,7,2)) {
logln("Skipping test:(" + cc.charset
+ ") due to ICU Charset not supported at this time");
}
else {
errln(cc.charset + " was not found");
}
return;
}
@ -1000,17 +1011,12 @@ public class TestConversion extends ModuleTest {
len = len - target.position();
if (len != source.remaining()) {
if ((cc.caseNr == 6) && skipIfBeforeICU(3,7,2)) {
//TODO: remove when #5765 gets fixed
logln("Ticket#5765: output length does not match expected for charset: "+cc.charset+ " [" + cc.caseNr + "]");
} else {
errln("Test failed: output length does not match expected for charset: "+cc.charset+ " [" + cc.caseNr + "]");
}
logln("[" + cc.caseNr + "]:" + cc.charset);
logln("Input: " + printchars(CharBuffer.wrap(cc.unicode), cc.unicode.length()));
logln("Output: " + printbytes(target, len));
logln("Expected: " + printbytes(source, source.limit()));
logln("");
errln("Test failed: output length does not match expected for charset: "+cc.charset+ " [" + cc.caseNr + "]");
errln("[" + cc.caseNr + "]:" + cc.charset);
errln("Input: " + printchars(CharBuffer.wrap(cc.unicode), cc.unicode.length()));
errln("Output: " + printbytes(target, len));
errln("Expected: " + printbytes(source, source.limit()));
errln("");
return false;
}
source.rewind();