From 5e527213a2430bb3018e5eebd909aef294edf9b5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 18 Dec 2020 18:48:46 +0300 Subject: Switch to build2 --- .../cxx/tree/encoding/char/iso-8859-1/buildfile | 25 ++++++++ .../cxx/tree/encoding/char/iso-8859-1/driver.cxx | 74 ++++++++++++++++++++++ xsd-tests/cxx/tree/encoding/char/iso-8859-1/output | 10 +++ .../cxx/tree/encoding/char/iso-8859-1/test.xml | 14 ++++ .../cxx/tree/encoding/char/iso-8859-1/test.xsd | 31 +++++++++ xsd-tests/cxx/tree/encoding/char/lcp/buildfile | 24 +++++++ xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx | 40 ++++++++++++ xsd-tests/cxx/tree/encoding/char/lcp/output | 4 ++ xsd-tests/cxx/tree/encoding/char/lcp/test.xml | 7 ++ xsd-tests/cxx/tree/encoding/char/lcp/test.xsd | 12 ++++ xsd-tests/cxx/tree/encoding/char/utf-8/buildfile | 24 +++++++ xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx | 63 ++++++++++++++++++ xsd-tests/cxx/tree/encoding/char/utf-8/output | 9 +++ xsd-tests/cxx/tree/encoding/char/utf-8/test.xml | 13 ++++ xsd-tests/cxx/tree/encoding/char/utf-8/test.xsd | 31 +++++++++ xsd-tests/cxx/tree/encoding/wchar/buildfile | 25 ++++++++ xsd-tests/cxx/tree/encoding/wchar/driver.cxx | 55 ++++++++++++++++ xsd-tests/cxx/tree/encoding/wchar/output | 10 +++ xsd-tests/cxx/tree/encoding/wchar/test.xml | 14 ++++ xsd-tests/cxx/tree/encoding/wchar/test.xsd | 33 ++++++++++ 20 files changed, 518 insertions(+) create mode 100644 xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile create mode 100644 xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx create mode 100644 xsd-tests/cxx/tree/encoding/char/iso-8859-1/output create mode 100644 xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xml create mode 100644 xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xsd create mode 100644 xsd-tests/cxx/tree/encoding/char/lcp/buildfile create mode 100644 xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx create mode 100644 xsd-tests/cxx/tree/encoding/char/lcp/output create mode 100644 xsd-tests/cxx/tree/encoding/char/lcp/test.xml create mode 100644 xsd-tests/cxx/tree/encoding/char/lcp/test.xsd create mode 100644 xsd-tests/cxx/tree/encoding/char/utf-8/buildfile create mode 100644 xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx create mode 100644 xsd-tests/cxx/tree/encoding/char/utf-8/output create mode 100644 xsd-tests/cxx/tree/encoding/char/utf-8/test.xml create mode 100644 xsd-tests/cxx/tree/encoding/char/utf-8/test.xsd create mode 100644 xsd-tests/cxx/tree/encoding/wchar/buildfile create mode 100644 xsd-tests/cxx/tree/encoding/wchar/driver.cxx create mode 100644 xsd-tests/cxx/tree/encoding/wchar/output create mode 100644 xsd-tests/cxx/tree/encoding/wchar/test.xml create mode 100644 xsd-tests/cxx/tree/encoding/wchar/test.xsd (limited to 'xsd-tests/cxx/tree/encoding') diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile new file mode 100644 index 0000000..bdea527 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile @@ -0,0 +1,25 @@ +# file : cxx/tree/encoding/char/iso-8859-1/buildfile +# license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +import libs = libxsd%lib{xsd} +import libs += libxerces-c%lib{xerces-c} + +exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs + +exe{driver}: xml{test}: test.input = true +exe{driver}: file{output}: test.stdout = true + +<{hxx ixx cxx}{test}>: xsd{test} $xsd +{{ + diag xsd ($<[0]) # @@ TMP + + $xsd cxx-tree --std c++11 \ + --generate-inline \ + --generate-serialization \ + --char-encoding iso8859-1 \ + --generate-doxygen \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx new file mode 100644 index 0000000..e356815 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx @@ -0,0 +1,74 @@ +// file : cxx/tree/encoding/char/iso-8859-1/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test ISO-8859-1 encoding. +// + +#include // std::auto_ptr/unique_ptr +#include +#include + +#include "test.hxx" + +using namespace std; +using namespace test; + +int +main (int argc, char* argv[]) +{ + if (argc != 2) + { + cerr << "usage: " << argv[0] << " test.xml" << endl; + return 1; + } + + try + { + try + { + root (argv[1]); + return 1; + } + catch (xsd::cxx::xml::iso8859_1_unrepresentable const&) + { + } + + xsd::cxx::xml::char_transcoder::unrep_char ('?'); + XSD_AUTO_PTR r (root (argv[1])); + + { + type::a_sequence const& s (r->a ()); + + if (s[0] != "abc" || + s[1] != "\xE6" || + s[2] != "\xA2\xA3\xA4\xA5" || + s[3] != "??") + { + cerr << "invalid encoding" << endl; + return 1; + } + } + + { + type::b_sequence const& s (r->b ()); + + if (s[0] != strenum::abc || + s[1] != strenum::a_c || + s[2] != strenum::cxx__bc) + { + cerr << "invalid encoding" << endl; + return 1; + } + } + + xml_schema::namespace_infomap map; + map["t"].name = "test"; + + root (std::cout, *r, map, "ISO-8859-1"); + } + catch (xml_schema::exception const& e) + { + cerr << "xml_schema::exception: " << e.what () << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/output b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/output new file mode 100644 index 0000000..cb73faa --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/output @@ -0,0 +1,10 @@ + + + abc + æ + ¢£¤¥ + ?? + abc + aâc + âòbc + diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xml b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xml new file mode 100644 index 0000000..cc05f8d --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xml @@ -0,0 +1,14 @@ + + + abc + æ + ¢£¤¥ + Āꪪ + + abc + aâc + âòbc + + diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xsd b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xsd new file mode 100644 index 0000000..31b8901 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/test.xsd @@ -0,0 +1,31 @@ + + + + + + + + Test enum. Valid values are: + abc + aâc + òbc + + + + + + + + + + + + + + + + + + + + diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile new file mode 100644 index 0000000..d935b09 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile @@ -0,0 +1,24 @@ +# file : cxx/tree/encoding/char/lcp/buildfile +# license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +import libs = libxsd%lib{xsd} +import libs += libxerces-c%lib{xerces-c} + +exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs + +exe{driver}: xml{test}: test.input = true +exe{driver}: file{output}: test.stdout = true + +<{hxx ixx cxx}{test}>: xsd{test} $xsd +{{ + diag xsd ($<[0]) # @@ TMP + + $xsd cxx-tree --std c++11 \ + --generate-inline \ + --generate-serialization \ + --char-encoding lcp \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx b/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx new file mode 100644 index 0000000..97c0875 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx @@ -0,0 +1,40 @@ +// file : cxx/tree/encoding/char/lcp/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test local code page encoding (--char-encoding lcp). +// The test just makes sure it still compiles and works. +// + +#include // std::auto_ptr/unique_ptr +#include +#include + +#include "test.hxx" + +using namespace std; +using namespace test; + +int +main (int argc, char* argv[]) +{ + if (argc != 2) + { + cerr << "usage: " << argv[0] << " test.xml" << endl; + return 1; + } + + try + { + XSD_AUTO_PTR r (root (argv[1])); + + xml_schema::namespace_infomap map; + map["t"].name = "test"; + + root (std::cout, *r, map); + } + catch (xml_schema::exception const& e) + { + cerr << "xml_schema::exception: " << e.what () << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/output b/xsd-tests/cxx/tree/encoding/char/lcp/output new file mode 100644 index 0000000..368826d --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/lcp/output @@ -0,0 +1,4 @@ + + + abcd + diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/test.xml b/xsd-tests/cxx/tree/encoding/char/lcp/test.xml new file mode 100644 index 0000000..772512e --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/lcp/test.xml @@ -0,0 +1,7 @@ + + + abcd + + diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/test.xsd b/xsd-tests/cxx/tree/encoding/char/lcp/test.xsd new file mode 100644 index 0000000..1e264e3 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/lcp/test.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile new file mode 100644 index 0000000..4d48165 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile @@ -0,0 +1,24 @@ +# file : cxx/tree/encoding/char/utf-8/buildfile +# license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +import libs = libxsd%lib{xsd} +import libs += libxerces-c%lib{xerces-c} + +exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs + +exe{driver}: xml{test}: test.input = true +exe{driver}: file{output}: test.stdout = true + +<{hxx ixx cxx}{test}>: xsd{test} $xsd +{{ + diag xsd ($<[0]) # @@ TMP + + $xsd cxx-tree --std c++11 \ + --generate-inline \ + --generate-serialization \ + --generate-doxygen \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx new file mode 100644 index 0000000..7892667 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx @@ -0,0 +1,63 @@ +// file : cxx/tree/encoding/char/utf-8/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test UTF-8 encoding. +// + +#include // std::auto_ptr/unique_ptr +#include +#include + +#include "test.hxx" + +using namespace std; +using namespace test; + +int +main (int argc, char* argv[]) +{ + if (argc != 2) + { + cerr << "usage: " << argv[0] << " test.xml" << endl; + return 1; + } + + try + { + XSD_AUTO_PTR r (root (argv[1])); + + { + type::a_sequence const& s (r->a ()); + + if (s[0] != "abc" || + s[1] != "\xD5\x95" || + s[2] != "\xEA\xAA\xAA") + { + cerr << "invalid encoding" << endl; + return 1; + } + } + + { + type::b_sequence const& s (r->b ()); + + if (s[0] != strenum::abc || + s[1] != strenum::a_c || + s[2] != strenum::cxx_bc) + { + cerr << "invalid encoding" << endl; + return 1; + } + } + + xml_schema::namespace_infomap map; + map["t"].name = "test"; + + root (std::cout, *r, map, "ASCII"); + } + catch (xml_schema::exception const& e) + { + cerr << "xml_schema::exception: " << e.what () << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/output b/xsd-tests/cxx/tree/encoding/char/utf-8/output new file mode 100644 index 0000000..fdfef4c --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/output @@ -0,0 +1,9 @@ + + + abc + Օ + ꪪ + abc + aՕc + ꪪbc + diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/test.xml b/xsd-tests/cxx/tree/encoding/char/utf-8/test.xml new file mode 100644 index 0000000..0d3e27a --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/test.xml @@ -0,0 +1,13 @@ + + + abc + Օ + ꪪ + + abc + aՕc + ꪪbc + + diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/test.xsd b/xsd-tests/cxx/tree/encoding/char/utf-8/test.xsd new file mode 100644 index 0000000..d5ee868 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/test.xsd @@ -0,0 +1,31 @@ + + + + + + + + Test enum. Valid values are: + abc + aՕc + ꪪbc + + + + + + + + + + + + + + + + + + + + diff --git a/xsd-tests/cxx/tree/encoding/wchar/buildfile b/xsd-tests/cxx/tree/encoding/wchar/buildfile new file mode 100644 index 0000000..f640976 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/wchar/buildfile @@ -0,0 +1,25 @@ +# file : cxx/tree/encoding/wchar/buildfile +# license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +import libs = libxsd%lib{xsd} +import libs += libxerces-c%lib{xerces-c} + +exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs + +exe{driver}: xml{test}: test.input = true +exe{driver}: file{output}: test.stdout = true + +<{hxx ixx cxx}{test}>: xsd{test} $xsd +{{ + diag xsd ($<[0]) # @@ TMP + + $xsd cxx-tree --std c++11 \ + --generate-inline \ + --generate-serialization \ + --char-type wchar_t \ + --generate-doxygen \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx new file mode 100644 index 0000000..dbcbcba --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx @@ -0,0 +1,55 @@ +// file : cxx/tree/encoding/wchar/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test the wide character mapping. +// + +#include // std::auto_ptr/unique_ptr +#include +#include + +#include "test.hxx" + +using namespace std; +using namespace test; + +int +main (int argc, char* argv[]) +{ + if (argc != 2) + { + cerr << "usage: " << argv[0] << " test.xml" << endl; + return 1; + } + + try + { + // Use dont_validate because we do not have instance's system id (path). + // + std::ifstream ifs (argv[1]); + XSD_AUTO_PTR r (root (ifs, xml_schema::flags::dont_validate)); + + { + type::b_sequence const& s (r->b ()); + + if (s[0] != strenum::abc || + s[1] != strenum::a__c || + s[2] != strenum::cxx__bc || + s[3] != strenum::ab__) + { + cerr << "invalid encoding" << endl; + return 1; + } + } + + xml_schema::namespace_infomap map; + map[L"t"].name = L"test"; + + root (std::cout, *r, map, L"ASCII"); + } + catch (xml_schema::exception const& e) + { + cerr << "xml_schema::exception: " << e.what () << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/encoding/wchar/output b/xsd-tests/cxx/tree/encoding/wchar/output new file mode 100644 index 0000000..e0eaef0 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/wchar/output @@ -0,0 +1,10 @@ + + + abc + ῿퟿ + ကჿ + abc + a῿퟿c + ကჿbc + abကჿ + diff --git a/xsd-tests/cxx/tree/encoding/wchar/test.xml b/xsd-tests/cxx/tree/encoding/wchar/test.xml new file mode 100644 index 0000000..9abb1b6 --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/wchar/test.xml @@ -0,0 +1,14 @@ + + + abc + ῿퟿ + ကჿ + + abc + a῿퟿c + ကჿbc + abကჿ + + diff --git a/xsd-tests/cxx/tree/encoding/wchar/test.xsd b/xsd-tests/cxx/tree/encoding/wchar/test.xsd new file mode 100644 index 0000000..0151d2f --- /dev/null +++ b/xsd-tests/cxx/tree/encoding/wchar/test.xsd @@ -0,0 +1,33 @@ + + + + + + + + Test enum. Valid values are: + abc + a῿퟿c + ကჿbc + abကჿ + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1