encoding.c: Support determining the string length for length < 0.

This commit is contained in:
Reece H. Dunn
2017-04-01 13:23:09 +01:00
parent b5ed1f28a5
commit 9dabf64680
4 changed files with 53 additions and 25 deletions
+38 -3
View File
@@ -736,11 +736,21 @@ test_char_decoder()
espeak_ng_TEXT_DECODER *decoder = create_text_decoder();
// null string
assert(text_decoder_decode_string(decoder, NULL, 5, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_decode_string(decoder, NULL, -1, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_eof(decoder) == 1);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
// string length
assert(text_decoder_decode_string(decoder, "aG", -1, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'a');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'G');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
destroy_text_decoder(decoder);
}
@@ -752,11 +762,12 @@ test_wchar_decoder()
espeak_ng_TEXT_DECODER *decoder = create_text_decoder();
// null string
assert(text_decoder_decode_wstring(decoder, NULL, 5) == ENS_OK);
assert(text_decoder_decode_wstring(decoder, NULL, -1) == ENS_OK);
assert(text_decoder_eof(decoder) == 1);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
// wide-character string
assert(text_decoder_decode_wstring(decoder, L"aG\xA0\x2045", 4) == ENS_OK);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'a');
@@ -768,6 +779,20 @@ test_wchar_decoder()
assert(text_decoder_getc(decoder) == 0x2045);
assert(text_decoder_eof(decoder) == 1);
// string length
assert(text_decoder_decode_wstring(decoder, L"aG\xA0\x2045", -1) == ENS_OK);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'a');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'G');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 0xA0);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 0x2045);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
destroy_text_decoder(decoder);
}
@@ -779,7 +804,7 @@ test_auto_decoder()
espeak_ng_TEXT_DECODER *decoder = create_text_decoder();
// null string
assert(text_decoder_decode_string_auto(decoder, NULL, 5, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_decode_string_auto(decoder, NULL, -1, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_eof(decoder) == 1);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
@@ -808,6 +833,16 @@ test_auto_decoder()
assert(text_decoder_getc(decoder) == 'f');
assert(text_decoder_eof(decoder) == 1);
// string length
assert(text_decoder_decode_string_auto(decoder, "aG", -1, ESPEAKNG_ENCODING_ISO_8859_1) == ENS_OK);
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'a');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 'G');
assert(text_decoder_eof(decoder) == 0);
assert(text_decoder_getc(decoder) == 0);
assert(text_decoder_eof(decoder) == 1);
destroy_text_decoder(decoder);
}