organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-05 13:14:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

tests: Remove EE_PARSE_FULL_BUFFER

Browse source 
All tests now run one instance where SINGLE_BYTES is equivalent to a
single XML_Parse call. There is no longer a need for individual tests
to switch between them.
This commit is contained in:
Snild Dolkow 2023-09-29 13:00:02 +02:00
parent b3d14b0d3c
commit 29babedcab
3 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
expat/tests/basic_tests.c
View file

@ -4267,7 +4267,7 @@ START_TEST(test_ext_entity_latin1_utf16le_bom) {
/* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,
* 0x4c = L and 0x20 is a space
*/
"\xff\xfe\x4c\x20", 4, XCS("iso-8859-1"), NULL, EE_PARSE_NONE};
"\xff\xfe\x4c\x20", 4, XCS("iso-8859-1"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x00ff\x00feL ");
#else
@ -4298,7 +4298,7 @@ START_TEST(test_ext_entity_latin1_utf16be_bom) {
/* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,
* 0x4c = L and 0x20 is a space
*/
"\xfe\xff\x20\x4c", 4, XCS("iso-8859-1"), NULL, EE_PARSE_NONE};
"\xfe\xff\x20\x4c", 4, XCS("iso-8859-1"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x00fe\x00ff L");
#else
@ -4333,7 +4333,7 @@ START_TEST(test_ext_entity_latin1_utf16le_bom2) {
/* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,
* 0x4c = L and 0x20 is a space
*/
"\xff\xfe\x4c\x20", 4, XCS("iso-8859-1"), NULL, EE_PARSE_FULL_BUFFER};
"\xff\xfe\x4c\x20", 4, XCS("iso-8859-1"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x00ff\x00feL ");
#else
@ -4364,7 +4364,7 @@ START_TEST(test_ext_entity_latin1_utf16be_bom2) {
/* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,
* 0x4c = L and 0x20 is a space
*/
"\xfe\xff\x20\x4c", 4, XCS("iso-8859-1"), NULL, EE_PARSE_FULL_BUFFER};
"\xfe\xff\x20\x4c", 4, XCS("iso-8859-1"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x00fe\x00ff L");
#else
@ -4391,8 +4391,7 @@ START_TEST(test_ext_entity_utf16_be) {
" <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"
"]>\n"
"<doc>&en;</doc>";
ExtTest2 test_data
= {"<\0e\0/\0>\0", 8, XCS("utf-16be"), NULL, EE_PARSE_NONE};
ExtTest2 test_data = {"<\0e\0/\0>\0", 8, XCS("utf-16be"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x3c00\x6500\x2f00\x3e00");
#else
@ -4421,8 +4420,7 @@ START_TEST(test_ext_entity_utf16_le) {
" <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"
"]>\n"
"<doc>&en;</doc>";
ExtTest2 test_data
= {"\0<\0e\0/\0>", 8, XCS("utf-16le"), NULL, EE_PARSE_NONE};
ExtTest2 test_data = {"\0<\0e\0/\0>", 8, XCS("utf-16le"), NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\x3c00\x6500\x2f00\x3e00");
#else
@ -4476,7 +4474,7 @@ START_TEST(test_ext_entity_utf8_non_bom) {
"<doc>&en;</doc>";
ExtTest2 test_data
= {"\xef\xbb\x80", /* Arabic letter DAD medial form, U+FEC0 */
3, NULL, NULL, EE_PARSE_NONE};
3, NULL, NULL};
#ifdef XML_UNICODE
const XML_Char *expected = XCS("\xfec0");
#else
@ -4900,9 +4898,9 @@ START_TEST(test_entity_public_utf16_be) {
"\0]\0>\0\n"
/* <d>&j;</d> */
"\0<\0d\0>\0&\0j\0;\0<\0/\0d\0>";
ExtTest2 test_data = {/* <!ENTITY j 'baz'> */
"\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>",
34, NULL, NULL, EE_PARSE_NONE};
ExtTest2 test_data
= {/* <!ENTITY j 'baz'> */
"\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>", 34, NULL, NULL};
const XML_Char *expected = XCS("baz");
CharData storage;
@ -4932,9 +4930,9 @@ START_TEST(test_entity_public_utf16_le) {
"]\0>\0\n\0"
/* <d>&j;</d> */
"<\0d\0>\0&\0j\0;\0<\0/\0d\0>\0";
ExtTest2 test_data = {/* <!ENTITY j 'baz'> */
"<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>\0",
34, NULL, NULL, EE_PARSE_NONE};
ExtTest2 test_data
= {/* <!ENTITY j 'baz'> */
"<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>\0", 34, NULL, NULL};
const XML_Char *expected = XCS("baz");
CharData storage;

12
expat/tests/handlers.c
View file

@ -1147,15 +1147,9 @@ external_entity_loader2(XML_Parser parser, const XML_Char *context,
if (! XML_SetEncoding(extparser, test_data->encoding))
fail("XML_SetEncoding() ignored for external entity");
}
if (test_data->flags & EE_PARSE_FULL_BUFFER) {
if (XML_Parse(extparser, test_data->parse_text, test_data->parse_len,
XML_TRUE)
== XML_STATUS_ERROR) {
xml_failure(extparser);
}
} else if (_XML_Parse_SINGLE_BYTES(extparser, test_data->parse_text,
test_data->parse_len, XML_TRUE)
== XML_STATUS_ERROR) {
if (_XML_Parse_SINGLE_BYTES(extparser, test_data->parse_text,
test_data->parse_len, XML_TRUE)
== XML_STATUS_ERROR) {
xml_failure(extparser);
}

3
expat/tests/handlers.h
View file

@ -325,14 +325,11 @@ extern int XMLCALL external_entity_oneshot_loader(XML_Parser parser,
const XML_Char *systemId,
const XML_Char *publicId);
enum ee_parse_flags { EE_PARSE_NONE = 0x00, EE_PARSE_FULL_BUFFER = 0x01 };
typedef struct ExtTest2 {
const char *parse_text;
int parse_len;
const XML_Char *encoding;
CharData *storage;
enum ee_parse_flags flags;
} ExtTest2;
extern int XMLCALL external_entity_loader2(XML_Parser parser,