From a8ce5c380c69539fe0c7c62c397634d9d0c9fde2 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/polymorphism/comparison/buildfile | 25 +++++++ .../cxx/tree/polymorphism/comparison/driver.cxx | 85 ++++++++++++++++++++++ .../cxx/tree/polymorphism/comparison/test.xml | 7 ++ .../cxx/tree/polymorphism/comparison/test.xsd | 39 ++++++++++ xsd-tests/cxx/tree/polymorphism/ostream/buildfile | 26 +++++++ xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx | 34 +++++++++ xsd-tests/cxx/tree/polymorphism/ostream/output | 18 +++++ xsd-tests/cxx/tree/polymorphism/ostream/test.xml | 10 +++ xsd-tests/cxx/tree/polymorphism/ostream/test.xsd | 62 ++++++++++++++++ .../cxx/tree/polymorphism/same-type/buildfile | 25 +++++++ .../cxx/tree/polymorphism/same-type/driver.cxx | 35 +++++++++ xsd-tests/cxx/tree/polymorphism/same-type/output | 9 +++ xsd-tests/cxx/tree/polymorphism/same-type/test.xml | 10 +++ xsd-tests/cxx/tree/polymorphism/same-type/test.xsd | 21 ++++++ 14 files changed, 406 insertions(+) create mode 100644 xsd-tests/cxx/tree/polymorphism/comparison/buildfile create mode 100644 xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx create mode 100644 xsd-tests/cxx/tree/polymorphism/comparison/test.xml create mode 100644 xsd-tests/cxx/tree/polymorphism/comparison/test.xsd create mode 100644 xsd-tests/cxx/tree/polymorphism/ostream/buildfile create mode 100644 xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx create mode 100644 xsd-tests/cxx/tree/polymorphism/ostream/output create mode 100644 xsd-tests/cxx/tree/polymorphism/ostream/test.xml create mode 100644 xsd-tests/cxx/tree/polymorphism/ostream/test.xsd create mode 100644 xsd-tests/cxx/tree/polymorphism/same-type/buildfile create mode 100644 xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx create mode 100644 xsd-tests/cxx/tree/polymorphism/same-type/output create mode 100644 xsd-tests/cxx/tree/polymorphism/same-type/test.xml create mode 100644 xsd-tests/cxx/tree/polymorphism/same-type/test.xsd (limited to 'xsd-tests/cxx/tree/polymorphism') diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile new file mode 100644 index 0000000..0bb0b77 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile @@ -0,0 +1,25 @@ +# file : cxx/tree/polymorphism/comparison/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 + +<{hxx ixx cxx}{test}>: xsd{test} $xsd +{{ + diag xsd ($<[0]) # @@ TMP + + $xsd cxx-tree --std c++11 \ + --generate-inline \ + --generate-serialization \ + --generate-polymorphic \ + --polymorphic-type base \ + --generate-comparison \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx new file mode 100644 index 0000000..cadb225 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx @@ -0,0 +1,85 @@ +// file : cxx/tree/polymorphism/comparison/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test comparison of polymorphic object models. +// + +#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])); + + // Equals. + // + { + derived1 d ("a", 1); + d.b ("b"); + type r1 (d); + + assert (*r == r1); + } + + // Values are not equal. + // + { + derived1 d ("a", 1); + d.b ("c"); + type r1 (d); + + assert (*r != r1); + } + + // Values are not equal. + // + { + derived1 d ("a", 2); + d.b ("b"); + type r1 (d); + + assert (*r != r1); + } + + // Different types. + // + { + derived2 d ("a", 1); + d.c ().push_back ("c"); + type r1 (d); + + assert (*r != r1); + } + + xml_schema::namespace_infomap map; + + map["t"].name = "test"; + + stringstream s; + root (s, *r, map); + + XSD_AUTO_PTR c (root (s, xml_schema::flags::dont_validate)); + + assert (*r == *c); + } + catch (xml_schema::exception const& e) + { + cerr << e << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/test.xml b/xsd-tests/cxx/tree/polymorphism/comparison/test.xml new file mode 100644 index 0000000..0b8c125 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/comparison/test.xml @@ -0,0 +1,7 @@ + + + a1b + + diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/test.xsd b/xsd-tests/cxx/tree/polymorphism/comparison/test.xsd new file mode 100644 index 0000000..364d1b3 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/comparison/test.xsd @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile new file mode 100644 index 0000000..2237c73 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile @@ -0,0 +1,26 @@ +# file : cxx/tree/polymorphism/ostream/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-polymorphic \ + --polymorphic-type-all \ + --root-element root \ + --generate-ostream \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx b/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx new file mode 100644 index 0000000..b030be9 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx @@ -0,0 +1,34 @@ +// file : cxx/tree/polymorphism/ostream/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test printing of polymorphic object models. +// + +#include // std::auto_ptr/unique_ptr +#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])); + cout << *r << endl; + } + catch (xml_schema::exception const& e) + { + cerr << e << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/output b/xsd-tests/cxx/tree/polymorphism/ostream/output new file mode 100644 index 0000000..e7fbd68 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/ostream/output @@ -0,0 +1,18 @@ + +base: +a: a +fund: 1 +base: +a: a +fund: 1 +b: b +base: +a: a +fund: 1 +c: c1 +c: c2 +base: +a: a +fund: 1 +d: d1 +d: d2 diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/test.xml b/xsd-tests/cxx/tree/polymorphism/ostream/test.xml new file mode 100644 index 0000000..5409d2a --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/ostream/test.xml @@ -0,0 +1,10 @@ + + + a1 + a1b + a1c1c2 + a1d1d2 + + diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/test.xsd b/xsd-tests/cxx/tree/polymorphism/ostream/test.xsd new file mode 100644 index 0000000..688cd5a --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/ostream/test.xsd @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile new file mode 100644 index 0000000..46720d6 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile @@ -0,0 +1,25 @@ +# file : cxx/tree/polymorphism/same-type/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-polymorphic \ + --root-element root \ + --generate-ostream \ + --output-dir $out_base \ + $path($<[0]) +}} + +cxx.poptions =+ "-I$out_base" diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx b/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx new file mode 100644 index 0000000..94f82f5 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx @@ -0,0 +1,35 @@ +// file : cxx/tree/polymorphism/same-type/driver.cxx +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test substitution group and xsi:type that don't change the type. +// + +#include // std::auto_ptr/unique_ptr +#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])); + + cout << *r << endl; + } + catch (xml_schema::exception const& e) + { + cerr << e << endl; + return 1; + } +} diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/output b/xsd-tests/cxx/tree/polymorphism/same-type/output new file mode 100644 index 0000000..04b5cbf --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/same-type/output @@ -0,0 +1,9 @@ + +base: +a: a1 +base: +a: a2 +base: +a: a3 +base: +a: a4 diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/test.xml b/xsd-tests/cxx/tree/polymorphism/same-type/test.xml new file mode 100644 index 0000000..f8b6d1e --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/same-type/test.xml @@ -0,0 +1,10 @@ + + + a1 + a2 + a3 + a4 + + diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/test.xsd b/xsd-tests/cxx/tree/polymorphism/same-type/test.xsd new file mode 100644 index 0000000..a4157d3 --- /dev/null +++ b/xsd-tests/cxx/tree/polymorphism/same-type/test.xsd @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1