From 400651ba7fd2f80155348ed39fc02e2aa9892fb9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 8 Nov 2017 14:25:59 +0200 Subject: Remove tests for character reference values unsupported by Xerces-C++ 3.2 It is actually unclear whether character references with more than 4 digits are valid. The XML spec seem to indicate they are but Xerces-C++ 3.2 serializer throws an invalid character reference exception (the parser appears to be able to handle them without problems). --- tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx | 2 +- tests/cxx/tree/encoding/char/iso-8859-1/test.std | 2 +- tests/cxx/tree/encoding/char/iso-8859-1/test.xml | 2 +- tests/cxx/tree/encoding/char/utf-8/driver.cxx | 6 ++---- tests/cxx/tree/encoding/char/utf-8/test.std | 2 -- tests/cxx/tree/encoding/char/utf-8/test.xml | 2 -- tests/cxx/tree/encoding/char/utf-8/test.xsd | 2 -- tests/cxx/tree/encoding/wchar/test.std | 6 +++--- tests/cxx/tree/encoding/wchar/test.xml | 6 +++--- tests/cxx/tree/encoding/wchar/test.xsd | 8 ++++---- 10 files changed, 15 insertions(+), 23 deletions(-) (limited to 'tests/cxx') diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx index 61a8f46..f622a54 100644 --- a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx +++ b/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx @@ -43,7 +43,7 @@ main (int argc, char* argv[]) if (s[0] != "abc" || s[1] != "\xE6" || s[2] != "\xA2\xA3\xA4\xA5" || - s[3] != "???") + s[3] != "??") { cerr << "invalid encoding" << endl; return 1; diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.std b/tests/cxx/tree/encoding/char/iso-8859-1/test.std index d26b30f..cb73faa 100644 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.std +++ b/tests/cxx/tree/encoding/char/iso-8859-1/test.std @@ -3,7 +3,7 @@ abc æ ¢£¤¥ - ??? + ?? abc aâc âòbc diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.xml b/tests/cxx/tree/encoding/char/iso-8859-1/test.xml index 9c9e752..cc05f8d 100644 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.xml +++ b/tests/cxx/tree/encoding/char/iso-8859-1/test.xml @@ -5,7 +5,7 @@ abc æ ¢£¤¥ - Āꪪ򪪪 + Āꪪ abc aâc diff --git a/tests/cxx/tree/encoding/char/utf-8/driver.cxx b/tests/cxx/tree/encoding/char/utf-8/driver.cxx index 53fef6a..abfff28 100644 --- a/tests/cxx/tree/encoding/char/utf-8/driver.cxx +++ b/tests/cxx/tree/encoding/char/utf-8/driver.cxx @@ -32,8 +32,7 @@ main (int argc, char* argv[]) if (s[0] != "abc" || s[1] != "\xD5\x95" || - s[2] != "\xEA\xAA\xAA" || - s[3] != "\xF2\xAA\xAA\xAA") + s[2] != "\xEA\xAA\xAA") { cerr << "invalid encoding" << endl; return 1; @@ -45,8 +44,7 @@ main (int argc, char* argv[]) if (s[0] != strenum::abc || s[1] != strenum::a_c || - s[2] != strenum::cxx_bc || - s[3] != strenum::ab_) + s[2] != strenum::cxx_bc) { cerr << "invalid encoding" << endl; return 1; diff --git a/tests/cxx/tree/encoding/char/utf-8/test.std b/tests/cxx/tree/encoding/char/utf-8/test.std index ffce337..fdfef4c 100644 --- a/tests/cxx/tree/encoding/char/utf-8/test.std +++ b/tests/cxx/tree/encoding/char/utf-8/test.std @@ -3,9 +3,7 @@ abc Օ ꪪ - 򪪪 abc aՕc ꪪbc - ab򪪪 diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xml b/tests/cxx/tree/encoding/char/utf-8/test.xml index a6e5d99..0d3e27a 100644 --- a/tests/cxx/tree/encoding/char/utf-8/test.xml +++ b/tests/cxx/tree/encoding/char/utf-8/test.xml @@ -5,11 +5,9 @@ abc Օ ꪪ - 򪪪 abc aՕc ꪪbc - ab򪪪 diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xsd b/tests/cxx/tree/encoding/char/utf-8/test.xsd index 6c32a32..d5ee868 100644 --- a/tests/cxx/tree/encoding/char/utf-8/test.xsd +++ b/tests/cxx/tree/encoding/char/utf-8/test.xsd @@ -9,7 +9,6 @@ abc aՕc ꪪbc - ab򪪪 @@ -17,7 +16,6 @@ - diff --git a/tests/cxx/tree/encoding/wchar/test.std b/tests/cxx/tree/encoding/wchar/test.std index 815ba6c..e0eaef0 100644 --- a/tests/cxx/tree/encoding/wchar/test.std +++ b/tests/cxx/tree/encoding/wchar/test.std @@ -2,9 +2,9 @@ abc ῿퟿ - 𐀀􏿽 + ကჿ abc a῿퟿c - 𐀀􏿽bc - ab𐀀􏿽 + ကჿbc + abကჿ diff --git a/tests/cxx/tree/encoding/wchar/test.xml b/tests/cxx/tree/encoding/wchar/test.xml index c6ec850..9abb1b6 100644 --- a/tests/cxx/tree/encoding/wchar/test.xml +++ b/tests/cxx/tree/encoding/wchar/test.xml @@ -4,11 +4,11 @@ abc ῿퟿ - 𐀀􏿽 + ကჿ abc a῿퟿c - 𐀀􏿽bc - ab𐀀􏿽 + ကჿbc + abကჿ diff --git a/tests/cxx/tree/encoding/wchar/test.xsd b/tests/cxx/tree/encoding/wchar/test.xsd index 0bf4bdd..0151d2f 100644 --- a/tests/cxx/tree/encoding/wchar/test.xsd +++ b/tests/cxx/tree/encoding/wchar/test.xsd @@ -8,16 +8,16 @@ Test enum. Valid values are: abc a῿퟿c - 𐀀􏿽bc - ab𐀀􏿽 + ကჿbc + abကჿ - - + + -- cgit v1.1