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 --- tests/cxx/makefile | 15 - tests/cxx/parser/built-in/driver.cxx | 529 ------- tests/cxx/parser/built-in/makefile | 82 -- tests/cxx/parser/built-in/output | 164 --- tests/cxx/parser/built-in/test.xml | 199 --- tests/cxx/parser/built-in/test.xsd | 63 - tests/cxx/parser/enumeration/driver.cxx | 81 -- tests/cxx/parser/enumeration/gender.hxx | 13 - tests/cxx/parser/enumeration/makefile | 83 -- tests/cxx/parser/enumeration/output | 3 - tests/cxx/parser/enumeration/test.map | 7 - tests/cxx/parser/enumeration/test.xml | 10 - tests/cxx/parser/enumeration/test.xsd | 35 - tests/cxx/parser/generated-impl/makefile | 93 -- tests/cxx/parser/generated-impl/output | 122 -- tests/cxx/parser/generated-impl/test.xml | 168 --- tests/cxx/parser/generated-impl/test.xsd | 142 -- tests/cxx/parser/list/driver.cxx | 105 -- tests/cxx/parser/list/makefile | 82 -- tests/cxx/parser/list/output | 26 - tests/cxx/parser/list/test.xml | 25 - tests/cxx/parser/list/test.xsd | 25 - tests/cxx/parser/makefile | 18 - tests/cxx/parser/name-clash/inheritance/driver.cxx | 62 - tests/cxx/parser/name-clash/inheritance/makefile | 83 -- tests/cxx/parser/name-clash/inheritance/output | 2 - tests/cxx/parser/name-clash/inheritance/test.xml | 8 - tests/cxx/parser/name-clash/inheritance/test.xsd | 22 - tests/cxx/parser/polymorphism/makefile | 16 - tests/cxx/parser/polymorphism/recursive/driver.cxx | 68 - tests/cxx/parser/polymorphism/recursive/makefile | 83 -- tests/cxx/parser/polymorphism/recursive/output | 22 - .../parser/polymorphism/recursive/test-pimpl.cxx | 147 -- .../parser/polymorphism/recursive/test-pimpl.hxx | 94 -- tests/cxx/parser/polymorphism/recursive/test.xml | 15 - tests/cxx/parser/polymorphism/recursive/test.xsd | 53 - tests/cxx/parser/polymorphism/same-type/driver.cxx | 62 - tests/cxx/parser/polymorphism/same-type/makefile | 83 -- tests/cxx/parser/polymorphism/same-type/output | 4 - tests/cxx/parser/polymorphism/same-type/test.xml | 10 - tests/cxx/parser/polymorphism/same-type/test.xsd | 21 - tests/cxx/parser/recursive/driver.cxx | 139 -- tests/cxx/parser/recursive/makefile | 83 -- tests/cxx/parser/recursive/output | 22 - tests/cxx/parser/recursive/test.xml | 11 - tests/cxx/parser/recursive/test.xsd | 27 - tests/cxx/parser/test-template/driver.cxx | 66 - tests/cxx/parser/test-template/makefile | 82 -- tests/cxx/parser/test-template/output | 1 - tests/cxx/parser/test-template/test.xml | 7 - tests/cxx/parser/test-template/test.xsd | 12 - tests/cxx/parser/union/driver.cxx | 60 - tests/cxx/parser/union/makefile | 82 -- tests/cxx/parser/union/output | 2 - tests/cxx/parser/union/test.xml | 10 - tests/cxx/parser/union/test.xsd | 16 - tests/cxx/parser/validation/all/driver.cxx | 98 -- tests/cxx/parser/validation/all/makefile | 92 -- tests/cxx/parser/validation/all/test-000.std | 46 - tests/cxx/parser/validation/all/test-000.xml | 53 - tests/cxx/parser/validation/all/test-001.std | 6 - tests/cxx/parser/validation/all/test-001.xml | 11 - tests/cxx/parser/validation/all/test-002.std | 4 - tests/cxx/parser/validation/all/test-002.xml | 9 - tests/cxx/parser/validation/all/test-003.std | 6 - tests/cxx/parser/validation/all/test-003.xml | 12 - tests/cxx/parser/validation/all/test.xsd | 20 - tests/cxx/parser/validation/any/driver.cxx | 121 -- tests/cxx/parser/validation/any/makefile | 92 -- tests/cxx/parser/validation/any/test-000.std | 29 - tests/cxx/parser/validation/any/test-000.xml | 21 - tests/cxx/parser/validation/any/test.xsd | 20 - tests/cxx/parser/validation/attribute/driver.cxx | 197 --- tests/cxx/parser/validation/attribute/makefile | 92 -- tests/cxx/parser/validation/attribute/test-000.std | 24 - tests/cxx/parser/validation/attribute/test-000.xml | 10 - tests/cxx/parser/validation/attribute/test.xsd | 71 - .../parser/validation/built-in/any-type/driver.cxx | 154 -- .../parser/validation/built-in/any-type/makefile | 92 -- .../validation/built-in/any-type/test-000.std | 99 -- .../validation/built-in/any-type/test-000.xml | 41 - .../parser/validation/built-in/any-type/test.xsd | 31 - .../parser/validation/built-in/binary/driver.cxx | 153 -- .../cxx/parser/validation/built-in/binary/makefile | 70 - .../parser/validation/built-in/boolean/driver.cxx | 145 -- .../parser/validation/built-in/boolean/makefile | 70 - .../cxx/parser/validation/built-in/byte/driver.cxx | 256 ---- tests/cxx/parser/validation/built-in/byte/makefile | 70 - .../validation/built-in/date-time/driver.cxx | 1533 -------------------- .../parser/validation/built-in/date-time/makefile | 70 - .../parser/validation/built-in/float/driver.cxx | 285 ---- .../cxx/parser/validation/built-in/float/makefile | 70 - .../cxx/parser/validation/built-in/int/driver.cxx | 116 -- tests/cxx/parser/validation/built-in/int/makefile | 70 - .../parser/validation/built-in/integer/driver.cxx | 303 ---- .../parser/validation/built-in/integer/makefile | 70 - .../cxx/parser/validation/built-in/long/driver.cxx | 116 -- tests/cxx/parser/validation/built-in/long/makefile | 70 - tests/cxx/parser/validation/built-in/makefile | 17 - .../parser/validation/built-in/qname/driver.cxx | 105 -- .../cxx/parser/validation/built-in/qname/makefile | 70 - .../parser/validation/built-in/short/driver.cxx | 116 -- .../cxx/parser/validation/built-in/short/makefile | 70 - .../parser/validation/built-in/string/driver.cxx | 512 ------- .../cxx/parser/validation/built-in/string/makefile | 70 - .../cxx/parser/validation/built-in/uri/driver.cxx | 53 - tests/cxx/parser/validation/built-in/uri/makefile | 70 - tests/cxx/parser/validation/choice/driver.cxx | 126 -- tests/cxx/parser/validation/choice/makefile | 92 -- tests/cxx/parser/validation/choice/test-000.std | 22 - tests/cxx/parser/validation/choice/test-000.xml | 30 - tests/cxx/parser/validation/choice/test-001.std | 4 - tests/cxx/parser/validation/choice/test-001.xml | 10 - tests/cxx/parser/validation/choice/test-002.std | 11 - tests/cxx/parser/validation/choice/test-002.xml | 17 - tests/cxx/parser/validation/choice/test-003.std | 5 - tests/cxx/parser/validation/choice/test-003.xml | 11 - tests/cxx/parser/validation/choice/test-004.std | 4 - tests/cxx/parser/validation/choice/test-004.xml | 11 - tests/cxx/parser/validation/choice/test.xsd | 24 - tests/cxx/parser/validation/makefile | 16 - tests/cxx/parser/validation/restriction/driver.cxx | 107 -- tests/cxx/parser/validation/restriction/makefile | 92 -- .../cxx/parser/validation/restriction/test-000.std | 0 .../cxx/parser/validation/restriction/test-000.xml | 31 - .../cxx/parser/validation/restriction/test-001.std | 1 - .../cxx/parser/validation/restriction/test-001.xml | 11 - .../cxx/parser/validation/restriction/test-002.std | 1 - .../cxx/parser/validation/restriction/test-002.xml | 12 - .../cxx/parser/validation/restriction/test-003.std | 1 - .../cxx/parser/validation/restriction/test-003.xml | 16 - .../cxx/parser/validation/restriction/test-004.std | 1 - .../cxx/parser/validation/restriction/test-004.xml | 10 - .../cxx/parser/validation/restriction/test-005.std | 1 - .../cxx/parser/validation/restriction/test-005.xml | 11 - tests/cxx/parser/validation/restriction/test.xsd | 82 -- tests/cxx/parser/validation/sequence/driver.cxx | 139 -- tests/cxx/parser/validation/sequence/makefile | 92 -- tests/cxx/parser/validation/sequence/test-000.std | 56 - tests/cxx/parser/validation/sequence/test-000.xml | 46 - tests/cxx/parser/validation/sequence/test-001.std | 4 - tests/cxx/parser/validation/sequence/test-001.xml | 10 - tests/cxx/parser/validation/sequence/test-002.std | 20 - tests/cxx/parser/validation/sequence/test-002.xml | 27 - tests/cxx/parser/validation/sequence/test-003.std | 5 - tests/cxx/parser/validation/sequence/test-003.xml | 17 - tests/cxx/parser/validation/sequence/test-004.std | 4 - tests/cxx/parser/validation/sequence/test-004.xml | 14 - tests/cxx/parser/validation/sequence/test-005.std | 6 - tests/cxx/parser/validation/sequence/test-005.xml | 15 - tests/cxx/parser/validation/sequence/test-006.std | 13 - tests/cxx/parser/validation/sequence/test-006.xml | 17 - tests/cxx/parser/validation/sequence/test.xsd | 28 - tests/cxx/tree/any-type/driver.cxx | 144 -- tests/cxx/tree/any-type/makefile | 86 -- tests/cxx/tree/any-type/output | 73 - tests/cxx/tree/any-type/test.xml | 26 - tests/cxx/tree/any-type/test.xsd | 19 - tests/cxx/tree/binary/cdr/driver.cxx | 143 -- tests/cxx/tree/binary/cdr/makefile | 89 -- tests/cxx/tree/binary/cdr/test.xml | 93 -- tests/cxx/tree/binary/cdr/test.xsd | 123 -- tests/cxx/tree/binary/makefile | 16 - tests/cxx/tree/binary/polymorphic/driver.cxx | 164 --- tests/cxx/tree/binary/polymorphic/makefile | 90 -- tests/cxx/tree/binary/polymorphic/test.xml | 92 -- tests/cxx/tree/binary/polymorphic/test.xsd | 125 -- tests/cxx/tree/binary/xdr-ordered/driver.cxx | 189 --- tests/cxx/tree/binary/xdr-ordered/makefile | 85 -- tests/cxx/tree/binary/xdr-ordered/test.xml | 93 -- tests/cxx/tree/binary/xdr-ordered/test.xsd | 123 -- tests/cxx/tree/binary/xdr/driver.cxx | 187 --- tests/cxx/tree/binary/xdr/makefile | 85 -- tests/cxx/tree/binary/xdr/test.xml | 93 -- tests/cxx/tree/binary/xdr/test.xsd | 123 -- tests/cxx/tree/built-in/attributes.xml | 73 - tests/cxx/tree/built-in/driver.cxx | 93 -- tests/cxx/tree/built-in/elements.xml | 84 -- tests/cxx/tree/built-in/inherited.xml | 84 -- tests/cxx/tree/built-in/makefile | 99 -- tests/cxx/tree/built-in/types.xsd | 460 ------ tests/cxx/tree/chameleon/driver.cxx | 35 - tests/cxx/tree/chameleon/includee.xsd | 13 - tests/cxx/tree/chameleon/includer.xsd | 12 - tests/cxx/tree/chameleon/makefile | 85 -- tests/cxx/tree/chameleon/output | 3 - tests/cxx/tree/chameleon/test.xml | 8 - tests/cxx/tree/comparison/driver.cxx | 38 - tests/cxx/tree/comparison/makefile | 85 -- tests/cxx/tree/comparison/test.xml | 19 - tests/cxx/tree/comparison/test.xsd | 30 - tests/cxx/tree/compilation/driver.cxx | 116 -- tests/cxx/tree/compilation/makefile | 85 -- tests/cxx/tree/compilation/test.xsd | 12 - tests/cxx/tree/complex/ctor/driver.cxx | 122 -- tests/cxx/tree/complex/ctor/makefile | 86 -- tests/cxx/tree/complex/ctor/test.xsd | 182 --- tests/cxx/tree/complex/makefile | 16 - tests/cxx/tree/containment/driver.cxx | 118 -- tests/cxx/tree/containment/makefile | 85 -- tests/cxx/tree/containment/test.xsd | 59 - tests/cxx/tree/default/general/driver.cxx | 37 - tests/cxx/tree/default/general/makefile | 86 -- tests/cxx/tree/default/general/output | 15 - tests/cxx/tree/default/general/test.xml | 16 - tests/cxx/tree/default/general/test.xsd | 241 --- tests/cxx/tree/default/makefile | 16 - tests/cxx/tree/default/omit/driver.cxx | 46 - tests/cxx/tree/default/omit/makefile | 86 -- tests/cxx/tree/default/omit/output | 19 - tests/cxx/tree/default/omit/test.xml | 9 - tests/cxx/tree/default/omit/test.xsd | 30 - tests/cxx/tree/detach/driver.cxx | 108 -- tests/cxx/tree/detach/makefile | 85 -- tests/cxx/tree/detach/test.xsd | 32 - tests/cxx/tree/dom-association/dom-parse.cxx | 95 -- tests/cxx/tree/dom-association/dom-parse.hxx | 23 - tests/cxx/tree/dom-association/driver.cxx | 71 - tests/cxx/tree/dom-association/makefile | 91 -- tests/cxx/tree/dom-association/output | 0 tests/cxx/tree/dom-association/test.xml | 7 - tests/cxx/tree/dom-association/test.xsd | 12 - tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx | 74 - tests/cxx/tree/encoding/char/iso-8859-1/makefile | 86 -- tests/cxx/tree/encoding/char/iso-8859-1/test.std | 10 - tests/cxx/tree/encoding/char/iso-8859-1/test.xml | 14 - tests/cxx/tree/encoding/char/iso-8859-1/test.xsd | 31 - tests/cxx/tree/encoding/char/lcp/driver.cxx | 40 - tests/cxx/tree/encoding/char/lcp/makefile | 85 -- tests/cxx/tree/encoding/char/lcp/test.std | 4 - tests/cxx/tree/encoding/char/lcp/test.xml | 7 - tests/cxx/tree/encoding/char/lcp/test.xsd | 12 - tests/cxx/tree/encoding/char/makefile | 16 - tests/cxx/tree/encoding/char/utf-8/driver.cxx | 63 - tests/cxx/tree/encoding/char/utf-8/makefile | 85 -- tests/cxx/tree/encoding/char/utf-8/test.std | 9 - tests/cxx/tree/encoding/char/utf-8/test.xml | 13 - tests/cxx/tree/encoding/char/utf-8/test.xsd | 31 - tests/cxx/tree/encoding/makefile | 16 - tests/cxx/tree/encoding/wchar/driver.cxx | 55 - tests/cxx/tree/encoding/wchar/makefile | 86 -- tests/cxx/tree/encoding/wchar/test.std | 10 - tests/cxx/tree/encoding/wchar/test.xml | 14 - tests/cxx/tree/encoding/wchar/test.xsd | 33 - tests/cxx/tree/enumeration/ctor/driver.cxx | 30 - tests/cxx/tree/enumeration/ctor/makefile | 86 -- tests/cxx/tree/enumeration/ctor/test.xsd | 41 - tests/cxx/tree/enumeration/inheritance/driver.cxx | 53 - tests/cxx/tree/enumeration/inheritance/makefile | 85 -- tests/cxx/tree/enumeration/inheritance/output | 1 - tests/cxx/tree/enumeration/inheritance/test.xml | 3 - tests/cxx/tree/enumeration/inheritance/test.xsd | 22 - tests/cxx/tree/enumeration/makefile | 16 - tests/cxx/tree/float/driver.cxx | 53 - tests/cxx/tree/float/makefile | 85 -- tests/cxx/tree/float/test.std | 35 - tests/cxx/tree/float/test.xml | 35 - tests/cxx/tree/float/test.xsd | 74 - tests/cxx/tree/list/ctor/driver.cxx | 50 - tests/cxx/tree/list/ctor/makefile | 86 -- tests/cxx/tree/list/ctor/test.xsd | 18 - tests/cxx/tree/list/makefile | 16 - tests/cxx/tree/makefile | 43 - tests/cxx/tree/name-clash/inheritance/driver.cxx | 35 - tests/cxx/tree/name-clash/inheritance/makefile | 85 -- tests/cxx/tree/name-clash/inheritance/output | 3 - tests/cxx/tree/name-clash/inheritance/test.xml | 8 - tests/cxx/tree/name-clash/inheritance/test.xsd | 53 - tests/cxx/tree/name-clash/makefile | 16 - tests/cxx/tree/naming/camel/driver.cxx | 154 -- tests/cxx/tree/naming/camel/makefile | 93 -- tests/cxx/tree/naming/camel/test.xsd | 31 - tests/cxx/tree/naming/java/driver.cxx | 153 -- tests/cxx/tree/naming/java/makefile | 93 -- tests/cxx/tree/naming/java/test.xsd | 31 - tests/cxx/tree/naming/knr/driver.cxx | 154 -- tests/cxx/tree/naming/knr/makefile | 93 -- tests/cxx/tree/naming/knr/test.xsd | 31 - tests/cxx/tree/naming/makefile | 16 - tests/cxx/tree/order/driver.cxx | 64 - tests/cxx/tree/order/makefile | 93 -- tests/cxx/tree/order/output | 92 -- tests/cxx/tree/order/test.xml | 71 - tests/cxx/tree/order/test.xsd | 130 -- tests/cxx/tree/polymorphism/comparison/driver.cxx | 85 -- tests/cxx/tree/polymorphism/comparison/makefile | 86 -- tests/cxx/tree/polymorphism/comparison/test.xml | 7 - tests/cxx/tree/polymorphism/comparison/test.xsd | 39 - tests/cxx/tree/polymorphism/makefile | 16 - tests/cxx/tree/polymorphism/ostream/driver.cxx | 34 - tests/cxx/tree/polymorphism/ostream/makefile | 87 -- tests/cxx/tree/polymorphism/ostream/output | 18 - tests/cxx/tree/polymorphism/ostream/test.xml | 10 - tests/cxx/tree/polymorphism/ostream/test.xsd | 62 - tests/cxx/tree/polymorphism/same-type/driver.cxx | 35 - tests/cxx/tree/polymorphism/same-type/makefile | 86 -- tests/cxx/tree/polymorphism/same-type/output | 9 - tests/cxx/tree/polymorphism/same-type/test.xml | 10 - tests/cxx/tree/polymorphism/same-type/test.xsd | 21 - tests/cxx/tree/prefix/bar.xsd | 34 - tests/cxx/tree/prefix/driver.cxx | 34 - tests/cxx/tree/prefix/foo.xsd | 16 - tests/cxx/tree/prefix/makefile | 86 -- tests/cxx/tree/prefix/output | 18 - tests/cxx/tree/prefix/test.xml | 19 - tests/cxx/tree/prefix/test.xsd | 40 - tests/cxx/tree/test-template/driver.cxx | 35 - tests/cxx/tree/test-template/makefile | 85 -- tests/cxx/tree/test-template/output | 2 - tests/cxx/tree/test-template/test.xml | 7 - tests/cxx/tree/test-template/test.xsd | 12 - tests/cxx/tree/types-only/driver.cxx | 30 - tests/cxx/tree/types-only/makefile | 85 -- tests/cxx/tree/types-only/test.xsd | 52 - tests/cxx/tree/union/ctor/driver.cxx | 30 - tests/cxx/tree/union/ctor/makefile | 86 -- tests/cxx/tree/union/ctor/test.xsd | 14 - tests/cxx/tree/union/makefile | 16 - tests/cxx/tree/wildcard/driver.cxx | 203 --- tests/cxx/tree/wildcard/makefile | 86 -- tests/cxx/tree/wildcard/output | 24 - tests/cxx/tree/wildcard/test.xml | 19 - tests/cxx/tree/wildcard/test.xsd | 18 - 323 files changed, 21108 deletions(-) delete mode 100644 tests/cxx/makefile delete mode 100644 tests/cxx/parser/built-in/driver.cxx delete mode 100644 tests/cxx/parser/built-in/makefile delete mode 100644 tests/cxx/parser/built-in/output delete mode 100644 tests/cxx/parser/built-in/test.xml delete mode 100644 tests/cxx/parser/built-in/test.xsd delete mode 100644 tests/cxx/parser/enumeration/driver.cxx delete mode 100644 tests/cxx/parser/enumeration/gender.hxx delete mode 100644 tests/cxx/parser/enumeration/makefile delete mode 100644 tests/cxx/parser/enumeration/output delete mode 100644 tests/cxx/parser/enumeration/test.map delete mode 100644 tests/cxx/parser/enumeration/test.xml delete mode 100644 tests/cxx/parser/enumeration/test.xsd delete mode 100644 tests/cxx/parser/generated-impl/makefile delete mode 100644 tests/cxx/parser/generated-impl/output delete mode 100644 tests/cxx/parser/generated-impl/test.xml delete mode 100644 tests/cxx/parser/generated-impl/test.xsd delete mode 100644 tests/cxx/parser/list/driver.cxx delete mode 100644 tests/cxx/parser/list/makefile delete mode 100644 tests/cxx/parser/list/output delete mode 100644 tests/cxx/parser/list/test.xml delete mode 100644 tests/cxx/parser/list/test.xsd delete mode 100644 tests/cxx/parser/makefile delete mode 100644 tests/cxx/parser/name-clash/inheritance/driver.cxx delete mode 100644 tests/cxx/parser/name-clash/inheritance/makefile delete mode 100644 tests/cxx/parser/name-clash/inheritance/output delete mode 100644 tests/cxx/parser/name-clash/inheritance/test.xml delete mode 100644 tests/cxx/parser/name-clash/inheritance/test.xsd delete mode 100644 tests/cxx/parser/polymorphism/makefile delete mode 100644 tests/cxx/parser/polymorphism/recursive/driver.cxx delete mode 100644 tests/cxx/parser/polymorphism/recursive/makefile delete mode 100644 tests/cxx/parser/polymorphism/recursive/output delete mode 100644 tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx delete mode 100644 tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx delete mode 100644 tests/cxx/parser/polymorphism/recursive/test.xml delete mode 100644 tests/cxx/parser/polymorphism/recursive/test.xsd delete mode 100644 tests/cxx/parser/polymorphism/same-type/driver.cxx delete mode 100644 tests/cxx/parser/polymorphism/same-type/makefile delete mode 100644 tests/cxx/parser/polymorphism/same-type/output delete mode 100644 tests/cxx/parser/polymorphism/same-type/test.xml delete mode 100644 tests/cxx/parser/polymorphism/same-type/test.xsd delete mode 100644 tests/cxx/parser/recursive/driver.cxx delete mode 100644 tests/cxx/parser/recursive/makefile delete mode 100644 tests/cxx/parser/recursive/output delete mode 100644 tests/cxx/parser/recursive/test.xml delete mode 100644 tests/cxx/parser/recursive/test.xsd delete mode 100644 tests/cxx/parser/test-template/driver.cxx delete mode 100644 tests/cxx/parser/test-template/makefile delete mode 100644 tests/cxx/parser/test-template/output delete mode 100644 tests/cxx/parser/test-template/test.xml delete mode 100644 tests/cxx/parser/test-template/test.xsd delete mode 100644 tests/cxx/parser/union/driver.cxx delete mode 100644 tests/cxx/parser/union/makefile delete mode 100644 tests/cxx/parser/union/output delete mode 100644 tests/cxx/parser/union/test.xml delete mode 100644 tests/cxx/parser/union/test.xsd delete mode 100644 tests/cxx/parser/validation/all/driver.cxx delete mode 100644 tests/cxx/parser/validation/all/makefile delete mode 100644 tests/cxx/parser/validation/all/test-000.std delete mode 100644 tests/cxx/parser/validation/all/test-000.xml delete mode 100644 tests/cxx/parser/validation/all/test-001.std delete mode 100644 tests/cxx/parser/validation/all/test-001.xml delete mode 100644 tests/cxx/parser/validation/all/test-002.std delete mode 100644 tests/cxx/parser/validation/all/test-002.xml delete mode 100644 tests/cxx/parser/validation/all/test-003.std delete mode 100644 tests/cxx/parser/validation/all/test-003.xml delete mode 100644 tests/cxx/parser/validation/all/test.xsd delete mode 100644 tests/cxx/parser/validation/any/driver.cxx delete mode 100644 tests/cxx/parser/validation/any/makefile delete mode 100644 tests/cxx/parser/validation/any/test-000.std delete mode 100644 tests/cxx/parser/validation/any/test-000.xml delete mode 100644 tests/cxx/parser/validation/any/test.xsd delete mode 100644 tests/cxx/parser/validation/attribute/driver.cxx delete mode 100644 tests/cxx/parser/validation/attribute/makefile delete mode 100644 tests/cxx/parser/validation/attribute/test-000.std delete mode 100644 tests/cxx/parser/validation/attribute/test-000.xml delete mode 100644 tests/cxx/parser/validation/attribute/test.xsd delete mode 100644 tests/cxx/parser/validation/built-in/any-type/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/any-type/makefile delete mode 100644 tests/cxx/parser/validation/built-in/any-type/test-000.std delete mode 100644 tests/cxx/parser/validation/built-in/any-type/test-000.xml delete mode 100644 tests/cxx/parser/validation/built-in/any-type/test.xsd delete mode 100644 tests/cxx/parser/validation/built-in/binary/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/binary/makefile delete mode 100644 tests/cxx/parser/validation/built-in/boolean/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/boolean/makefile delete mode 100644 tests/cxx/parser/validation/built-in/byte/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/byte/makefile delete mode 100644 tests/cxx/parser/validation/built-in/date-time/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/date-time/makefile delete mode 100644 tests/cxx/parser/validation/built-in/float/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/float/makefile delete mode 100644 tests/cxx/parser/validation/built-in/int/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/int/makefile delete mode 100644 tests/cxx/parser/validation/built-in/integer/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/integer/makefile delete mode 100644 tests/cxx/parser/validation/built-in/long/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/long/makefile delete mode 100644 tests/cxx/parser/validation/built-in/makefile delete mode 100644 tests/cxx/parser/validation/built-in/qname/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/qname/makefile delete mode 100644 tests/cxx/parser/validation/built-in/short/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/short/makefile delete mode 100644 tests/cxx/parser/validation/built-in/string/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/string/makefile delete mode 100644 tests/cxx/parser/validation/built-in/uri/driver.cxx delete mode 100644 tests/cxx/parser/validation/built-in/uri/makefile delete mode 100644 tests/cxx/parser/validation/choice/driver.cxx delete mode 100644 tests/cxx/parser/validation/choice/makefile delete mode 100644 tests/cxx/parser/validation/choice/test-000.std delete mode 100644 tests/cxx/parser/validation/choice/test-000.xml delete mode 100644 tests/cxx/parser/validation/choice/test-001.std delete mode 100644 tests/cxx/parser/validation/choice/test-001.xml delete mode 100644 tests/cxx/parser/validation/choice/test-002.std delete mode 100644 tests/cxx/parser/validation/choice/test-002.xml delete mode 100644 tests/cxx/parser/validation/choice/test-003.std delete mode 100644 tests/cxx/parser/validation/choice/test-003.xml delete mode 100644 tests/cxx/parser/validation/choice/test-004.std delete mode 100644 tests/cxx/parser/validation/choice/test-004.xml delete mode 100644 tests/cxx/parser/validation/choice/test.xsd delete mode 100644 tests/cxx/parser/validation/makefile delete mode 100644 tests/cxx/parser/validation/restriction/driver.cxx delete mode 100644 tests/cxx/parser/validation/restriction/makefile delete mode 100644 tests/cxx/parser/validation/restriction/test-000.std delete mode 100644 tests/cxx/parser/validation/restriction/test-000.xml delete mode 100644 tests/cxx/parser/validation/restriction/test-001.std delete mode 100644 tests/cxx/parser/validation/restriction/test-001.xml delete mode 100644 tests/cxx/parser/validation/restriction/test-002.std delete mode 100644 tests/cxx/parser/validation/restriction/test-002.xml delete mode 100644 tests/cxx/parser/validation/restriction/test-003.std delete mode 100644 tests/cxx/parser/validation/restriction/test-003.xml delete mode 100644 tests/cxx/parser/validation/restriction/test-004.std delete mode 100644 tests/cxx/parser/validation/restriction/test-004.xml delete mode 100644 tests/cxx/parser/validation/restriction/test-005.std delete mode 100644 tests/cxx/parser/validation/restriction/test-005.xml delete mode 100644 tests/cxx/parser/validation/restriction/test.xsd delete mode 100644 tests/cxx/parser/validation/sequence/driver.cxx delete mode 100644 tests/cxx/parser/validation/sequence/makefile delete mode 100644 tests/cxx/parser/validation/sequence/test-000.std delete mode 100644 tests/cxx/parser/validation/sequence/test-000.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-001.std delete mode 100644 tests/cxx/parser/validation/sequence/test-001.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-002.std delete mode 100644 tests/cxx/parser/validation/sequence/test-002.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-003.std delete mode 100644 tests/cxx/parser/validation/sequence/test-003.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-004.std delete mode 100644 tests/cxx/parser/validation/sequence/test-004.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-005.std delete mode 100644 tests/cxx/parser/validation/sequence/test-005.xml delete mode 100644 tests/cxx/parser/validation/sequence/test-006.std delete mode 100644 tests/cxx/parser/validation/sequence/test-006.xml delete mode 100644 tests/cxx/parser/validation/sequence/test.xsd delete mode 100644 tests/cxx/tree/any-type/driver.cxx delete mode 100644 tests/cxx/tree/any-type/makefile delete mode 100644 tests/cxx/tree/any-type/output delete mode 100644 tests/cxx/tree/any-type/test.xml delete mode 100644 tests/cxx/tree/any-type/test.xsd delete mode 100644 tests/cxx/tree/binary/cdr/driver.cxx delete mode 100644 tests/cxx/tree/binary/cdr/makefile delete mode 100644 tests/cxx/tree/binary/cdr/test.xml delete mode 100644 tests/cxx/tree/binary/cdr/test.xsd delete mode 100644 tests/cxx/tree/binary/makefile delete mode 100644 tests/cxx/tree/binary/polymorphic/driver.cxx delete mode 100644 tests/cxx/tree/binary/polymorphic/makefile delete mode 100644 tests/cxx/tree/binary/polymorphic/test.xml delete mode 100644 tests/cxx/tree/binary/polymorphic/test.xsd delete mode 100644 tests/cxx/tree/binary/xdr-ordered/driver.cxx delete mode 100644 tests/cxx/tree/binary/xdr-ordered/makefile delete mode 100644 tests/cxx/tree/binary/xdr-ordered/test.xml delete mode 100644 tests/cxx/tree/binary/xdr-ordered/test.xsd delete mode 100644 tests/cxx/tree/binary/xdr/driver.cxx delete mode 100644 tests/cxx/tree/binary/xdr/makefile delete mode 100644 tests/cxx/tree/binary/xdr/test.xml delete mode 100644 tests/cxx/tree/binary/xdr/test.xsd delete mode 100644 tests/cxx/tree/built-in/attributes.xml delete mode 100644 tests/cxx/tree/built-in/driver.cxx delete mode 100644 tests/cxx/tree/built-in/elements.xml delete mode 100644 tests/cxx/tree/built-in/inherited.xml delete mode 100644 tests/cxx/tree/built-in/makefile delete mode 100644 tests/cxx/tree/built-in/types.xsd delete mode 100644 tests/cxx/tree/chameleon/driver.cxx delete mode 100644 tests/cxx/tree/chameleon/includee.xsd delete mode 100644 tests/cxx/tree/chameleon/includer.xsd delete mode 100644 tests/cxx/tree/chameleon/makefile delete mode 100644 tests/cxx/tree/chameleon/output delete mode 100644 tests/cxx/tree/chameleon/test.xml delete mode 100644 tests/cxx/tree/comparison/driver.cxx delete mode 100644 tests/cxx/tree/comparison/makefile delete mode 100644 tests/cxx/tree/comparison/test.xml delete mode 100644 tests/cxx/tree/comparison/test.xsd delete mode 100644 tests/cxx/tree/compilation/driver.cxx delete mode 100644 tests/cxx/tree/compilation/makefile delete mode 100644 tests/cxx/tree/compilation/test.xsd delete mode 100644 tests/cxx/tree/complex/ctor/driver.cxx delete mode 100644 tests/cxx/tree/complex/ctor/makefile delete mode 100644 tests/cxx/tree/complex/ctor/test.xsd delete mode 100644 tests/cxx/tree/complex/makefile delete mode 100644 tests/cxx/tree/containment/driver.cxx delete mode 100644 tests/cxx/tree/containment/makefile delete mode 100644 tests/cxx/tree/containment/test.xsd delete mode 100644 tests/cxx/tree/default/general/driver.cxx delete mode 100644 tests/cxx/tree/default/general/makefile delete mode 100644 tests/cxx/tree/default/general/output delete mode 100644 tests/cxx/tree/default/general/test.xml delete mode 100644 tests/cxx/tree/default/general/test.xsd delete mode 100644 tests/cxx/tree/default/makefile delete mode 100644 tests/cxx/tree/default/omit/driver.cxx delete mode 100644 tests/cxx/tree/default/omit/makefile delete mode 100644 tests/cxx/tree/default/omit/output delete mode 100644 tests/cxx/tree/default/omit/test.xml delete mode 100644 tests/cxx/tree/default/omit/test.xsd delete mode 100644 tests/cxx/tree/detach/driver.cxx delete mode 100644 tests/cxx/tree/detach/makefile delete mode 100644 tests/cxx/tree/detach/test.xsd delete mode 100644 tests/cxx/tree/dom-association/dom-parse.cxx delete mode 100644 tests/cxx/tree/dom-association/dom-parse.hxx delete mode 100644 tests/cxx/tree/dom-association/driver.cxx delete mode 100644 tests/cxx/tree/dom-association/makefile delete mode 100644 tests/cxx/tree/dom-association/output delete mode 100644 tests/cxx/tree/dom-association/test.xml delete mode 100644 tests/cxx/tree/dom-association/test.xsd delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/makefile delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.std delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.xml delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.xsd delete mode 100644 tests/cxx/tree/encoding/char/lcp/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/lcp/makefile delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.std delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.xml delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.xsd delete mode 100644 tests/cxx/tree/encoding/char/makefile delete mode 100644 tests/cxx/tree/encoding/char/utf-8/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/utf-8/makefile delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.std delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.xml delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.xsd delete mode 100644 tests/cxx/tree/encoding/makefile delete mode 100644 tests/cxx/tree/encoding/wchar/driver.cxx delete mode 100644 tests/cxx/tree/encoding/wchar/makefile delete mode 100644 tests/cxx/tree/encoding/wchar/test.std delete mode 100644 tests/cxx/tree/encoding/wchar/test.xml delete mode 100644 tests/cxx/tree/encoding/wchar/test.xsd delete mode 100644 tests/cxx/tree/enumeration/ctor/driver.cxx delete mode 100644 tests/cxx/tree/enumeration/ctor/makefile delete mode 100644 tests/cxx/tree/enumeration/ctor/test.xsd delete mode 100644 tests/cxx/tree/enumeration/inheritance/driver.cxx delete mode 100644 tests/cxx/tree/enumeration/inheritance/makefile delete mode 100644 tests/cxx/tree/enumeration/inheritance/output delete mode 100644 tests/cxx/tree/enumeration/inheritance/test.xml delete mode 100644 tests/cxx/tree/enumeration/inheritance/test.xsd delete mode 100644 tests/cxx/tree/enumeration/makefile delete mode 100644 tests/cxx/tree/float/driver.cxx delete mode 100644 tests/cxx/tree/float/makefile delete mode 100644 tests/cxx/tree/float/test.std delete mode 100644 tests/cxx/tree/float/test.xml delete mode 100644 tests/cxx/tree/float/test.xsd delete mode 100644 tests/cxx/tree/list/ctor/driver.cxx delete mode 100644 tests/cxx/tree/list/ctor/makefile delete mode 100644 tests/cxx/tree/list/ctor/test.xsd delete mode 100644 tests/cxx/tree/list/makefile delete mode 100644 tests/cxx/tree/makefile delete mode 100644 tests/cxx/tree/name-clash/inheritance/driver.cxx delete mode 100644 tests/cxx/tree/name-clash/inheritance/makefile delete mode 100644 tests/cxx/tree/name-clash/inheritance/output delete mode 100644 tests/cxx/tree/name-clash/inheritance/test.xml delete mode 100644 tests/cxx/tree/name-clash/inheritance/test.xsd delete mode 100644 tests/cxx/tree/name-clash/makefile delete mode 100644 tests/cxx/tree/naming/camel/driver.cxx delete mode 100644 tests/cxx/tree/naming/camel/makefile delete mode 100644 tests/cxx/tree/naming/camel/test.xsd delete mode 100644 tests/cxx/tree/naming/java/driver.cxx delete mode 100644 tests/cxx/tree/naming/java/makefile delete mode 100644 tests/cxx/tree/naming/java/test.xsd delete mode 100644 tests/cxx/tree/naming/knr/driver.cxx delete mode 100644 tests/cxx/tree/naming/knr/makefile delete mode 100644 tests/cxx/tree/naming/knr/test.xsd delete mode 100644 tests/cxx/tree/naming/makefile delete mode 100644 tests/cxx/tree/order/driver.cxx delete mode 100644 tests/cxx/tree/order/makefile delete mode 100644 tests/cxx/tree/order/output delete mode 100644 tests/cxx/tree/order/test.xml delete mode 100644 tests/cxx/tree/order/test.xsd delete mode 100644 tests/cxx/tree/polymorphism/comparison/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/comparison/makefile delete mode 100644 tests/cxx/tree/polymorphism/comparison/test.xml delete mode 100644 tests/cxx/tree/polymorphism/comparison/test.xsd delete mode 100644 tests/cxx/tree/polymorphism/makefile delete mode 100644 tests/cxx/tree/polymorphism/ostream/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/ostream/makefile delete mode 100644 tests/cxx/tree/polymorphism/ostream/output delete mode 100644 tests/cxx/tree/polymorphism/ostream/test.xml delete mode 100644 tests/cxx/tree/polymorphism/ostream/test.xsd delete mode 100644 tests/cxx/tree/polymorphism/same-type/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/same-type/makefile delete mode 100644 tests/cxx/tree/polymorphism/same-type/output delete mode 100644 tests/cxx/tree/polymorphism/same-type/test.xml delete mode 100644 tests/cxx/tree/polymorphism/same-type/test.xsd delete mode 100644 tests/cxx/tree/prefix/bar.xsd delete mode 100644 tests/cxx/tree/prefix/driver.cxx delete mode 100644 tests/cxx/tree/prefix/foo.xsd delete mode 100644 tests/cxx/tree/prefix/makefile delete mode 100644 tests/cxx/tree/prefix/output delete mode 100644 tests/cxx/tree/prefix/test.xml delete mode 100644 tests/cxx/tree/prefix/test.xsd delete mode 100644 tests/cxx/tree/test-template/driver.cxx delete mode 100644 tests/cxx/tree/test-template/makefile delete mode 100644 tests/cxx/tree/test-template/output delete mode 100644 tests/cxx/tree/test-template/test.xml delete mode 100644 tests/cxx/tree/test-template/test.xsd delete mode 100644 tests/cxx/tree/types-only/driver.cxx delete mode 100644 tests/cxx/tree/types-only/makefile delete mode 100644 tests/cxx/tree/types-only/test.xsd delete mode 100644 tests/cxx/tree/union/ctor/driver.cxx delete mode 100644 tests/cxx/tree/union/ctor/makefile delete mode 100644 tests/cxx/tree/union/ctor/test.xsd delete mode 100644 tests/cxx/tree/union/makefile delete mode 100644 tests/cxx/tree/wildcard/driver.cxx delete mode 100644 tests/cxx/tree/wildcard/makefile delete mode 100644 tests/cxx/tree/wildcard/output delete mode 100644 tests/cxx/tree/wildcard/test.xml delete mode 100644 tests/cxx/tree/wildcard/test.xsd (limited to 'tests/cxx') diff --git a/tests/cxx/makefile b/tests/cxx/makefile deleted file mode 100644 index 769a1d0..0000000 --- a/tests/cxx/makefile +++ /dev/null @@ -1,15 +0,0 @@ -# file : tests/cxx/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(out_base)/parser/ $(out_base)/tree/ -$(test): $(out_base)/parser/.test $(out_base)/tree/.test -$(clean): $(out_base)/parser/.clean $(out_base)/tree/.clean - -$(call import,$(src_base)/parser/makefile) -$(call import,$(src_base)/tree/makefile) diff --git a/tests/cxx/parser/built-in/driver.cxx b/tests/cxx/parser/built-in/driver.cxx deleted file mode 100644 index 6cfd8fc..0000000 --- a/tests/cxx/parser/built-in/driver.cxx +++ /dev/null @@ -1,529 +0,0 @@ -// file : tests/cxx/parser/built-in/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test built-in type parsing. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct any_type_pimpl: xml_schema::any_type_pimpl -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - _start_any_element (ro_string const&, - ro_string const& n, - ro_string const*) - { - cout << " start any element '" << n << "'" << endl; - } - - virtual void - _end_any_element (ro_string const&, ro_string const& n) - { - cout << " end any element '" << n << "'" << endl; - } - - virtual void - _any_attribute (ro_string const&, - ro_string const& n, - ro_string const& v) - { - cout << " any attribute " << n << " = '" << v << "'" << endl; - } - - virtual void - _any_characters (ro_string const& s) - { - cout << " any text: '" << s << "'" << endl; - } - - virtual void - post_any_type () - { - cout << "}" << endl - << endl; - } -}; - -struct any_simple_type_pimpl: xml_schema::any_simple_type_pimpl -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - _any_characters (ro_string const& s) - { - cout << " any text: '" << s << "'" << endl; - } - - virtual void - post_any_simple_type () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ - virtual void - boolean (bool v) - { - cout << v << endl; - } - - virtual void - byte (signed char v) - { - cout << short (v) << endl; - } - - virtual void - unsigned_byte (unsigned char v) - { - cout << (unsigned short) (v) << endl; - } - - virtual void - short_ (short v) - { - cout << v << endl; - } - - virtual void - unsigned_short (unsigned short v) - { - cout << v << endl; - } - - virtual void - int_ (int v) - { - cout << v << endl; - } - - virtual void - unsigned_int (unsigned int v) - { - cout << v << endl; - } - - virtual void - long_ (long long v) - { - cout << v << endl; - } - - virtual void - unsigned_long (unsigned long long v) - { - cout << v << endl; - } - - virtual void - integer (long long v) - { - cout << v << endl; - } - - virtual void - negative_integer (long long v) - { - cout << v << endl; - } - - - virtual void - non_positive_integer (long long v) - { - cout << v << endl; - } - - - virtual void - positive_integer (unsigned long long v) - { - cout << v << endl; - } - - virtual void - non_negative_integer (unsigned long long v) - { - cout << v << endl; - } - - virtual void - float_ (float v) - { - cout << v << endl; - } - - virtual void - double_ (double v) - { - cout << v << endl; - } - - virtual void - decimal (double v) - { - cout << v << endl; - } - - virtual void - string (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - normalized_string (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - token (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - name (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - nmtoken (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - nmtokens (xml_schema::string_sequence const& s) - { - cout << "'"; - - for (xml_schema::string_sequence::const_iterator i (s.begin ()); - i != s.end (); ++i) - cout << *i << " "; - - cout << "'" << endl; - } - - virtual void - ncname (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - id (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - idref (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - idrefs (xml_schema::string_sequence const& s) - { - cout << "'"; - - for (xml_schema::string_sequence::const_iterator i (s.begin ()); - i != s.end (); ++i) - cout << *i << " "; - - cout << "'" << endl; - } - - virtual void - language (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - uri (std::string const& v) - { - cout << "'" << v << "'" << endl; - } - - virtual void - qname (xml_schema::qname const& v) - { - cout << "'" << v.prefix () << ":" << v.name () << "'" << endl; - } - - virtual void - base64_binary (XSD_AUTO_PTR v) - { - std::string tmp (v->data (), v->size ()); - cout << "'" << tmp << "'" << endl; - } - - virtual void - hex_binary (XSD_AUTO_PTR v) - { - std::string tmp (v->data (), v->size ()); - cout << "'" << tmp << "'" << endl; - } - - virtual void - gday (xml_schema::gday const& v) - { - cout << v.day (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - gmonth (xml_schema::gmonth const& v) - { - cout << v.month (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - gyear (xml_schema::gyear const& v) - { - cout << v.year (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - gmonth_day (xml_schema::gmonth_day const& v) - { - cout << v.month () << '-' << v.day (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - gyear_month (xml_schema::gyear_month const& v) - { - cout << v.year () << '-' << v.month (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - date (xml_schema::date const& v) - { - cout << v.year () << '-' << v.month () << '-' << v.day (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - time (xml_schema::time const& v) - { - cout << v.hours () << ':' << v.minutes () << ':' << v.seconds (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - date_time (xml_schema::date_time const& v) - { - cout << v.year () << '-' << v.month () << '-' << v.day () << 'T' - << v.hours () << ':' << v.minutes () << ':' << v.seconds (); - - if (v.zone_present ()) - cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours () - << ':' << v.zone_minutes (); - - cout << endl; - } - - virtual void - duration (xml_schema::duration const& v) - { - cout << (v.negative () ? "-" : "") << 'P' - << v.years () << 'Y' - << v.months () << 'M' - << v.days () << 'D' - << 'T' - << v.hours () << 'H' - << v.minutes () << 'M' - << v.seconds () << 'S' - << endl; - } -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - any_type_pimpl any_type_p; - any_simple_type_pimpl any_simple_type_p; - - xml_schema::boolean_pimpl boolean_p; - - xml_schema::byte_pimpl byte_p; - xml_schema::unsigned_byte_pimpl unsigned_byte_p; - xml_schema::short_pimpl short_p; - xml_schema::unsigned_short_pimpl unsigned_short_p; - xml_schema::int_pimpl int_p; - xml_schema::unsigned_int_pimpl unsigned_int_p; - xml_schema::long_pimpl long_p; - xml_schema::unsigned_long_pimpl unsigned_long_p; - - xml_schema::integer_pimpl integer_p; - xml_schema::negative_integer_pimpl negative_integer_p; - xml_schema::non_positive_integer_pimpl non_positive_integer_p; - xml_schema::positive_integer_pimpl positive_integer_p; - xml_schema::non_negative_integer_pimpl non_negative_integer_p; - - xml_schema::float_pimpl float_p; - xml_schema::double_pimpl double_p; - xml_schema::decimal_pimpl decimal_p; - - xml_schema::string_pimpl string_p; - xml_schema::normalized_string_pimpl normalized_string_p; - xml_schema::token_pimpl token_p; - xml_schema::name_pimpl name_p; - xml_schema::nmtoken_pimpl nmtoken_p; - xml_schema::nmtokens_pimpl nmtokens_p; - xml_schema::ncname_pimpl ncname_p; - xml_schema::id_pimpl id_p; - xml_schema::idref_pimpl idref_p; - xml_schema::idrefs_pimpl idrefs_p; - - xml_schema::language_pimpl language_p; - xml_schema::uri_pimpl uri_p; - xml_schema::qname_pimpl qname_p; - - xml_schema::base64_binary_pimpl base64_binary_p; - xml_schema::hex_binary_pimpl hex_binary_p; - - xml_schema::gday_pimpl gday_p; - xml_schema::gmonth_pimpl gmonth_p; - xml_schema::gyear_pimpl gyear_p; - xml_schema::gmonth_day_pimpl gmonth_day_p; - xml_schema::gyear_month_pimpl gyear_month_p; - xml_schema::date_pimpl date_p; - xml_schema::time_pimpl time_p; - xml_schema::date_time_pimpl date_time_p; - xml_schema::duration_pimpl duration_p; - - type_pimpl type_p; - - type_p.parsers (any_type_p, - any_simple_type_p, - boolean_p, - byte_p, - unsigned_byte_p, - short_p, - unsigned_short_p, - int_p, - unsigned_int_p, - long_p, - unsigned_long_p, - integer_p, - negative_integer_p, - non_positive_integer_p, - positive_integer_p, - non_negative_integer_p, - float_p, - double_p, - decimal_p, - string_p, - normalized_string_p, - token_p, - name_p, - nmtoken_p, - nmtokens_p, - ncname_p, - id_p, - idref_p, - idrefs_p, - language_p, - uri_p, - qname_p, - base64_binary_p, - hex_binary_p, - gday_p, - gmonth_p, - gyear_p, - gmonth_day_p, - gyear_month_p, - date_p, - time_p, - date_time_p, - duration_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile deleted file mode 100644 index 5602b6a..0000000 --- a/tests/cxx/parser/built-in/makefile +++ /dev/null @@ -1,82 +0,0 @@ -# file : tests/cxx/parser/built-in/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/built-in/output b/tests/cxx/parser/built-in/output deleted file mode 100644 index 756abcd..0000000 --- a/tests/cxx/parser/built-in/output +++ /dev/null @@ -1,164 +0,0 @@ -{ - any attribute x = 'x' - any text: ' - ' - start any element 'a' - any text: 'a' - end any element 'a' - any text: ' - ' - start any element 'any-type' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any-type' - any text: ' - ' -} - -{ - any text: '123abc' -} - -1 -0 -1 -0 -0 -127 --128 -123 -0 -255 -123 -0 -32767 --32768 --12345 -0 -65535 -12345 -0 -2147483647 --2147483648 --1234567890 -0 -4294967295 -1234567890 -0 -9223372036854775807 --9223372036854775808 --1234567890123456789 -0 -18446744073709551615 -12345678901234567890 -0 -2147483647 --2147483648 --1234567890 --2147483648 --1234567890 -0 --2147483648 --1234567890 -4294967295 -1234567890 -0 -4294967295 -1234567890 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -123.567 -123.567 --123.567 -'string space -newline - ' -' string space newline ' -'string space newline' -'as123:345-.abs' -'1as123:345-.abs' -'abc 123 ' -'as123_345-.abs' -'as123_345-.abs' -'abc' -'a123' -'as123_345-.abs' -'abc a123 ' -'x' -'en' -'en-us' -'one-two-three-four44-seven77-eight888' -'' -'relative' -'#id' -'http://www.example.com/foo#bar' -':schemaLocation' -'xsi:schemaLocation' -'12345abcjk' -'a' -'ab' -'abc' -'' -'12345abcjk' -12+12:0 -1 -31 -15+0:0 -15-14:0 -10+12:0 -1 -12+0:0 -2007+12:0 -1 --20000+0:0 -10-28+12:0 -12-31 -1-1+0:0 -2007-12+12:0 --2007-10 -20007-10+0:0 --20007-1 -2007-12-26+12:0 --2007-10-15 -20007-12-31+0:0 --20007-1-1 -12:46:23.456+12:0 -12:13:14 -12:13:14+0:0 -2007-12-26T12:13:14.123+12:0 --2007-10-15T12:13:14 -20007-12-31T12:13:14+0:0 --20007-1-1T12:13:14 --P2007Y13M32DT25H61M61.123S -P1Y0M0DT0H0M0S -P0Y1M0DT0H0M0S -P0Y0M1DT0H0M0S -P0Y0M0DT1H0M0S -P0Y0M0DT0H1M0S -P0Y0M0DT0H0M1.1S -P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/built-in/test.xml b/tests/cxx/parser/built-in/test.xml deleted file mode 100644 index 8d9332a..0000000 --- a/tests/cxx/parser/built-in/test.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - a - aaabbbccc - - - 123abc - - 1 - 0 - true - false - - 0 - +127 - -128 - 123 - - 0 - 255 - 123 - - 0 - +32767 - -32768 - -12345 - - 0 - 65535 - 12345 - - 0 - +2147483647 - -2147483648 - -1234567890 - - 0 - 4294967295 - 1234567890 - - 0 - +9223372036854775807 - -9223372036854775808 - -1234567890123456789 - - 0 - 18446744073709551615 - 12345678901234567890 - - 0 - +2147483647 - -02147483648 - -1234567890 - - -02147483648 - -1234567890 - - 0 - -02147483648 - -1234567890 - - 4294967295 - +01234567890 - - 0 - 4294967295 - +01234567890 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - 123.567 - +123.567 - -123.567 - - string space -newline - - - string space -newline - - - - string space -newline - - - - as123:345-.abs - - 1as123:345-.abs - - abc 123 - - as123_345-.abs - - as123_345-.abs - abc - a123 - - as123_345-.abs - - abc a123 - - x - en - en-us - one-two-three-four44-seven77-eight888 - - - relative - #id - http://www.example.com/foo#bar - - schemaLocation - xsi:schemaLocation - - MTIzND - VhYmNqaw = = - YQ== - YWI= - YWJj - - - 31323334356162636a6b - - ---12+12:00 - ---01 - ---31 - ---15Z - ---15-14:00 - - --10+12:00 - --01 - --12Z - - 2007+12:00 - 0001 - -20000Z - - --10-28+12:00 - --12-31 - --01-01Z - - 2007-12+12:00 - -2007-10 - 20007-10Z - -20007-01 - - 2007-12-26+12:00 - -2007-10-15 - 20007-12-31Z - -20007-01-01 - - - - - - 2007-12-26T12:13:14.123+12:00 - -2007-10-15T12:13:14 - 20007-12-31T12:13:14Z - -20007-01-01T12:13:14 - - -P2007Y13M32DT25H61M61.123S - P1Y - P1M - P1D - PT1H - PT1M - PT1.1S - P1YT1S - - diff --git a/tests/cxx/parser/built-in/test.xsd b/tests/cxx/parser/built-in/test.xsd deleted file mode 100644 index 9c00eb4..0000000 --- a/tests/cxx/parser/built-in/test.xsd +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/enumeration/driver.cxx b/tests/cxx/parser/enumeration/driver.cxx deleted file mode 100644 index e90f58b..0000000 --- a/tests/cxx/parser/enumeration/driver.cxx +++ /dev/null @@ -1,81 +0,0 @@ -// file : tests/cxx/parser/enumeration/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test xsd:enumeration parsing. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace xml_schema; - -struct digit_pimpl: test::digit_pskel, int_pimpl -{ -}; - -struct gender_pimpl: test::gender_pskel, string_pimpl -{ - virtual ::gender - post_gender () - { - std::string str (post_string ()); - - if (str == "male") - return male; - else - return female; - } -}; - -struct type_pimpl: test::type_pskel -{ - virtual void - digit (int i) - { - cout << i << endl; - } - - virtual void - gender (::gender g) - { - cout << g << endl; - } -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - digit_pimpl digit_p; - gender_pimpl gender_p; - type_pimpl type_p; - - type_p.parsers (digit_p, gender_p); - - document doc_p (type_p, "test", "root"); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/enumeration/gender.hxx b/tests/cxx/parser/enumeration/gender.hxx deleted file mode 100644 index a2e5cd8..0000000 --- a/tests/cxx/parser/enumeration/gender.hxx +++ /dev/null @@ -1,13 +0,0 @@ -// file : tests/cxx/parser/enumeration/gender.hxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#ifndef GENDER_HXX -#define GENDER_HXX - -enum gender -{ - male, - female -}; - -#endif // GENDER_HXX diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile deleted file mode 100644 index f2ae834..0000000 --- a/tests/cxx/parser/enumeration/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/enumeration/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --type-map $(src_base)/test.map -$(gen): $(out_root)/xsd/xsd $(src_base)/test.map - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/enumeration/output b/tests/cxx/parser/enumeration/output deleted file mode 100644 index 16db301..0000000 --- a/tests/cxx/parser/enumeration/output +++ /dev/null @@ -1,3 +0,0 @@ -1 -0 -1 diff --git a/tests/cxx/parser/enumeration/test.map b/tests/cxx/parser/enumeration/test.map deleted file mode 100644 index f8868d6..0000000 --- a/tests/cxx/parser/enumeration/test.map +++ /dev/null @@ -1,7 +0,0 @@ -namespace test -{ - include "gender.hxx"; - - digit int int; - gender ::gender ::gender; -} diff --git a/tests/cxx/parser/enumeration/test.xml b/tests/cxx/parser/enumeration/test.xml deleted file mode 100644 index a6fa893..0000000 --- a/tests/cxx/parser/enumeration/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 1 - - male - female - - diff --git a/tests/cxx/parser/enumeration/test.xsd b/tests/cxx/parser/enumeration/test.xsd deleted file mode 100644 index ded3a18..0000000 --- a/tests/cxx/parser/enumeration/test.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile deleted file mode 100644 index ba26c37..0000000 --- a/tests/cxx/parser/generated-impl/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/parser/generated-impl/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd - -obj := $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.o) $(xsd:.xsd=-pimpl.o) $(xsd:.xsd=-driver.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/$(xsd:.xsd=-driver) -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) \ - $(xsd:.xsd=-pskel.ixx) \ - $(xsd:.xsd=-pskel.cxx) \ - $(xsd:.xsd=-pimpl.hxx) \ - $(xsd:.xsd=-pimpl.cxx) \ - $(xsd:.xsd=-driver.cxx) - -gen := $(addprefix $(out_base)/,$(genf)) - - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-print-impl --generate-test-driver \ ---force-overwrite -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := $(xsd:.xsd=-driver) $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -xsd_parser_impl_suffix := -pimpl - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/generated-impl/output b/tests/cxx/parser/generated-impl/output deleted file mode 100644 index 7c58647..0000000 --- a/tests/cxx/parser/generated-impl/output +++ /dev/null @@ -1,122 +0,0 @@ -gender: male -foo: foo -gender: male -int: 0 -int: 1 -int: 2 -int: 3 -foo: foo -int: 3 -int: 2 -int: 1 -int: 0 -union: 9 -foo: foo -union: string -x: x -a: aaa -x: x -y: y -a: aaa -b: bbb -boolean: 1 -boolean: 0 -boolean: 1 -boolean: 0 -byte: 0 -byte: 123 -byte: -123 -unsigned-byte: 0 -unsigned-byte: 123 -short: 0 -short: -1234 -short: 1234 -unsigned-short: 0 -unsigned-short: 1234 -int: 0 -int: -12345 -int: 12345 -unsigned-int: 0 -unsigned-int: 12345 -long: 0 -long: -123456 -long: 123456 -unsigned-long: 0 -unsigned-long: 123456 -integer: 0 -integer: -123456 -integer: 123456 -negative-integer: -123456 -non-positive-integer: 0 -non-positive-integer: -123456 -positive-integer: 123456 -non-negative-integer: 0 -non-negative-integer: 123456 -float: 0 -float: 1.123 -float: -1.123 -double: 0 -double: 1.1234 -double: -1.1234 -decimal: 0 -decimal: 1.1234 -decimal: -1.1234 -string: string space newline -normalized-string: string space newline -token: string space newline -name: as123:345-.abs -nmtoken: 1as123:345-.abs -nmtokens: abc 123 -ncname: as123_345-.abs -id: abc -id: a123 -idref: abc -idrefs: abc a123 -language: en -language: en-us -uri: http://www.example.com/foo#bar -qname: schemaLocation -qname: xsi:schemaLocation -base64_binary: 10 bytes -base64_binary: 1 bytes -base64_binary: 2 bytes -base64_binary: 3 bytes -hex_binary: 0 bytes -hex_binary: 10 bytes -gday: ---12+12:0 -gday: ---1 -gday: ---31 -gday: ---15+0:0 -gday: ---15-14:0 -gmonth: --10+12:0 -gmonth: --1 -gmonth: --12+0:0 -gyear: 2007+12:0 -gyear: 1 -gyear: -20000+0:0 -gmonth_day: --10-28+12:0 -gmonth_day: --12-31 -gmonth_day: --1-1+0:0 -gyear_month: 2007-12+12:0 -gyear_month: -2007-10 -gyear_month: 20007-10+0:0 -gyear_month: -20007-1 -date: 2007-12-26+12:0 -date: -2007-10-15 -date: 20007-12-31+0:0 -date: -20007-1-1 -time: 12:46:23.456+12:0 -time: 12:13:14 -time: 12:13:14+0:0 -date_time: 2007-12-26T12:13:14.123+12:0 -date_time: -2007-10-15T12:13:14 -date_time: 20007-12-31T12:13:14+0:0 -date_time: -20007-1-1T12:13:14 -duration: -P2007Y13M32DT25H61M61.123S -duration: P1Y0M0DT0H0M0S -duration: P0Y1M0DT0H0M0S -duration: P0Y0M1DT0H0M0S -duration: P0Y0M0DT1H0M0S -duration: P0Y0M0DT0H1M0S -duration: P0Y0M0DT0H0M1.1S -duration: P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/generated-impl/test.xml b/tests/cxx/parser/generated-impl/test.xml deleted file mode 100644 index 2f29a39..0000000 --- a/tests/cxx/parser/generated-impl/test.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - male - male - - 0 1 2 3 - 3 2 1 0 - - 9 - string - - - aaa - - - - aaa - bbb - - - aaabbbccc - abc123 - - 1 - 0 - true - false - - 0 - 123 - -123 - - 0 - 123 - - 0 - -1234 - 1234 - - 0 - 1234 - - 0 - -12345 - 12345 - - 0 - 12345 - - 0 - -123456 - 123456 - - 0 - 123456 - - 0 - -123456 - 123456 - - -123456 - - 0 - -123456 - - 123456 - - 0 - 123456 - - 0 - 1.123 - -1.123 - - 0 - 1.1234 - -1.1234 - - 0 - 1.1234 - -1.1234 - - string space newline - - string space newline - - string space newline - - as123:345-.abs - - 1as123:345-.abs - - abc 123 - - as123_345-.abs - - abc - a123 - - abc - - abc a123 - - en - en-us - - http://www.example.com/foo#bar - - schemaLocation - xsi:schemaLocation - - MTIzNDVhYmNqaw== - YQ== - YWI= - YWJj - - - 31323334356162636a6b - - ---12+12:00 - ---01 - ---31 - ---15Z - ---15-14:00 - - --10+12:00 - --01 - --12Z - - 2007+12:00 - 0001 - -20000Z - - --10-28+12:00 - --12-31 - --01-01Z - - 2007-12+12:00 - -2007-10 - 20007-10Z - -20007-01 - - 2007-12-26+12:00 - -2007-10-15 - 20007-12-31Z - -20007-01-01 - - - - - - 2007-12-26T12:13:14.123+12:00 - -2007-10-15T12:13:14 - 20007-12-31T12:13:14Z - -20007-01-01T12:13:14 - - -P2007Y13M32DT25H61M61.123S - P1Y - P1M - P1D - PT1H - PT1M - PT1.1S - P1YT1S - - diff --git a/tests/cxx/parser/generated-impl/test.xsd b/tests/cxx/parser/generated-impl/test.xsd deleted file mode 100644 index 7bc8f23..0000000 --- a/tests/cxx/parser/generated-impl/test.xsd +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/list/driver.cxx b/tests/cxx/parser/list/driver.cxx deleted file mode 100644 index dfc27bf..0000000 --- a/tests/cxx/parser/list/driver.cxx +++ /dev/null @@ -1,105 +0,0 @@ -// file : tests/cxx/parser/list/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test xsd:list parsing. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct string_list_pimpl: string_list_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - item (string const& v) - { - cout << " '" << v << "'" << endl; - } - - virtual void - post_string_list () - { - cout << "}" << endl - << endl; - } -}; - -struct string_list_lang_pimpl: string_list_lang_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - item (string const& v) - { - cout << " '" << v << "'" << endl; - } - - virtual void - lang (string const& v) - { - cout << " lang: '" << v << "'" << endl; - } - - virtual void - post_string_list_lang () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - string_list_pimpl string_list_p; - string_list_lang_pimpl string_list_lang_p; - type_pimpl type_p; - - string_list_p.parsers (string_p); - string_list_lang_p.parsers (string_p, string_p); - type_p.parsers (string_list_p, string_list_lang_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile deleted file mode 100644 index c3b5a87..0000000 --- a/tests/cxx/parser/list/makefile +++ /dev/null @@ -1,82 +0,0 @@ -# file : tests/cxx/parser/list/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/list/output b/tests/cxx/parser/list/output deleted file mode 100644 index 3642c4d..0000000 --- a/tests/cxx/parser/list/output +++ /dev/null @@ -1,26 +0,0 @@ -{ -} - -{ -} - -{ -} - -{ - 'one' -} - -{ - 'one' - 'two' - 'three' -} - -{ - lang: 'en' - 'one' - 'two' - 'three' -} - diff --git a/tests/cxx/parser/list/test.xml b/tests/cxx/parser/list/test.xml deleted file mode 100644 index 52229db..0000000 --- a/tests/cxx/parser/list/test.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - one - - - one two - three - - - - one two - three - - - diff --git a/tests/cxx/parser/list/test.xsd b/tests/cxx/parser/list/test.xsd deleted file mode 100644 index 79bd084..0000000 --- a/tests/cxx/parser/list/test.xsd +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile deleted file mode 100644 index 53de7c7..0000000 --- a/tests/cxx/parser/makefile +++ /dev/null @@ -1,18 +0,0 @@ -# file : tests/cxx/parser/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -tests := built-in enumeration generated-impl list recursive \ -name-clash/inheritance polymorphism test-template validation \ -union - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/parser/name-clash/inheritance/driver.cxx b/tests/cxx/parser/name-clash/inheritance/driver.cxx deleted file mode 100644 index dc5f871..0000000 --- a/tests/cxx/parser/name-clash/inheritance/driver.cxx +++ /dev/null @@ -1,62 +0,0 @@ -// file : tests/cxx/parser/name-clash/inheritance/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test for name clashes across inheritance hierarchy. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct derived_pimpl: derived_pskel -{ - virtual void - e (string const& v) - { - cout << "e: " << v << endl; - } - - virtual void - e1 (string const& v) - { - cout << "e1: " << v << endl; - } -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - derived_pimpl derived_p; - - derived_p.parsers (string_p, string_p); - - xml_schema::document doc_p (derived_p, "test", "root"); - - derived_p.pre (); - doc_p.parse (argv[1]); - derived_p.post_derived (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile deleted file mode 100644 index c540ebe..0000000 --- a/tests/cxx/parser/name-clash/inheritance/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/name-clash/inheritance/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/name-clash/inheritance/output b/tests/cxx/parser/name-clash/inheritance/output deleted file mode 100644 index 4efd51b..0000000 --- a/tests/cxx/parser/name-clash/inheritance/output +++ /dev/null @@ -1,2 +0,0 @@ -e: e -e1: e1 diff --git a/tests/cxx/parser/name-clash/inheritance/test.xml b/tests/cxx/parser/name-clash/inheritance/test.xml deleted file mode 100644 index 8c17101..0000000 --- a/tests/cxx/parser/name-clash/inheritance/test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - e - e1 - - diff --git a/tests/cxx/parser/name-clash/inheritance/test.xsd b/tests/cxx/parser/name-clash/inheritance/test.xsd deleted file mode 100644 index 62a782e..0000000 --- a/tests/cxx/parser/name-clash/inheritance/test.xsd +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile deleted file mode 100644 index 252d857..0000000 --- a/tests/cxx/parser/polymorphism/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/parser/polymorphism/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := same-type recursive - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/parser/polymorphism/recursive/driver.cxx b/tests/cxx/parser/polymorphism/recursive/driver.cxx deleted file mode 100644 index 4a401bd..0000000 --- a/tests/cxx/parser/polymorphism/recursive/driver.cxx +++ /dev/null @@ -1,68 +0,0 @@ -// file : tests/cxx/parser/polymorphism/recursive/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test polymorphic recursive parsing. -// - -#include -#include - -#include "test-pskel.hxx" -#include "test-pimpl.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 - { - xml_schema::int_pimpl int_p; - - root_pimpl root_p; - expression_pimpl expression_p; - recursive_pimpl recursive_p; - value_a_pimpl value_a_p; - value_b_pimpl value_b_p; - - xml_schema::parser_map_impl expression_map; - - // Connect the parsers together. - // - root_p.parsers (expression_p); - expression_map.insert(value_a_p); - expression_map.insert(value_b_p); - expression_map.insert(recursive_p); - - root_p.expression_parser(expression_map); - - recursive_p.parsers(expression_p); - recursive_p.expression_parser(expression_map); - - value_a_p.parsers(int_p); - value_b_p.parsers(int_p); - - xml_schema::document doc_p (root_p, "test", "root", true); - - root_p.pre (); - doc_p.parse (argv[1]); - root_p.post_root (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/polymorphism/recursive/makefile b/tests/cxx/parser/polymorphism/recursive/makefile deleted file mode 100644 index 855d471..0000000 --- a/tests/cxx/parser/polymorphism/recursive/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/polymorphism/recursive/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx test-pimpl.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-polymorphic -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/polymorphism/recursive/output b/tests/cxx/parser/polymorphism/recursive/output deleted file mode 100644 index 28a835f..0000000 --- a/tests/cxx/parser/polymorphism/recursive/output +++ /dev/null @@ -1,22 +0,0 @@ -root start -recursive start -value_a begin -value->constant -value: post_expression override -value_a: post_value override -value_a end -recursive->expression event -recursive start -value_b begin -value->constant -value: post_expression override -value_b: post_value override -value_b end -recursive->expression event -recursive: post_expression override -recursive end -recursive->expression event -recursive: post_expression override -recursive end -root->expression -root end diff --git a/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx b/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx deleted file mode 100644 index 8c355ea..0000000 --- a/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx +++ /dev/null @@ -1,147 +0,0 @@ -// file : tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#include - -#include "test-pimpl.hxx" - -using namespace std; - -namespace test -{ - // root_pimpl - // - - void root_pimpl:: - pre () - { - cout << "root start" << endl; - } - - void root_pimpl:: - expression () - { - cout << "root->expression" << endl; - } - - void root_pimpl:: - post_root () - { - cout << "root end" << endl; - } - - // expression_pimpl - // - - void expression_pimpl:: - pre () - { - cout << "expression begin" << endl; - } - - void expression_pimpl:: - post_expression () - { - cout << "expression end" << endl; - } - - // recursive_pimpl - // - - void recursive_pimpl:: - pre () - { - cout << "recursive start" << endl; - } - - void recursive_pimpl:: - expression () - { - cout << "recursive->expression event" << endl; - } - - void recursive_pimpl:: - post_expression () - { - cout << "recursive: post_expression override" << endl; - post_recursive (); - } - - void recursive_pimpl:: - post_recursive () - { - cout << "recursive end" << endl; - } - - // value_pimpl - // - - void value_pimpl:: - pre () - { - cout << "value begin" << endl; - } - - void value_pimpl:: - constant (int) - { - cout << "value->constant" << endl; - } - - void value_pimpl:: - post_expression () - { - cout << "value: post_expression override" << endl; - post_value (); - } - - void value_pimpl:: - post_value () - { - cout << "value end" << endl; - } - - // value_a_pimpl - // - - void value_a_pimpl:: - pre () - { - cout << "value_a begin" << endl; - } - - void value_a_pimpl:: - post_value () - { - cout << "value_a: post_value override" << endl; - post_value_a (); - } - - void value_a_pimpl:: - post_value_a () - { - cout << "value_a end" << endl; - } - - // value_b_pimpl - // - - void value_b_pimpl:: - pre () - { - cout << "value_b begin" << endl; - } - - void value_b_pimpl:: - post_value () - { - cout << "value_b: post_value override" << endl; - post_value_b (); - } - - void value_b_pimpl:: - post_value_b () - { - cout << "value_b end" << endl; - } -} diff --git a/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx b/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx deleted file mode 100644 index 932be9e..0000000 --- a/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx +++ /dev/null @@ -1,94 +0,0 @@ -// file : tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#ifndef TEST_PIMPL_HXX -#define TEST_PIMPL_HXX - -#include "test-pskel.hxx" - -namespace test -{ - class root_pimpl: public virtual root_pskel - { - public: - virtual void - pre (); - - virtual void - expression (); - - virtual void - post_root (); - }; - - class expression_pimpl: public virtual expression_pskel - { - public: - virtual void - pre (); - - virtual void - post_expression (); - }; - - class recursive_pimpl: public virtual recursive_pskel, - public expression_pimpl - { - public: - virtual void - pre (); - - virtual void - expression (); - - virtual void - post_expression (); - - virtual void - post_recursive (); - }; - - class value_pimpl: public virtual value_pskel, public expression_pimpl - { - public: - virtual void - pre (); - - virtual void - constant (int); - - virtual void - post_expression (); - - virtual void - post_value (); - }; - - class value_a_pimpl: public virtual value_a_pskel, public value_pimpl - { - public: - virtual void - pre (); - - virtual void - post_value (); - - virtual void - post_value_a (); - }; - - class value_b_pimpl: public virtual value_b_pskel, public value_pimpl - { - public: - virtual void - pre (); - - virtual void - post_value (); - - virtual void - post_value_b (); - }; -} - -#endif // TEST_PIMPL_HXX diff --git a/tests/cxx/parser/polymorphism/recursive/test.xml b/tests/cxx/parser/polymorphism/recursive/test.xml deleted file mode 100644 index 42035ba..0000000 --- a/tests/cxx/parser/polymorphism/recursive/test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - 1 - - - - 2 - - - - diff --git a/tests/cxx/parser/polymorphism/recursive/test.xsd b/tests/cxx/parser/polymorphism/recursive/test.xsd deleted file mode 100644 index affcc8a..0000000 --- a/tests/cxx/parser/polymorphism/recursive/test.xsd +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/polymorphism/same-type/driver.cxx b/tests/cxx/parser/polymorphism/same-type/driver.cxx deleted file mode 100644 index 4ccaec5..0000000 --- a/tests/cxx/parser/polymorphism/same-type/driver.cxx +++ /dev/null @@ -1,62 +0,0 @@ -// file : tests/cxx/parser/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 -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct base_pimpl: base_pskel -{ - virtual void - a (string const& v) - { - cout << v << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - base_pimpl base_p; - type_pimpl type_p; - - base_p.parsers (string_p); - type_p.parsers (base_p); - - xml_schema::document doc_p (type_p, "test", "root", true); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/polymorphism/same-type/makefile b/tests/cxx/parser/polymorphism/same-type/makefile deleted file mode 100644 index 588d8b6..0000000 --- a/tests/cxx/parser/polymorphism/same-type/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/polymorphism/same-type/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-polymorphic -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/polymorphism/same-type/output b/tests/cxx/parser/polymorphism/same-type/output deleted file mode 100644 index d418277..0000000 --- a/tests/cxx/parser/polymorphism/same-type/output +++ /dev/null @@ -1,4 +0,0 @@ -a1 -a2 -a3 -a4 diff --git a/tests/cxx/parser/polymorphism/same-type/test.xml b/tests/cxx/parser/polymorphism/same-type/test.xml deleted file mode 100644 index f8b6d1e..0000000 --- a/tests/cxx/parser/polymorphism/same-type/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - a1 - a2 - a3 - a4 - - diff --git a/tests/cxx/parser/polymorphism/same-type/test.xsd b/tests/cxx/parser/polymorphism/same-type/test.xsd deleted file mode 100644 index a4157d3..0000000 --- a/tests/cxx/parser/polymorphism/same-type/test.xsd +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/recursive/driver.cxx b/tests/cxx/parser/recursive/driver.cxx deleted file mode 100644 index 39c6621..0000000 --- a/tests/cxx/parser/recursive/driver.cxx +++ /dev/null @@ -1,139 +0,0 @@ -// file : tests/cxx/parser/recursive/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test recursive parser invocation. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; - -struct sub_pimpl: sub_type_pskel -{ - virtual void - pre () - { - cout << "sub::pre" << endl; - } - - virtual void - sub () - { - cout << "sub::sub" << endl; - } - - virtual void - sub2 () - { - cout << "sub::sub2" << endl; - } - - virtual void - name (string const& n) - { - cout << "sub::name: " << n << endl; - } - - virtual void - post_sub_type () - { - cout << "sub::post" << endl; - } -}; - -struct indir_pimpl: indir_type_pskel -{ - virtual void - pre () - { - cout << "indir::pre" << endl; - } - - virtual void - sub () - { - cout << "indir::sub" << endl; - } - - virtual void - name (string const& n) - { - cout << "indir::name: " << n << endl; - } - - virtual void - post_indir_type () - { - cout << "indir::post" << endl; - } -}; - -struct test_pimpl: test_type_pskel -{ - virtual void - pre () - { - cout << "test::pre" << endl; - } - - virtual void - sub () - { - cout << "test::sub" << endl; - } - - virtual void - name (string const& n) - { - cout << "test::name: " << n << endl; - } - - virtual void - post_test_type () - { - cout << "test::post" << endl; - } -}; - - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - - sub_pimpl sub_p; - indir_pimpl indir_p; - test_pimpl test_p; - - sub_p.parsers (sub_p, indir_p, sub_p, string_p); - indir_p.parsers (sub_p, string_p); - test_p.parsers (sub_p, string_p); - - xml_schema::document doc_p (test_p, "test"); - - test_p.pre (); - doc_p.parse (argv[1]); - test_p.post_test_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile deleted file mode 100644 index a1bc9ab..0000000 --- a/tests/cxx/parser/recursive/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/recursive/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/recursive/output b/tests/cxx/parser/recursive/output deleted file mode 100644 index f26fb72..0000000 --- a/tests/cxx/parser/recursive/output +++ /dev/null @@ -1,22 +0,0 @@ -test::pre -test::name: testName -sub::pre -sub::name: subName -sub::pre -sub::name: sub-subName -sub::post -sub::sub -indir::pre -indir::name: sub-indirName -sub::pre -sub::name: sub-indir-subName -sub::post -indir::sub -indir::post -sub::pre -sub::name: sub-sub2Name -sub::post -sub::sub2 -sub::post -test::sub -test::post diff --git a/tests/cxx/parser/recursive/test.xml b/tests/cxx/parser/recursive/test.xml deleted file mode 100644 index f6c219d..0000000 --- a/tests/cxx/parser/recursive/test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/tests/cxx/parser/recursive/test.xsd b/tests/cxx/parser/recursive/test.xsd deleted file mode 100644 index 33e1d2d..0000000 --- a/tests/cxx/parser/recursive/test.xsd +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/test-template/driver.cxx b/tests/cxx/parser/test-template/driver.cxx deleted file mode 100644 index 9f56496..0000000 --- a/tests/cxx/parser/test-template/driver.cxx +++ /dev/null @@ -1,66 +0,0 @@ -// file : tests/cxx/parser/test-template/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Insert test description here. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct type_pimpl: type_pskel -{ - virtual void - pre () - { - } - - virtual void - a (string const& v) - { - cout << v << endl; - } - - virtual void - post_type () - { - } -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - type_pimpl type_p; - - type_p.parsers (string_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile deleted file mode 100644 index b680466..0000000 --- a/tests/cxx/parser/test-template/makefile +++ /dev/null @@ -1,82 +0,0 @@ -# file : tests/cxx/parser/test-template/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/test-template/output b/tests/cxx/parser/test-template/output deleted file mode 100644 index 7898192..0000000 --- a/tests/cxx/parser/test-template/output +++ /dev/null @@ -1 +0,0 @@ -a diff --git a/tests/cxx/parser/test-template/test.xml b/tests/cxx/parser/test-template/test.xml deleted file mode 100644 index 624a80c..0000000 --- a/tests/cxx/parser/test-template/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a - - diff --git a/tests/cxx/parser/test-template/test.xsd b/tests/cxx/parser/test-template/test.xsd deleted file mode 100644 index 07bebc7..0000000 --- a/tests/cxx/parser/test-template/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/parser/union/driver.cxx b/tests/cxx/parser/union/driver.cxx deleted file mode 100644 index 5577f78..0000000 --- a/tests/cxx/parser/union/driver.cxx +++ /dev/null @@ -1,60 +0,0 @@ -// file : tests/cxx/parser/union/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test xsd:union parsing. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct int_string_union_pimpl: int_string_union_pskel -{ - virtual void - _characters (const xml_schema::ro_string& s) - { - cout << "'" << s << "'" << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - int_string_union_pimpl int_string_union_p; - type_pimpl type_p; - - type_p.parsers (int_string_union_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - type_p.pre (); - doc_p.parse (argv[1]); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (std::ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile deleted file mode 100644 index a8e70f6..0000000 --- a/tests/cxx/parser/union/makefile +++ /dev/null @@ -1,82 +0,0 @@ -# file : tests/cxx/parser/union/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/union/output b/tests/cxx/parser/union/output deleted file mode 100644 index a92ffc3..0000000 --- a/tests/cxx/parser/union/output +++ /dev/null @@ -1,2 +0,0 @@ -'one' -'1' diff --git a/tests/cxx/parser/union/test.xml b/tests/cxx/parser/union/test.xml deleted file mode 100644 index 5b3e799..0000000 --- a/tests/cxx/parser/union/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - one - 1 - - diff --git a/tests/cxx/parser/union/test.xsd b/tests/cxx/parser/union/test.xsd deleted file mode 100644 index 5bf3d47..0000000 --- a/tests/cxx/parser/union/test.xsd +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/all/driver.cxx b/tests/cxx/parser/validation/all/driver.cxx deleted file mode 100644 index 093d480..0000000 --- a/tests/cxx/parser/validation/all/driver.cxx +++ /dev/null @@ -1,98 +0,0 @@ -// file : tests/cxx/parser/validation/all/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the all compositor validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct all_pimpl: all_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - c (string const& v) - { - cout << " c = " << v << endl; - } - - virtual void - post_all () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - all_pimpl all_p; - type_pimpl type_p; - - all_p.parsers (string_p, string_p, string_p); - type_p.parsers (all_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - try - { - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cout << " " << e << endl - << "}" << endl - << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile deleted file mode 100644 index b50e067..0000000 --- a/tests/cxx/parser/validation/all/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/all/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 001 002 003 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/all/test-000.std b/tests/cxx/parser/validation/all/test-000.std deleted file mode 100644 index b4445f2..0000000 --- a/tests/cxx/parser/validation/all/test-000.std +++ /dev/null @@ -1,46 +0,0 @@ -{ - a = a - b = b - c = c -} - -{ - a = a - c = c - b = b -} - -{ - b = b - a = a - c = c -} - -{ - b = b - c = c - a = a -} - -{ - c = c - a = a - b = b -} - -{ - c = c - b = b - a = a -} - -{ - a = a - b = b -} - -{ - a = a - b = b -} - diff --git a/tests/cxx/parser/validation/all/test-000.xml b/tests/cxx/parser/validation/all/test-000.xml deleted file mode 100644 index 6e46fae..0000000 --- a/tests/cxx/parser/validation/all/test-000.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - a - b - c - - - - a - c - b - - - - b - a - c - - - - b - c - a - - - - c - a - b - - - - c - b - a - - - - - a - b - - - - a - b - - - diff --git a/tests/cxx/parser/validation/all/test-001.std b/tests/cxx/parser/validation/all/test-001.std deleted file mode 100644 index 0472ad9..0000000 --- a/tests/cxx/parser/validation/all/test-001.std +++ /dev/null @@ -1,6 +0,0 @@ -{ - a = a - c = c - :9:9 error: expected element 'b' -} - diff --git a/tests/cxx/parser/validation/all/test-001.xml b/tests/cxx/parser/validation/all/test-001.xml deleted file mode 100644 index 3df5600..0000000 --- a/tests/cxx/parser/validation/all/test-001.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - a - c - - - diff --git a/tests/cxx/parser/validation/all/test-002.std b/tests/cxx/parser/validation/all/test-002.std deleted file mode 100644 index c014230..0000000 --- a/tests/cxx/parser/validation/all/test-002.std +++ /dev/null @@ -1,4 +0,0 @@ -{ - :7:9 error: expected element 'a' -} - diff --git a/tests/cxx/parser/validation/all/test-002.xml b/tests/cxx/parser/validation/all/test-002.xml deleted file mode 100644 index aed0c0c..0000000 --- a/tests/cxx/parser/validation/all/test-002.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/tests/cxx/parser/validation/all/test-003.std b/tests/cxx/parser/validation/all/test-003.std deleted file mode 100644 index dd8c0d3..0000000 --- a/tests/cxx/parser/validation/all/test-003.std +++ /dev/null @@ -1,6 +0,0 @@ -{ - a = a - b = b - :9:7 error: unexpected element 'a' -} - diff --git a/tests/cxx/parser/validation/all/test-003.xml b/tests/cxx/parser/validation/all/test-003.xml deleted file mode 100644 index b147cba..0000000 --- a/tests/cxx/parser/validation/all/test-003.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - a - b - a - - - diff --git a/tests/cxx/parser/validation/all/test.xsd b/tests/cxx/parser/validation/all/test.xsd deleted file mode 100644 index 1f670e3..0000000 --- a/tests/cxx/parser/validation/all/test.xsd +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/any/driver.cxx b/tests/cxx/parser/validation/any/driver.cxx deleted file mode 100644 index 3896598..0000000 --- a/tests/cxx/parser/validation/any/driver.cxx +++ /dev/null @@ -1,121 +0,0 @@ -// file : tests/cxx/parser/validation/any/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the any particle validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct any_a_pimpl: any_a_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - x (string const& v) - { - cout << " x = " << v << endl; - } - - virtual void - _start_any_element (ro_string const&, - ro_string const& n, - ro_string const*) - { - cout << " start any element '" << n << "'" << endl; - } - - virtual void - _end_any_element (ro_string const&, ro_string const& n) - { - cout << " end any element '" << n << "'" << endl; - } - - virtual void - _any_attribute (ro_string const&, - ro_string const& n, - ro_string const& v) - { - cout << " any attribute " << n << " = '" << v << "'" << endl; - } - - virtual void - _any_characters (ro_string const& s) - { - cout << " any text: '" << s << "'" << endl; - } - - virtual void - post_any_a () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - any_a_pimpl any_a_p; - type_pimpl type_p; - - any_a_p.parsers (string_p, string_p); - type_p.parsers (any_a_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - try - { - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cout << " " << e << endl - << "}" << endl - << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile deleted file mode 100644 index fe3cdab..0000000 --- a/tests/cxx/parser/validation/any/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/any/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/any/test-000.std b/tests/cxx/parser/validation/any/test-000.std deleted file mode 100644 index a1cc6e3..0000000 --- a/tests/cxx/parser/validation/any/test-000.std +++ /dev/null @@ -1,29 +0,0 @@ -{ - start any element 'any' - end any element 'any' -} - -{ - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' -} - -{ - x = x - a = a - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' -} - diff --git a/tests/cxx/parser/validation/any/test-000.xml b/tests/cxx/parser/validation/any/test-000.xml deleted file mode 100644 index f1a0c83..0000000 --- a/tests/cxx/parser/validation/any/test-000.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - aaabbbccc - - - - a - aaabbbccc - - - diff --git a/tests/cxx/parser/validation/any/test.xsd b/tests/cxx/parser/validation/any/test.xsd deleted file mode 100644 index c05aeb5..0000000 --- a/tests/cxx/parser/validation/any/test.xsd +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/attribute/driver.cxx b/tests/cxx/parser/validation/attribute/driver.cxx deleted file mode 100644 index 8eda713..0000000 --- a/tests/cxx/parser/validation/attribute/driver.cxx +++ /dev/null @@ -1,197 +0,0 @@ -// file : tests/cxx/parser/validation/attribute/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test attribute and attribute wildcard (anyAttribute) validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct pass_a_pimpl: pass_a_pskel -{ - virtual void - pre () - { - cout << "pass-a" << endl - << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - _any_attribute (ro_string const& ns, - ro_string const& name, - ro_string const& value) - { - cout << " any: " << ns << "#" << name << " = " << value << endl; - } - - virtual void - post_pass_a () - { - cout << "}" << endl - << endl; - } -}; - -struct pass_b_pimpl: pass_b_pskel -{ - virtual void - pre () - { - cout << "pass-b" << endl - << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - _any_attribute (ro_string const& ns, - ro_string const& name, - ro_string const& value) - { - cout << " any: " << ns << "#" << name << " = " << value << endl; - } - - virtual void - post_pass_b () - { - cout << "}" << endl - << endl; - } -}; - -struct pass_c_pimpl: pass_c_pskel -{ - virtual void - pre () - { - cout << "pass-c" << endl - << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - post_pass_c () - { - cout << "}" << endl - << endl; - } -}; - -struct fail_pimpl: fail_pskel -{ - virtual void - pre () - { - cout << "fail" << endl - << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - post_fail () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - pass_a_pimpl pass_a_p; - pass_b_pimpl pass_b_p; - pass_c_pimpl pass_c_p; - fail_pimpl fail_p; - type_pimpl type_p; - - pass_a_p.parsers (string_p, string_p); - pass_b_p.parsers (string_p, string_p); - pass_c_p.parsers (string_p, string_p); - fail_p.parsers (string_p); - type_p.parsers (pass_a_p, pass_b_p, pass_c_p, fail_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - try - { - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cout << " " << e << endl - << "}" << endl - << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile deleted file mode 100644 index d92bf1d..0000000 --- a/tests/cxx/parser/validation/attribute/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/attribute/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/attribute/test-000.std b/tests/cxx/parser/validation/attribute/test-000.std deleted file mode 100644 index 847b054..0000000 --- a/tests/cxx/parser/validation/attribute/test-000.std +++ /dev/null @@ -1,24 +0,0 @@ -pass-a -{ - b = b - any: test#foo = foo - any: test#bar = bar -} - -pass-b -{ - a = a - b = b -} - -pass-c -{ - a = a - b = b -} - -fail -{ - :8:10 error: expected attribute 'a' -} - diff --git a/tests/cxx/parser/validation/attribute/test-000.xml b/tests/cxx/parser/validation/attribute/test-000.xml deleted file mode 100644 index b994d1a..0000000 --- a/tests/cxx/parser/validation/attribute/test-000.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/tests/cxx/parser/validation/attribute/test.xsd b/tests/cxx/parser/validation/attribute/test.xsd deleted file mode 100644 index 833eb8e..0000000 --- a/tests/cxx/parser/validation/attribute/test.xsd +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/built-in/any-type/driver.cxx b/tests/cxx/parser/validation/built-in/any-type/driver.cxx deleted file mode 100644 index fd91247..0000000 --- a/tests/cxx/parser/validation/built-in/any-type/driver.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/any-type/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the anyType and anySimpleType validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct any_type_pimpl: xml_schema::any_type_pimpl -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - _start_any_element (ro_string const&, - ro_string const& n, - ro_string const*) - { - cout << " start any element '" << n << "'" << endl; - } - - virtual void - _end_any_element (ro_string const&, ro_string const& n) - { - cout << " end any element '" << n << "'" << endl; - } - - virtual void - _any_attribute (ro_string const&, - ro_string const& n, - ro_string const& v) - { - cout << " any attribute " << n << " = '" << v << "'" << endl; - } - - virtual void - _any_characters (ro_string const& s) - { - cout << " any text: '" << s << "'" << endl; - } - - virtual void - post_any_type () - { - cout << "}" << endl - << endl; - } -}; - -struct any_simple_type_pimpl: xml_schema::any_simple_type_pimpl -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - _any_characters (ro_string const& s) - { - cout << " any text: '" << s << "'" << endl; - } - - virtual void - post_any_simple_type () - { - cout << "}" << endl - << endl; - } -}; - -struct any_extension_pimpl: virtual any_extension_pskel, - any_type_pimpl - -{ - virtual void - x (const string& v) - { - cout << " x = " << v << endl; - } -}; - -struct any_simple_extension_pimpl: virtual any_simple_extension_pskel, - any_simple_type_pimpl -{ - virtual void - x (const string& v) - { - cout << " x = " << v << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - - any_type_pimpl any_type_p; - any_simple_type_pimpl any_simple_type_p; - - any_extension_pimpl any_extension_p; - any_simple_extension_pimpl any_simple_extension_p; - - type_pimpl type_p; - - any_extension_p.parsers (string_p); - any_simple_extension_p.parsers (string_p); - - type_p.parsers (any_type_p, - any_extension_p, - any_simple_extension_p, - any_simple_type_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile deleted file mode 100644 index dfbb183..0000000 --- a/tests/cxx/parser/validation/built-in/any-type/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/any-type/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/built-in/any-type/test-000.std b/tests/cxx/parser/validation/built-in/any-type/test-000.std deleted file mode 100644 index 84d7b3a..0000000 --- a/tests/cxx/parser/validation/built-in/any-type/test-000.std +++ /dev/null @@ -1,99 +0,0 @@ -{ - any text: '123abc' -} - -{ - any text: ' - ' - start any element 'any' - end any element 'any' - any text: ' - ' -} - -{ - any text: ' - ' - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' - any text: ' - ' -} - -{ - any attribute x = 'x' - any text: ' - ' - start any element 'a' - any text: 'a' - end any element 'a' - any text: ' - ' - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' - any text: ' - ' -} - -{ - any text: ' - ' - start any element 'any' - end any element 'any' - any text: ' - ' -} - -{ - any text: ' - ' - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' - any text: ' - ' -} - -{ - x = x - any text: ' - ' - start any element 'a' - any text: 'a' - end any element 'a' - any text: ' - ' - start any element 'any' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any' - any text: ' - ' -} - -{ - x = x - any text: 'abc123' -} - diff --git a/tests/cxx/parser/validation/built-in/any-type/test-000.xml b/tests/cxx/parser/validation/built-in/any-type/test-000.xml deleted file mode 100644 index 7875b7e..0000000 --- a/tests/cxx/parser/validation/built-in/any-type/test-000.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - aaabbbccc - - - - a - aaabbbccc - - - - - - - - - - aaabbbccc - - - - a - aaabbbccc - - - - - abc123 - - diff --git a/tests/cxx/parser/validation/built-in/any-type/test.xsd b/tests/cxx/parser/validation/built-in/any-type/test.xsd deleted file mode 100644 index 86a4e13..0000000 --- a/tests/cxx/parser/validation/built-in/any-type/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/built-in/binary/driver.cxx b/tests/cxx/parser/validation/built-in/binary/driver.cxx deleted file mode 100644 index 86575f4..0000000 --- a/tests/cxx/parser/validation/built-in/binary/driver.cxx +++ /dev/null @@ -1,153 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/binary/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in base64Binary and hexBinary types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - typedef xsd::cxx::parser::buffer buffer; - - // Good. - // - - // hexBinary - // - { - hex_binary_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters (" "); - p._post (); - assert (*p.post_hex_binary () == buffer ()); - } - - { - hex_binary_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n313"); - p._characters ("23334356162636a6b "); - p._post (); - assert (*p.post_hex_binary () == buffer ("12345abcjk", 10)); - } - - // base64Binary - // - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("MTIzND "); - p._characters ("VhYmNqaw = = "); - p._post (); - assert (*p.post_base64_binary () == buffer ("12345abcjk", 10)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("YQ=="); - p._post (); - assert (*p.post_base64_binary () == buffer ("a", 1)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("YWI="); - p._post (); - assert (*p.post_base64_binary () == buffer ("ab", 2)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("YWJj"); - p._post (); - assert (*p.post_base64_binary () == buffer ("abc", 3)); - } - - // Bad - // - - // hexBinary - // - { - hex_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("313"); - assert (test_post_fail (p)); - } - - { - hex_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("313233343X6162636a6b"); - assert (test_post_fail (p)); - } - - // base64Binary - // - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("YQ"); - assert (test_post_fail (p)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("=="); - assert (test_post_fail (p)); - } - - { - base64_binary_pimpl p; - p.pre (); - p._pre (); - p._characters ("MTIzNDVhYmNqaw=A"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/binary/makefile b/tests/cxx/parser/validation/built-in/binary/makefile deleted file mode 100644 index f0c5ae6..0000000 --- a/tests/cxx/parser/validation/built-in/binary/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/binary/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/boolean/driver.cxx b/tests/cxx/parser/validation/built-in/boolean/driver.cxx deleted file mode 100644 index 6a21cb7..0000000 --- a/tests/cxx/parser/validation/built-in/boolean/driver.cxx +++ /dev/null @@ -1,145 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/boolean/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in boolean type validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -bool -test_post_fail (boolean_pimpl& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("true"); - p._post (); - assert (p.post_boolean ()); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("1"); - p._post (); - assert (p.post_boolean ()); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("false"); - p._post (); - assert (!p.post_boolean ()); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (!p.post_boolean ()); - } - - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters (" true "); - p._post (); - assert (p.post_boolean ()); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters (" "); - p._characters (" \n "); - p._characters (" fa"); - p._characters ("l"); - p._characters ("se "); - p._characters (" \n "); - p._characters (" "); - p._post (); - assert (!p.post_boolean ()); - } - - // Bad - // - { - boolean_pimpl p; - p.pre (); - p._pre (); - //p._characters (""); - assert (test_post_fail (p)); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters (""); - assert (test_post_fail (p)); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters (" "); - assert (test_post_fail (p)); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters (" "); - assert (test_post_fail (p)); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("fal"); - p._characters ("s "); - p._characters ("e"); - assert (test_post_fail (p)); - } - - { - boolean_pimpl p; - p.pre (); - p._pre (); - p._characters ("01"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/boolean/makefile b/tests/cxx/parser/validation/built-in/boolean/makefile deleted file mode 100644 index 52f4e88..0000000 --- a/tests/cxx/parser/validation/built-in/boolean/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/boolean/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/byte/driver.cxx b/tests/cxx/parser/validation/built-in/byte/driver.cxx deleted file mode 100644 index c0e2b99..0000000 --- a/tests/cxx/parser/validation/built-in/byte/driver.cxx +++ /dev/null @@ -1,256 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/byte/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in byte and unsigned byte types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("123"); - p._post (); - assert (p.post_byte () == 123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("\t +123 \n "); - p._post (); - assert (p.post_byte () == 123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-123"); - p._post (); - assert (p.post_byte () == -123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("+123"); - p._post (); - assert (p.post_byte () == 123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("0000000000000000123"); - p._post (); - assert (p.post_byte () == 123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("+0000000000000000123"); - p._post (); - assert (p.post_byte () == 123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0000000000000000123"); - p._post (); - assert (p.post_byte () == -123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("\t \n"); - p._characters (" -"); - p._characters ("00000"); - p._characters ("001"); - p._characters ("23 \n\t"); - p._post (); - assert (p.post_byte () == -123); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-128"); - p._post (); - assert (p.post_byte () == -128); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("127"); - p._post (); - assert (p.post_byte () == 127); - } - - { - unsigned_byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("+123"); - p._post (); - assert (p.post_unsigned_byte () == 123); - } - - { - unsigned_byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_unsigned_byte () == 0); - } - - { - unsigned_byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("255"); - p._post (); - assert (p.post_unsigned_byte () == 255); - } - - // Bad - // - { - byte_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters (""); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n \t "); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("+"); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-"); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("++01"); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("--01"); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-01"); - p._characters (" "); - p._characters ("23 "); - assert (test_post_fail (p)); - } - - { - unsigned_byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-123"); - assert (test_post_fail (p)); - } - - // Ranges - // - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("-129"); - assert (test_post_fail (p)); - } - - { - byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("128"); - assert (test_post_fail (p)); - } - - { - unsigned_byte_pimpl p; - p.pre (); - p._pre (); - p._characters ("256"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/byte/makefile b/tests/cxx/parser/validation/built-in/byte/makefile deleted file mode 100644 index afc8174..0000000 --- a/tests/cxx/parser/validation/built-in/byte/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/byte/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/date-time/driver.cxx b/tests/cxx/parser/validation/built-in/date-time/driver.cxx deleted file mode 100644 index 8aa3943..0000000 --- a/tests/cxx/parser/validation/built-in/date-time/driver.cxx +++ /dev/null @@ -1,1533 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/date-time/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in date and time types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - typedef xsd::cxx::parser::gday gday; - typedef xsd::cxx::parser::gmonth gmonth; - typedef xsd::cxx::parser::gyear gyear; - typedef xsd::cxx::parser::gmonth_day gmonth_day; - typedef xsd::cxx::parser::gyear_month gyear_month; - typedef xsd::cxx::parser::date date; - typedef xsd::cxx::parser::time time; - typedef xsd::cxx::parser::date_time date_time; - typedef xsd::cxx::parser::duration duration; - - // Good. - // - - // gday & time zone parsing - // - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("---1"); - p._characters ("2+12:00"); - p._post (); - assert (p.post_gday () == gday (12, 12, 00)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---01"); - p._post (); - assert (p.post_gday () == gday (1)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---31"); - p._post (); - assert (p.post_gday () == gday (31)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---15Z"); - p._post (); - assert (p.post_gday () == gday (15, 0, 0)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---15-14:00"); - p._post (); - assert (p.post_gday () == gday (15, -14, 0)); - } - - // gmonth - // - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("--1"); - p._characters ("0+12:00"); - p._post (); - assert (p.post_gmonth () == gmonth (10, 12, 0)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--01"); - p._post (); - assert (p.post_gmonth () == gmonth (1)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12Z"); - p._post (); - assert (p.post_gmonth () == gmonth (12, 0, 0)); - } - - // gyear - // - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("20"); - p._characters ("07+12:00"); - p._post (); - assert (p.post_gyear () == gyear (2007, 12, 00)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("0001"); - p._post (); - assert (p.post_gyear () == gyear (1)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("-20000Z"); - p._post (); - assert (p.post_gyear () == gyear (-20000, 0, 0)); - } - - // gmonth_day - // - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("--1"); - p._characters ("0-28+12:00 "); - p._post (); - assert (p.post_gmonth_day () == gmonth_day (10, 28, 12, 00)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12-31"); - p._post (); - assert (p.post_gmonth_day () == gmonth_day (12, 31)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--01-01Z"); - p._post (); - assert (p.post_gmonth_day () == gmonth_day (1, 1, 0, 0)); - } - - // gyear_month - // - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("200"); - p._characters ("7-12+12:00 "); - p._post (); - assert (p.post_gyear_month () == gyear_month (2007, 12, 12, 00)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2007-10"); - p._post (); - assert (p.post_gyear_month () == gyear_month (-2007, 10)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("20007-10Z"); - p._post (); - assert (p.post_gyear_month () == gyear_month (20007, 10, 0, 0)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("-20007-01"); - p._post (); - assert (p.post_gyear_month () == gyear_month (-20007, 1)); - } - - // date - // - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("200"); - p._characters ("7-12-26+12:00 "); - p._post (); - assert (p.post_date () == date (2007, 12, 26, 12, 0)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2007-10-15"); - p._post (); - assert (p.post_date () == date (-2007, 10, 15)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("20007-12-31Z"); - p._post (); - assert (p.post_date () == date (20007, 12, 31, 0, 0)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("-20007-01-01"); - p._post (); - assert (p.post_date () == date (-20007, 1, 1)); - } - - // time - // - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("12:"); - p._characters ("46:23.456+12:00 "); - p._post (); - assert (p.post_time () == time (12, 46, 23.456, 12, 0)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("12:13:14"); - p._post (); - assert (p.post_time () == time (12, 13, 14.0)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("12:13:14Z"); - p._post (); - assert (p.post_time () == time (12, 13, 14.0, 0, 0)); - } - - // date_time - // - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("200"); - p._characters ("7-12-26T12:13:14.123+12:00 "); - p._post (); - assert (p.post_date_time () == - date_time (2007, 12, 26, 12, 13, 14.123, 12, 0)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2007-10-15T12:13:14"); - p._post (); - assert (p.post_date_time () == date_time (-2007, 10, 15, 12, 13, 14.0)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("20007-12-31T12:13:14Z"); - p._post (); - assert (p.post_date_time () == - date_time (20007, 12, 31, 12, 13, 14.0, 0, 0)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("-20007-01-01T12:13:14"); - p._post (); - assert (p.post_date_time () == date_time (-20007, 1, 1, 12, 13, 14.0)); - } - - // duration - // - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters (" \t\n "); - p._characters ("-P200"); - p._characters ("7Y13M32DT25H61M61.123S "); - p._post (); - assert (p.post_duration () == - duration (true, 2007, 13, 32, 25, 61, 61.123)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1Y"); - p._post (); - assert (p.post_duration () == duration (false, 1, 0, 0, 0, 0, 0.0)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1M"); - p._post (); - assert (p.post_duration () == duration (false, 0, 1, 0, 0, 0, 0.0)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1D"); - p._post (); - assert (p.post_duration () == duration (false, 0, 0, 1, 0, 0, 0.0)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT1H"); - p._post (); - assert (p.post_duration () == duration (false, 0, 0, 0, 1, 0, 0.0)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT1M"); - p._post (); - assert (p.post_duration () == duration (false, 0, 0, 0, 0, 1, 0.0)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT1.1S"); - p._post (); - assert (p.post_duration () == duration (false, 0, 0, 0, 0, 0, 1.1)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1YT1S"); - p._post (); - assert (p.post_duration () == duration (false, 1, 0, 0, 0, 0, 1.0)); - } - - // Bad - // - - // gday & time zone parsing - // - { - gday_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---1"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---00"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---32"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---2X"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12asd"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12X"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---1212:00"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12+2:00"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12+1200"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12+15:00"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12+12:60"); - assert (test_post_fail (p)); - } - - { - gday_pimpl p; - p.pre (); - p._pre (); - p._characters ("---12+14:01"); - assert (test_post_fail (p)); - } - - // gmonth - // - { - gmonth_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("-12"); - assert (test_post_fail (p)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--00"); - assert (test_post_fail (p)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--13"); - assert (test_post_fail (p)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--1X"); - assert (test_post_fail (p)); - } - - { - gmonth_pimpl p; - p.pre (); - p._pre (); - p._characters ("--11+12:3o"); - assert (test_post_fail (p)); - } - - // gyear - // - { - gyear_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("207"); - assert (test_post_fail (p)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("-207"); - assert (test_post_fail (p)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0000"); - assert (test_post_fail (p)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("20X7"); - assert (test_post_fail (p)); - } - - { - gyear_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007+12:3o"); - assert (test_post_fail (p)); - } - - // gmonth_day - // - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("-12-12"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--1212"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12?12"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--00-12"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12-00"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--13-23"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12-32"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--1X-12"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--12-2X"); - assert (test_post_fail (p)); - } - - { - gmonth_day_pimpl p; - p.pre (); - p._pre (); - p._characters ("--11-11+12:3o"); - assert (test_post_fail (p)); - } - - // gyear_month - // - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("207-01"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("-207-01"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("0000-01"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("20X7-01"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007?12"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-0"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-00"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-13"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-1X"); - assert (test_post_fail (p)); - } - - { - gyear_month_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01+12:3o"); - assert (test_post_fail (p)); - } - - // date - // - { - date_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("207-01-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("-207-01-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("0000-01-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("20X7-01-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007?01-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-0-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-00-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-13-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-1X-01"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10?12"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-0"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-00"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-32"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-2X"); - assert (test_post_fail (p)); - } - - { - date_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01+12:3o"); - assert (test_post_fail (p)); - } - - // time - // - { - time_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("1:01:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2X:01:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23?01:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:0:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:60:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:4X:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10?12"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10:"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10:0"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10:01."); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10:60"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:10:2X"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("24:01:00"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("24:00:01"); - assert (test_post_fail (p)); - } - - { - time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:01:01+12:3o"); - assert (test_post_fail (p)); - } - - // date_time - // - { - date_time_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("207-01-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("-207-01-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("0000-01-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("20X7-01-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007?01-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-0-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-00-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-13-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-1X-01T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10?12T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-0T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-00T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-32T12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-10-2XT12:13:14"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T1:01:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T2X:01:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23?01:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:0:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:60:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:4X:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10?12"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10:"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10:0"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10:01."); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10:60"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T23:10:2X"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T24:01:00"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T24:00:01"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("23:01:01+12:3o"); - assert (test_post_fail (p)); - } - - { - date_time_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007-01-01T12:13:14+12:3o"); - assert (test_post_fail (p)); - } - - // duration - // - { - duration_pimpl p; - p.pre (); - p._pre (); - // p._characters (""); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("2007Y"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2007Y"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P-2007Y"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P-1M"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P-1D"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT-1H"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT-1M"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT-1.1S"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1H1M1S"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1M1Y"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT1S1H"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("PT1H1Y"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1Ygarbage"); - assert (test_post_fail (p)); - } - - { - duration_pimpl p; - p.pre (); - p._pre (); - p._characters ("P1YT"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/date-time/makefile b/tests/cxx/parser/validation/built-in/date-time/makefile deleted file mode 100644 index 42d60e8..0000000 --- a/tests/cxx/parser/validation/built-in/date-time/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/date-time/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/float/driver.cxx b/tests/cxx/parser/validation/built-in/float/driver.cxx deleted file mode 100644 index 7563aa7..0000000 --- a/tests/cxx/parser/validation/built-in/float/driver.cxx +++ /dev/null @@ -1,285 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/float/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in float, double, and decimal types validation. -// -#include -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - - // float - // - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters (" 0000123.456 "); - p._post (); - assert (p.post_float () == 123.456F); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("-12.345E2"); - p._post (); - assert (p.post_float () == -12.345E2F); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_float () == 0.0F); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0"); - p._post (); - assert (p.post_float () == -0.0F); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("INF"); - p._post (); - assert (isinf (p.post_float ())); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("-INF"); - p._post (); - assert (isinf (p.post_float ())); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("NaN"); - p._post (); - assert (isnan (p.post_float ())); - } - - // double - // - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters (" 0000123.456789 "); - p._post (); - assert (p.post_double () == 123.456789); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("-12.3456789E2"); - p._post (); - assert (p.post_double () == -12.3456789E2); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_double () == 0.0); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0"); - p._post (); - assert (p.post_double () == -0.0); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("INF"); - p._post (); - assert (isinf (p.post_double ())); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("-INF"); - p._post (); - assert (isinf (p.post_double ())); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("NaN"); - p._post (); - assert (isnan (p.post_double ())); - } - - // decimal - // - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters (" 0000123.456789 "); - p._post (); - assert (p.post_decimal () == 123.456789); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("-123.45678912345"); - p._post (); - assert (p.post_decimal () == -123.45678912345); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_decimal () == 0.0); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0"); - p._post (); - assert (p.post_decimal () == -0.0); - } - - - // Bad - // - - // float - // - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("+INF"); - assert (test_post_fail (p)); - } - - { - float_pimpl p; - p.pre (); - p._pre (); - p._characters ("1.45 E2"); - assert (test_post_fail (p)); - } - - // double - // - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("+INF"); - assert (test_post_fail (p)); - } - - { - double_pimpl p; - p.pre (); - p._pre (); - p._characters ("1.45 E2"); - assert (test_post_fail (p)); - } - - // decimal - // - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("INF"); - assert (test_post_fail (p)); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("+INF"); - assert (test_post_fail (p)); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("-INF"); - assert (test_post_fail (p)); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("NaN"); - assert (test_post_fail (p)); - } - - { - decimal_pimpl p; - p.pre (); - p._pre (); - p._characters ("1.45 2"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/float/makefile b/tests/cxx/parser/validation/built-in/float/makefile deleted file mode 100644 index 68fac22..0000000 --- a/tests/cxx/parser/validation/built-in/float/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/float/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/int/driver.cxx b/tests/cxx/parser/validation/built-in/int/driver.cxx deleted file mode 100644 index 18e83ca..0000000 --- a/tests/cxx/parser/validation/built-in/int/driver.cxx +++ /dev/null @@ -1,116 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/int/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in int and unsigned int types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - { - int_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2147483648"); - p._post (); - assert (p.post_int () == -2147483648); - } - - { - int_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_int () == 0); - } - - { - int_pimpl p; - p.pre (); - p._pre (); - p._characters ("2147483647"); - p._post (); - assert (p.post_int () == 2147483647); - } - - { - unsigned_int_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_unsigned_int () == 0); - } - - { - unsigned_int_pimpl p; - p.pre (); - p._pre (); - p._characters ("4294967295"); - p._post (); - assert (p.post_unsigned_int () == 4294967295); - } - - // Bad - // - - { - unsigned_int_pimpl p; - p.pre (); - p._pre (); - p._characters ("-123"); - assert (test_post_fail (p)); - } - - - // Ranges - // - { - int_pimpl p; - p.pre (); - p._pre (); - p._characters ("-2147483649"); - assert (test_post_fail (p)); - } - - { - int_pimpl p; - p.pre (); - p._pre (); - p._characters ("2147483648"); - assert (test_post_fail (p)); - } - - { - unsigned_int_pimpl p; - p.pre (); - p._pre (); - p._characters ("4294967296"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/int/makefile b/tests/cxx/parser/validation/built-in/int/makefile deleted file mode 100644 index 7a13105..0000000 --- a/tests/cxx/parser/validation/built-in/int/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/int/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/integer/driver.cxx b/tests/cxx/parser/validation/built-in/integer/driver.cxx deleted file mode 100644 index 7eeb708..0000000 --- a/tests/cxx/parser/validation/built-in/integer/driver.cxx +++ /dev/null @@ -1,303 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/int/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in integer & friends types validation. -// -#include - -#include -#include -#include - -#include -#include - -using namespace std; -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - - std::string min; - std::string max; - std::string umax; - - { - ostringstream ostr; - ostr << LLONG_MIN; - min = ostr.str (); - } - - { - ostringstream ostr; - ostr << LLONG_MAX; - max = ostr.str (); - } - - { - ostringstream ostr; - ostr << ULLONG_MAX; - umax = ostr.str (); - } - - // integer - // - { - integer_pimpl p; - p.pre (); - p._pre (); - p._characters (min.c_str ()); - p._post (); - assert (p.post_integer () == LLONG_MIN); - } - - { - integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_integer () == 0); - } - - { - integer_pimpl p; - p.pre (); - p._pre (); - p._characters (max.c_str ()); - p._post (); - assert (p.post_integer () == LLONG_MAX); - } - - // negative_integer - // - { - negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (min.c_str ()); - p._post (); - assert (p.post_negative_integer () == LLONG_MIN); - } - - { - negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("-1"); - p._post (); - assert (p.post_negative_integer () == -1); - } - - // non_positive_integer - // - { - non_positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (min.c_str ()); - p._post (); - assert (p.post_non_positive_integer () == LLONG_MIN); - } - - { - non_positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("+0"); - p._post (); - assert (p.post_non_positive_integer () == 0); - } - - // positive_integer - // - { - positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("1"); - p._post (); - assert (p.post_positive_integer () == 1); - } - - { - positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (umax.c_str ()); - p._post (); - assert (p.post_positive_integer () == ULLONG_MAX); - } - - // non_negative_integer - // - /* - { - non_negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0"); - p._post (); - assert (p.post_non_negative_integer () == 0); - } - */ - - { - non_negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_non_negative_integer () == 0); - } - - { - non_negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (umax.c_str ()); - p._post (); - assert (p.post_non_negative_integer () == ULLONG_MAX); - } - - - // Bad - // - - std::string past_min (min); - std::string past_max (max); - std::string past_umax (umax); - - assert (*past_min.rbegin () != '9'); - assert (*past_max.rbegin () != '9'); - assert (*past_umax.rbegin () != '9'); - - (*past_min.rbegin ())++; - (*past_max.rbegin ())++; - (*past_umax.rbegin ())++; - - // integer - // - { - integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_min.c_str ()); - assert (test_post_fail (p)); - } - - { - integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_max.c_str ()); - assert (test_post_fail (p)); - } - - // negative_integer - // - { - negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_min.c_str ()); - assert (test_post_fail (p)); - } - - { - negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("-0"); - assert (test_post_fail (p)); - } - - { - negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("1"); - assert (test_post_fail (p)); - } - - // non_positive_integer - // - { - non_positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_min.c_str ()); - assert (test_post_fail (p)); - } - - { - non_positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("1"); - assert (test_post_fail (p)); - } - - // positive_integer - // - { - positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("-1"); - assert (test_post_fail (p)); - } - - { - positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("+0"); - assert (test_post_fail (p)); - } - - { - positive_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_umax.c_str ()); - assert (test_post_fail (p)); - } - - // non_negative_integer - // - { - non_negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters ("-1"); - assert (test_post_fail (p)); - } - - { - non_negative_integer_pimpl p; - p.pre (); - p._pre (); - p._characters (past_umax.c_str ()); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/integer/makefile b/tests/cxx/parser/validation/built-in/integer/makefile deleted file mode 100644 index 66a7dd6..0000000 --- a/tests/cxx/parser/validation/built-in/integer/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/integer/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/long/driver.cxx b/tests/cxx/parser/validation/built-in/long/driver.cxx deleted file mode 100644 index a44ae70..0000000 --- a/tests/cxx/parser/validation/built-in/long/driver.cxx +++ /dev/null @@ -1,116 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/long/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in long and unsigned long types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - { - long_pimpl p; - p.pre (); - p._pre (); - p._characters ("-9223372036854775808"); - p._post (); - assert (p.post_long () == (-9223372036854775807LL - 1)); - } - - { - long_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_long () == 0); - } - - { - long_pimpl p; - p.pre (); - p._pre (); - p._characters ("9223372036854775807"); - p._post (); - assert (p.post_long () == 9223372036854775807LL); - } - - { - unsigned_long_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_unsigned_long () == 0); - } - - { - unsigned_long_pimpl p; - p.pre (); - p._pre (); - p._characters ("18446744073709551615"); - p._post (); - assert (p.post_unsigned_long () == 18446744073709551615ULL); - } - - // Bad - // - - { - unsigned_long_pimpl p; - p.pre (); - p._pre (); - p._characters ("-123"); - assert (test_post_fail (p)); - } - - - // Ranges - // - { - long_pimpl p; - p.pre (); - p._pre (); - p._characters ("-9223372036854775809"); - assert (test_post_fail (p)); - } - - { - long_pimpl p; - p.pre (); - p._pre (); - p._characters ("9223372036854775808"); - assert (test_post_fail (p)); - } - - { - unsigned_long_pimpl p; - p.pre (); - p._pre (); - p._characters ("18446744073709551616"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/long/makefile b/tests/cxx/parser/validation/built-in/long/makefile deleted file mode 100644 index 5854363..0000000 --- a/tests/cxx/parser/validation/built-in/long/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/long/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/makefile b/tests/cxx/parser/validation/built-in/makefile deleted file mode 100644 index 79eab4f..0000000 --- a/tests/cxx/parser/validation/built-in/makefile +++ /dev/null @@ -1,17 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -tests := any-type binary boolean byte date-time float int integer long \ -qname short string uri - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/parser/validation/built-in/qname/driver.cxx b/tests/cxx/parser/validation/built-in/qname/driver.cxx deleted file mode 100644 index 6da6f2f..0000000 --- a/tests/cxx/parser/validation/built-in/qname/driver.cxx +++ /dev/null @@ -1,105 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/qname/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in QName type validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -bool -test_post_fail (qname_pimpl& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - typedef xsd::cxx::parser::qname qname; - - // Good. - // - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters (" xsi"); - p._characters (":"); - p._characters ("schemaLocation"); - p._post (); - assert (p.post_qname () == qname ("xsi", "schemaLocation")); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters ("schemaLocation"); - p._post (); - assert (p.post_qname () == qname ("schemaLocation")); - } - - - // Bad - // - { - qname_pimpl p; - p.pre (); - p._pre (); - //p._characters (""); - assert (test_post_fail (p)); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters (":"); - assert (test_post_fail (p)); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters ("xsi:"); - assert (test_post_fail (p)); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters (":schemaLocation"); - assert (test_post_fail (p)); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters ("x?i:schemaLocation"); - assert (test_post_fail (p)); - } - - { - qname_pimpl p; - p.pre (); - p._pre (); - p._characters ("xsi:schema Location"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/qname/makefile b/tests/cxx/parser/validation/built-in/qname/makefile deleted file mode 100644 index c442812..0000000 --- a/tests/cxx/parser/validation/built-in/qname/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/qname/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/short/driver.cxx b/tests/cxx/parser/validation/built-in/short/driver.cxx deleted file mode 100644 index 42009a1..0000000 --- a/tests/cxx/parser/validation/built-in/short/driver.cxx +++ /dev/null @@ -1,116 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/short/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in short and unsigned short types validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post (); - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - // Good. - // - { - short_pimpl p; - p.pre (); - p._pre (); - p._characters ("-32768"); - p._post (); - assert (p.post_short () == -32768); - } - - { - short_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_short () == 0); - } - - { - short_pimpl p; - p.pre (); - p._pre (); - p._characters ("32767"); - p._post (); - assert (p.post_short () == 32767); - } - - { - unsigned_short_pimpl p; - p.pre (); - p._pre (); - p._characters ("0"); - p._post (); - assert (p.post_unsigned_short () == 0); - } - - { - unsigned_short_pimpl p; - p.pre (); - p._pre (); - p._characters ("65535"); - p._post (); - assert (p.post_unsigned_short () == 65535); - } - - // Bad - // - - { - unsigned_short_pimpl p; - p.pre (); - p._pre (); - p._characters ("-1234"); - assert (test_post_fail (p)); - } - - - // Ranges - // - { - short_pimpl p; - p.pre (); - p._pre (); - p._characters ("-32769"); - assert (test_post_fail (p)); - } - - { - short_pimpl p; - p.pre (); - p._pre (); - p._characters ("32768"); - assert (test_post_fail (p)); - } - - { - unsigned_short_pimpl p; - p.pre (); - p._pre (); - p._characters ("65536"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/short/makefile b/tests/cxx/parser/validation/built-in/short/makefile deleted file mode 100644 index 05f8e2c..0000000 --- a/tests/cxx/parser/validation/built-in/short/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/short/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/string/driver.cxx b/tests/cxx/parser/validation/built-in/string/driver.cxx deleted file mode 100644 index b5da70d..0000000 --- a/tests/cxx/parser/validation/built-in/string/driver.cxx +++ /dev/null @@ -1,512 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/string/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in string & friends types validation. -// -#include -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -template -bool -test_post_fail (T& p) -{ - try - { - p._post_impl (); // List implementation needs this to be post_impl. - } - catch (invalid_value const&) - { - return true; - } - - return false; -} - -int -main () -{ - typedef xsd::cxx::parser::string_sequence strings; - - // Good. - // - - // string - // - { - string_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" aaa "); - p._characters ("bbb"); - p._characters (" "); - p._post (); - assert (p.post_string () == " \n\t aaa bbb "); - } - - // normalized_string - // - { - normalized_string_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" aaa \n\t "); - p._characters (" bbb"); - p._characters (" "); - p._post (); - assert (p.post_normalized_string () == " aaa bbb "); - } - - // token - // - { - token_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" aaa \n\t "); - p._characters (" bbb \n\t"); - p._characters (" "); - p._post (); - assert (p.post_token () == "aaa bbb"); - } - - // name - // - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" a:b-c_d123 "); - p._characters (" "); - p._post (); - assert (p.post_name () == "a:b-c_d123"); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" _12 "); - p._characters (" "); - p._post (); - assert (p.post_name () == "_12"); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" :12 "); - p._characters (" "); - p._post (); - assert (p.post_name () == ":12"); - } - - // nmtoken - // - { - nmtoken_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" 123a:b-c_d123 "); - p._characters (" \n\t"); - p._characters (" "); - p._post (); - assert (p.post_nmtoken () == "123a:b-c_d123"); - } - - // nmtokens - // - { - strings s; - s.push_back ("123"); - s.push_back ("abc"); - - nmtokens_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" 123 "); - p._characters (" \n\t abc "); - p._characters (" "); - p._post (); - assert (p.post_nmtokens () == s); - } - - // ncname - // - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" a.b-c_d123 "); - p._characters (" "); - p._post (); - assert (p.post_ncname () == "a.b-c_d123"); - } - - // id - // - { - id_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" a.b-c_d123 "); - p._characters (" "); - p._post (); - assert (p.post_id () == "a.b-c_d123"); - } - - // idref - // - { - idref_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" a.b-c_d123 "); - p._characters (" "); - p._post (); - assert (p.post_idref () == "a.b-c_d123"); - } - - // idrefs - // - { - strings s; - s.push_back ("a123"); - s.push_back ("abc"); - - idrefs_pimpl p; - p.pre (); - p._pre (); - p._characters (" \n\t"); - p._characters (" a123 "); - p._characters (" \n\t abc "); - p._characters (" "); - p._post (); - assert (p.post_idrefs () == s); - } - - // language - // - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters (" x "); - p._post (); - assert (p.post_language () == "x"); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters (" en "); - p._post (); - assert (p.post_language () == "en"); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters (" en"); - p._characters ("-us "); - p._post (); - assert (p.post_language () == "en-us"); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters ("one-two-three-four44-seven77-eight888"); - p._post (); - assert (p.post_language () == "one-two-three-four44-seven77-eight888"); - } - - - // Bad - // - - // name - // - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters (""); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters (".a"); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters ("-a"); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters ("1a"); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters ("a,b"); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters ("a b"); - assert (test_post_fail (p)); - } - - { - name_pimpl p; - p.pre (); - p._pre (); - p._characters ("a p; - p.pre (); - p._pre (); - p._characters (""); - assert (test_post_fail (p)); - } - - { - nmtoken_pimpl p; - p.pre (); - p._pre (); - p._characters ("a,b"); - assert (test_post_fail (p)); - } - - { - nmtoken_pimpl p; - p.pre (); - p._pre (); - p._characters ("a b"); - assert (test_post_fail (p)); - } - - { - nmtoken_pimpl p; - p.pre (); - p._pre (); - p._characters ("a p; - p.pre (); - p._pre (); - p._characters (" "); - p._characters (" \t\n "); - assert (test_post_fail (p)); - } - - { - nmtokens_pimpl p; - p.pre (); - p._pre (); - p._characters ("ab a,b"); - assert (test_post_fail (p)); - } - - // ncname - // - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters (""); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters (".a"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("-a"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters (":a"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("1a"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("1:a"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("a,b"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("a b"); - assert (test_post_fail (p)); - } - - { - ncname_pimpl p; - p.pre (); - p._pre (); - p._characters ("a p; - p.pre (); - p._pre (); - p._characters ("a b"); - assert (test_post_fail (p)); - } - - // idref - // - { - idref_pimpl p; - p.pre (); - p._pre (); - p._characters ("a b"); - assert (test_post_fail (p)); - } - - // idrefs - // - { - idrefs_pimpl p; - p.pre (); - p._pre (); - p._characters (" "); - p._characters (" \t\n "); - assert (test_post_fail (p)); - } - - { - idrefs_pimpl p; - p.pre (); - p._pre (); - p._characters ("ab a p; - p.pre (); - p._pre (); - p._characters (" "); - assert (test_post_fail (p)); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters ("en-"); - assert (test_post_fail (p)); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters ("a1"); - assert (test_post_fail (p)); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters ("en+us"); - assert (test_post_fail (p)); - } - - { - language_pimpl p; - p.pre (); - p._pre (); - p._characters ("en-nine99999"); - assert (test_post_fail (p)); - } -} diff --git a/tests/cxx/parser/validation/built-in/string/makefile b/tests/cxx/parser/validation/built-in/string/makefile deleted file mode 100644 index bcdae7e..0000000 --- a/tests/cxx/parser/validation/built-in/string/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/string/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/built-in/uri/driver.cxx b/tests/cxx/parser/validation/built-in/uri/driver.cxx deleted file mode 100644 index 9e487e6..0000000 --- a/tests/cxx/parser/validation/built-in/uri/driver.cxx +++ /dev/null @@ -1,53 +0,0 @@ -// file : tests/cxx/parser/validation/built-in/uri/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the built-in anyURI type validation. -// -#include - -#include -#include - -using namespace xsd::cxx::parser::validating; - -int -main () -{ - // Good. - // - { - uri_pimpl p; - p.pre (); - p._pre (); - p._characters (" "); - p._post (); - assert (p.post_uri () == ""); - } - - { - uri_pimpl p; - p.pre (); - p._pre (); - p._characters ("relative"); - p._post (); - assert (p.post_uri () == "relative"); - } - - { - uri_pimpl p; - p.pre (); - p._pre (); - p._characters ("#id"); - p._post (); - assert (p.post_uri () == "#id"); - } - - { - uri_pimpl p; - p.pre (); - p._pre (); - p._characters ("http://www.example.com/foo#bar"); - p._post (); - assert (p.post_uri () == "http://www.example.com/foo#bar"); - } -} diff --git a/tests/cxx/parser/validation/built-in/uri/makefile b/tests/cxx/parser/validation/built-in/uri/makefile deleted file mode 100644 index ae7e8bd..0000000 --- a/tests/cxx/parser/validation/built-in/uri/makefile +++ /dev/null @@ -1,70 +0,0 @@ -# file : tests/cxx/parser/validation/built-in/uri/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/tests/cxx/parser/validation/choice/driver.cxx b/tests/cxx/parser/validation/choice/driver.cxx deleted file mode 100644 index af30727..0000000 --- a/tests/cxx/parser/validation/choice/driver.cxx +++ /dev/null @@ -1,126 +0,0 @@ -// file : tests/cxx/parser/validation/choice/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the choice compositor validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct choice_pimpl: choice_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - c (string const& v) - { - cout << " c = " << v << endl; - } - - virtual void - d (string const& v) - { - cout << " d = " << v << endl; - } - - virtual void - _start_any_element (ro_string const& ns, - ro_string const& name, - ro_string const*) - { - cout << " any: " << ns << "#" << name << endl - << " {" << endl; - } - - virtual void - _any_characters (ro_string const& v) - { - cout << " chars = " << v << endl; - } - - virtual void - _end_any_element (ro_string const&, ro_string const&) - { - cout << " }" << endl; - } - - virtual void - post_choice () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - choice_pimpl choice_p; - type_pimpl type_p; - - choice_p.parsers (string_p, string_p, string_p, string_p); - type_p.parsers (choice_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - try - { - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cout << " " << e << endl - << "}" << endl - << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile deleted file mode 100644 index 93b05c5..0000000 --- a/tests/cxx/parser/validation/choice/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/choice/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 001 002 003 004 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/choice/test-000.std b/tests/cxx/parser/validation/choice/test-000.std deleted file mode 100644 index 856b7f5..0000000 --- a/tests/cxx/parser/validation/choice/test-000.std +++ /dev/null @@ -1,22 +0,0 @@ -{ - a = a - b = b -} - -{ - c = c - d = d - any: other#any - { - chars = any - } - a = a -} - -{ - c = c - d = d - d = d - a = a -} - diff --git a/tests/cxx/parser/validation/choice/test-000.xml b/tests/cxx/parser/validation/choice/test-000.xml deleted file mode 100644 index 39b9614..0000000 --- a/tests/cxx/parser/validation/choice/test-000.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - a - - b - - - - c - d - - any - - a - - - - c - d - - d - - a - - - diff --git a/tests/cxx/parser/validation/choice/test-001.std b/tests/cxx/parser/validation/choice/test-001.std deleted file mode 100644 index 8a78666..0000000 --- a/tests/cxx/parser/validation/choice/test-001.std +++ /dev/null @@ -1,4 +0,0 @@ -{ - :8:12 error: expected element 'a' -} - diff --git a/tests/cxx/parser/validation/choice/test-001.xml b/tests/cxx/parser/validation/choice/test-001.xml deleted file mode 100644 index c509e0d..0000000 --- a/tests/cxx/parser/validation/choice/test-001.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/tests/cxx/parser/validation/choice/test-002.std b/tests/cxx/parser/validation/choice/test-002.std deleted file mode 100644 index 1dc1a3a..0000000 --- a/tests/cxx/parser/validation/choice/test-002.std +++ /dev/null @@ -1,11 +0,0 @@ -{ - c = c - d = d - any: other#any - { - chars = any - } - a = a - :14:8 error: unexpected element 'b' -} - diff --git a/tests/cxx/parser/validation/choice/test-002.xml b/tests/cxx/parser/validation/choice/test-002.xml deleted file mode 100644 index 3b7e663..0000000 --- a/tests/cxx/parser/validation/choice/test-002.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - c - d - - any - - a - b - - - diff --git a/tests/cxx/parser/validation/choice/test-003.std b/tests/cxx/parser/validation/choice/test-003.std deleted file mode 100644 index 29d5e44..0000000 --- a/tests/cxx/parser/validation/choice/test-003.std +++ /dev/null @@ -1,5 +0,0 @@ -{ - c = c - :9:12 error: expected element 'd' -} - diff --git a/tests/cxx/parser/validation/choice/test-003.xml b/tests/cxx/parser/validation/choice/test-003.xml deleted file mode 100644 index ba15c7e..0000000 --- a/tests/cxx/parser/validation/choice/test-003.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - c - - - diff --git a/tests/cxx/parser/validation/choice/test-004.std b/tests/cxx/parser/validation/choice/test-004.std deleted file mode 100644 index 4a7530b..0000000 --- a/tests/cxx/parser/validation/choice/test-004.std +++ /dev/null @@ -1,4 +0,0 @@ -{ - :8:8 error: expected element 'a' instead of 'x' -} - diff --git a/tests/cxx/parser/validation/choice/test-004.xml b/tests/cxx/parser/validation/choice/test-004.xml deleted file mode 100644 index f6960dd..0000000 --- a/tests/cxx/parser/validation/choice/test-004.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - x - - - diff --git a/tests/cxx/parser/validation/choice/test.xsd b/tests/cxx/parser/validation/choice/test.xsd deleted file mode 100644 index 8132bbb..0000000 --- a/tests/cxx/parser/validation/choice/test.xsd +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/makefile b/tests/cxx/parser/validation/makefile deleted file mode 100644 index 600d9dd..0000000 --- a/tests/cxx/parser/validation/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/parser/validation/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := all any attribute built-in choice restriction sequence - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/parser/validation/restriction/driver.cxx b/tests/cxx/parser/validation/restriction/driver.cxx deleted file mode 100644 index 6f9a871..0000000 --- a/tests/cxx/parser/validation/restriction/driver.cxx +++ /dev/null @@ -1,107 +0,0 @@ -// file : tests/cxx/parser/validation/restriction/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the restriction compositor validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; - -struct base_a_pimpl: base_a_pskel -{ -}; - -struct restriction_a_pimpl: restriction_a_pskel -{ -}; - -struct extension_b_pimpl: extension_b_pskel -{ -}; - -struct restriction_b_pimpl: restriction_b_pskel -{ -}; - -struct type_b_pimpl: type_b_pskel -{ -}; - -struct type_r_pimpl: type_r_pskel -{ -}; - - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - base_a_pimpl base_a_p; - restriction_a_pimpl restriction_a_p; - extension_b_pimpl extension_b_p; - restriction_b_pimpl restriction_b_p; - type_b_pimpl type_b_p; - type_r_pimpl type_r_p; - - base_a_p.parsers (string_p, string_p, string_p, - string_p, string_p, string_p); - - restriction_a_p.parsers (string_p, string_p, string_p, - string_p, string_p, string_p); - - extension_b_p.parsers (string_p, string_p, string_p, - string_p, string_p); - - restriction_b_p.parsers (string_p, string_p, string_p, - string_p, string_p); - - type_b_p.parsers (base_a_p, extension_b_p); - type_r_p.parsers (restriction_a_p, restriction_b_p); - - xml_schema::document doc_b_p (type_b_p, "test", "root"); - xml_schema::document doc_r_p (type_r_p, "test", "root"); - - { - ifstream ifs (argv[1]); - type_b_p.pre (); - doc_b_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_b_p.post_type_b (); - } - - try - { - ifstream ifs (argv[1]); - type_r_p.pre (); - doc_r_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_r_p.post_type_r (); - } - catch (xml_schema::exception const& e) - { - cout << e << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile deleted file mode 100644 index 61af2bf..0000000 --- a/tests/cxx/parser/validation/restriction/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/restriction/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 001 002 003 004 005 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/restriction/test-000.std b/tests/cxx/parser/validation/restriction/test-000.std deleted file mode 100644 index e69de29..0000000 diff --git a/tests/cxx/parser/validation/restriction/test-000.xml b/tests/cxx/parser/validation/restriction/test-000.xml deleted file mode 100644 index 21402b4..0000000 --- a/tests/cxx/parser/validation/restriction/test-000.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - a - b - c - - - - a - b - c - - - - a - b - - - - a - c - - - - a - - - diff --git a/tests/cxx/parser/validation/restriction/test-001.std b/tests/cxx/parser/validation/restriction/test-001.std deleted file mode 100644 index 5077837..0000000 --- a/tests/cxx/parser/validation/restriction/test-001.std +++ /dev/null @@ -1 +0,0 @@ -:7:8 error: expected element 'a' instead of 'b' diff --git a/tests/cxx/parser/validation/restriction/test-001.xml b/tests/cxx/parser/validation/restriction/test-001.xml deleted file mode 100644 index 4015302..0000000 --- a/tests/cxx/parser/validation/restriction/test-001.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - b - c - - - diff --git a/tests/cxx/parser/validation/restriction/test-002.std b/tests/cxx/parser/validation/restriction/test-002.std deleted file mode 100644 index f12c342..0000000 --- a/tests/cxx/parser/validation/restriction/test-002.std +++ /dev/null @@ -1 +0,0 @@ -:10:19 error: expected attribute 'z' diff --git a/tests/cxx/parser/validation/restriction/test-002.xml b/tests/cxx/parser/validation/restriction/test-002.xml deleted file mode 100644 index eb7684c..0000000 --- a/tests/cxx/parser/validation/restriction/test-002.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - a - b - c - - - diff --git a/tests/cxx/parser/validation/restriction/test-003.std b/tests/cxx/parser/validation/restriction/test-003.std deleted file mode 100644 index 0c65175..0000000 --- a/tests/cxx/parser/validation/restriction/test-003.std +++ /dev/null @@ -1 +0,0 @@ -:11:8 error: unexpected element 'a' diff --git a/tests/cxx/parser/validation/restriction/test-003.xml b/tests/cxx/parser/validation/restriction/test-003.xml deleted file mode 100644 index 49f18c7..0000000 --- a/tests/cxx/parser/validation/restriction/test-003.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - a - b - c - - a - b - c - - - diff --git a/tests/cxx/parser/validation/restriction/test-004.std b/tests/cxx/parser/validation/restriction/test-004.std deleted file mode 100644 index 5077837..0000000 --- a/tests/cxx/parser/validation/restriction/test-004.std +++ /dev/null @@ -1 +0,0 @@ -:7:8 error: expected element 'a' instead of 'b' diff --git a/tests/cxx/parser/validation/restriction/test-004.xml b/tests/cxx/parser/validation/restriction/test-004.xml deleted file mode 100644 index 115cd38..0000000 --- a/tests/cxx/parser/validation/restriction/test-004.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - b - - - diff --git a/tests/cxx/parser/validation/restriction/test-005.std b/tests/cxx/parser/validation/restriction/test-005.std deleted file mode 100644 index e92de14..0000000 --- a/tests/cxx/parser/validation/restriction/test-005.std +++ /dev/null @@ -1 +0,0 @@ -:9:19 error: expected attribute 'y' diff --git a/tests/cxx/parser/validation/restriction/test-005.xml b/tests/cxx/parser/validation/restriction/test-005.xml deleted file mode 100644 index e9ab7d9..0000000 --- a/tests/cxx/parser/validation/restriction/test-005.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - a - b - - - diff --git a/tests/cxx/parser/validation/restriction/test.xsd b/tests/cxx/parser/validation/restriction/test.xsd deleted file mode 100644 index 158ded5..0000000 --- a/tests/cxx/parser/validation/restriction/test.xsd +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/parser/validation/sequence/driver.cxx b/tests/cxx/parser/validation/sequence/driver.cxx deleted file mode 100644 index 61652b3..0000000 --- a/tests/cxx/parser/validation/sequence/driver.cxx +++ /dev/null @@ -1,139 +0,0 @@ -// file : tests/cxx/parser/validation/sequence/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the sequence compositor validation. -// - -#include -#include -#include - -#include "test-pskel.hxx" - -using namespace std; -using namespace test; -using xml_schema::ro_string; - -struct sequence_pimpl: sequence_pskel -{ - virtual void - pre () - { - cout << "{" << endl; - } - - virtual void - a (string const& v) - { - cout << " a = " << v << endl; - } - - virtual void - b (string const& v) - { - cout << " b = " << v << endl; - } - - virtual void - c (string const& v) - { - cout << " c = " << v << endl; - } - - virtual void - d (string const& v) - { - cout << " d = " << v << endl; - } - - virtual void - e (string const& v) - { - cout << " e = " << v << endl; - } - - virtual void - f (string const& v) - { - cout << " f = " << v << endl; - } - - virtual void - _start_any_element (ro_string const& ns, - ro_string const& name, - ro_string const*) - { - cout << " any: " << ns << "#" << name << endl - << " {" << endl; - } - - virtual void - _any_characters (ro_string const& v) - { - cout << " chars = " << v << endl; - } - - virtual void - _end_any_element (ro_string const&, ro_string const&) - { - cout << " }" << endl; - } - - virtual void - post_sequence () - { - cout << "}" << endl - << endl; - } -}; - -struct type_pimpl: type_pskel -{ -}; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - sequence_pimpl sequence_p; - type_pimpl type_p; - - sequence_p.parsers (string_p, string_p, string_p, - string_p, string_p, string_p); - type_p.parsers (sequence_p); - - xml_schema::document doc_p (type_p, "test", "root"); - - try - { - ifstream ifs (argv[1]); - type_p.pre (); - doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate); - type_p.post_type (); - } - catch (xml_schema::exception const& e) - { - cout << " " << e << endl - << "}" << endl - << endl; - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile deleted file mode 100644 index f0a7b14..0000000 --- a/tests/cxx/parser/validation/sequence/makefile +++ /dev/null @@ -1,92 +0,0 @@ -# file : tests/cxx/parser/validation/sequence/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -tests := 000 001 002 003 004 005 006 - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -test_targets := $(addprefix $(out_base)/.test-,$(tests)) - -$(test): $(test_targets) -$(test_targets): driver := $(driver) - -.PHONY: $(out_base)/.test-% -$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std - $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/validation/sequence/test-000.std b/tests/cxx/parser/validation/sequence/test-000.std deleted file mode 100644 index 8a44762..0000000 --- a/tests/cxx/parser/validation/sequence/test-000.std +++ /dev/null @@ -1,56 +0,0 @@ -{ - c = c - d = d - any: test#any - { - chars = aaa - any: #a - { - chars = bbb - } - chars = ccc - } - f = f - e = e -} - -{ - a = a - b = b - c = c - d = d - d = d - d = d - any: other#any - { - chars = any - } - f = f - e = e - e = e -} - -{ - a = a - b = b - c = c - d = d - d = d - d = d - any: other#any - { - chars = any - } - f = f - e = e - e = e - c = c - d = d - any: test#any - { - chars = any - } - f = f - e = e -} - diff --git a/tests/cxx/parser/validation/sequence/test-000.xml b/tests/cxx/parser/validation/sequence/test-000.xml deleted file mode 100644 index 9bcbd7e..0000000 --- a/tests/cxx/parser/validation/sequence/test-000.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - c - d - aaabbbccc - f - e - - - - a - b - c - d - d - d - any - f - e - e - - - - a - b - c - d - d - d - any - f - e - e - - c - d - any - f - e - - - diff --git a/tests/cxx/parser/validation/sequence/test-001.std b/tests/cxx/parser/validation/sequence/test-001.std deleted file mode 100644 index 20dea34..0000000 --- a/tests/cxx/parser/validation/sequence/test-001.std +++ /dev/null @@ -1,4 +0,0 @@ -{ - :8:14 error: expected element 'a' -} - diff --git a/tests/cxx/parser/validation/sequence/test-001.xml b/tests/cxx/parser/validation/sequence/test-001.xml deleted file mode 100644 index 67d33ce..0000000 --- a/tests/cxx/parser/validation/sequence/test-001.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/tests/cxx/parser/validation/sequence/test-002.std b/tests/cxx/parser/validation/sequence/test-002.std deleted file mode 100644 index 61343e7..0000000 --- a/tests/cxx/parser/validation/sequence/test-002.std +++ /dev/null @@ -1,20 +0,0 @@ -{ - c = c - d = d - any: test#any - { - chars = any - } - f = f - e = e - c = c - d = d - any: test#any - { - chars = any - } - f = f - e = e - :20:8 error: unexpected element 'c' -} - diff --git a/tests/cxx/parser/validation/sequence/test-002.xml b/tests/cxx/parser/validation/sequence/test-002.xml deleted file mode 100644 index be25fcf..0000000 --- a/tests/cxx/parser/validation/sequence/test-002.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - c - d - any - f - e - - c - d - any - f - e - - c - d - any - f - e - - - diff --git a/tests/cxx/parser/validation/sequence/test-003.std b/tests/cxx/parser/validation/sequence/test-003.std deleted file mode 100644 index c4e1e46..0000000 --- a/tests/cxx/parser/validation/sequence/test-003.std +++ /dev/null @@ -1,5 +0,0 @@ -{ - a = a - :9:8 error: expected element 'b' instead of 'a' -} - diff --git a/tests/cxx/parser/validation/sequence/test-003.xml b/tests/cxx/parser/validation/sequence/test-003.xml deleted file mode 100644 index af7d21d..0000000 --- a/tests/cxx/parser/validation/sequence/test-003.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - a - a - c - d - any - f - e - - - diff --git a/tests/cxx/parser/validation/sequence/test-004.std b/tests/cxx/parser/validation/sequence/test-004.std deleted file mode 100644 index f4c1d4d..0000000 --- a/tests/cxx/parser/validation/sequence/test-004.std +++ /dev/null @@ -1,4 +0,0 @@ -{ - :8:8 error: expected element 'a' instead of 'd' -} - diff --git a/tests/cxx/parser/validation/sequence/test-004.xml b/tests/cxx/parser/validation/sequence/test-004.xml deleted file mode 100644 index a58b6d4..0000000 --- a/tests/cxx/parser/validation/sequence/test-004.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - d - any - f - e - - - diff --git a/tests/cxx/parser/validation/sequence/test-005.std b/tests/cxx/parser/validation/sequence/test-005.std deleted file mode 100644 index 9fa7904..0000000 --- a/tests/cxx/parser/validation/sequence/test-005.std +++ /dev/null @@ -1,6 +0,0 @@ -{ - c = c - d = d - :10:13 error: expected element '##targetNamespace#*' instead of 'other1#any' -} - diff --git a/tests/cxx/parser/validation/sequence/test-005.xml b/tests/cxx/parser/validation/sequence/test-005.xml deleted file mode 100644 index e3dd03d..0000000 --- a/tests/cxx/parser/validation/sequence/test-005.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - c - d - any - f - e - - - diff --git a/tests/cxx/parser/validation/sequence/test-006.std b/tests/cxx/parser/validation/sequence/test-006.std deleted file mode 100644 index eb79f47..0000000 --- a/tests/cxx/parser/validation/sequence/test-006.std +++ /dev/null @@ -1,13 +0,0 @@ -{ - c = c - d = d - any: test#any - { - chars = any - } - f = f - e = e - e = e - :14:8 error: unexpected element 'e' -} - diff --git a/tests/cxx/parser/validation/sequence/test-006.xml b/tests/cxx/parser/validation/sequence/test-006.xml deleted file mode 100644 index e1ecd69..0000000 --- a/tests/cxx/parser/validation/sequence/test-006.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - c - d - any - f - e - e - e - - - diff --git a/tests/cxx/parser/validation/sequence/test.xsd b/tests/cxx/parser/validation/sequence/test.xsd deleted file mode 100644 index 8753f54..0000000 --- a/tests/cxx/parser/validation/sequence/test.xsd +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/any-type/driver.cxx b/tests/cxx/tree/any-type/driver.cxx deleted file mode 100644 index ae81081..0000000 --- a/tests/cxx/tree/any-type/driver.cxx +++ /dev/null @@ -1,144 +0,0 @@ -// file : tests/cxx/tree/any-type/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test anyType and anySimpleType content extraction. -// - -#include // std::auto_ptr/unique_ptr -#include // std::move -#include -#include - -#include -#include - -#include "test.hxx" // Get XSD_CXX11 defined. - -#include - -using namespace std; -using namespace test; -using namespace xercesc; - -namespace xml = xsd::cxx::xml; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - XMLPlatformUtils::Initialize (); - - try - { - // Test parsing - // - XSD_AUTO_PTR r (root (argv[1])); - - // Test API. - // - { - assert (type::a_default_value ().text_content () == "default value"); - } - - { - xml_schema::simple_type x ("fox"); - assert (x.text_content () == "fox"); - x.text_content ("foo"); - assert (x.text_content () == "foo"); - x.text_content ().clear (); - assert (x.text_content () == ""); - x.text_content () = "baz"; - r->s ().push_back (x); - } - - { - xml_schema::type x; - - DOMDocument& doc (x.dom_content_document ()); - - // Copy. - // - DOMElement* e (doc.createElement (xml::string ("dummy").c_str ())); - e->setAttribute (xml::string ("x").c_str (), - xml::string ("foo").c_str ()); - e->setTextContent (xml::string ("data").c_str ()); - x.dom_content ().set (*e); - e->release (); - - r->t ().push_back (x); - } - - { - XSD_AUTO_PTR x (new xml_schema::type); - - DOMDocument& doc (x->dom_content_document ()); - - // Assume ownership. - // - DOMElement* e (doc.createElement (xml::string ("dummy").c_str ())); - e->setAttribute (xml::string ("x").c_str (), - xml::string ("foo").c_str ()); - e->setTextContent (xml::string ("data").c_str ()); - x->dom_content ().set (e); - -#ifdef XSD_CXX11 - r->t ().push_back (std::move (x)); -#else - r->t ().push_back (x); -#endif - } - - // Test printing. - // - cout << *r << endl - << endl; - - // Test serialization. - // - xml_schema::namespace_infomap map; - - map["t"].name = "test"; - map["t"].schema = "test.xsd"; - map["o"].name = "other"; - - stringstream iostr; - root (iostr, *r, map); - - cout << iostr.str () << endl - << endl; - - { - XSD_AUTO_PTR r1 (root (iostr, argv[1])); - - // Xerces-C++ mis-indentation of mixed content messes this up. - // assert (*r == *r); - - stringstream iostr; - root (iostr, *r1, map); - - cout << iostr.str () << endl - << endl; - } - - // Test comparison. - // - assert (*r == *r); - - // Test copy c-tor. - // - type copy (*r); - assert (copy == *r); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - - XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/any-type/makefile b/tests/cxx/tree/any-type/makefile deleted file mode 100644 index 1267cd4..0000000 --- a/tests/cxx/tree/any-type/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/any-type/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-any-type --generate-serialization \ ---generate-ostream --generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/any-type/output b/tests/cxx/tree/any-type/output deleted file mode 100644 index 580e7db..0000000 --- a/tests/cxx/tree/any-type/output +++ /dev/null @@ -1,73 +0,0 @@ - -t: -t: -t: -t: -t: -t: -t: -t: -s: -s: simple -s: baz -l: one two three -a: any simple content - - - - - - any - any - - - nested 1 - nested 2 - - more - - mi - nested 1x - nested 2ed - content - - data - data - - simple - baz - one two three - - - - - - - - any - any - - - nested 1 - nested 2 - - more - - mi - - nested 1x - - nested 2ed - - content - - - data - data - - simple - baz - one two three - - - diff --git a/tests/cxx/tree/any-type/test.xml b/tests/cxx/tree/any-type/test.xml deleted file mode 100644 index 7c9035a..0000000 --- a/tests/cxx/tree/any-type/test.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - any - any - - - nested 1 - nested 2 - - more - - minested 1xnested 2edcontent - - - simple - - one two three - - diff --git a/tests/cxx/tree/any-type/test.xsd b/tests/cxx/tree/any-type/test.xsd deleted file mode 100644 index 37dcc8d..0000000 --- a/tests/cxx/tree/any-type/test.xsd +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/binary/cdr/driver.cxx b/tests/cxx/tree/binary/cdr/driver.cxx deleted file mode 100644 index fe74bb5..0000000 --- a/tests/cxx/tree/binary/cdr/driver.cxx +++ /dev/null @@ -1,143 +0,0 @@ -// file : tests/cxx/tree/binary/cdr/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test non-polymorphic binary serialization to ACE CDR. -// - -#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])); - - // Save to a CDR stream. - // - ACE_OutputCDR ace_ocdr; - xml_schema::ostream ocdr (ace_ocdr); - ocdr << *r; - - // Load from a CDR stream. - // - ACE_InputCDR ace_icdr (ace_ocdr); - xml_schema::istream icdr (ace_icdr); - XSD_AUTO_PTR c (new type (icdr)); - - // Compare the two. - // - assert (r->list () == c->list ()); - assert (r->union_ () == c->union_ ()); - assert (r->enumeration () == c->enumeration ()); - - type::complex_sequence rs (r->complex ()), cs (c->complex ()); - - for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ()); - ri != rs.end () && ci != rs.end (); ++ri, ++ci) - { - assert (ri->a () == ci->a ()); - if (ri->b ()) - assert (ri->b () == ci->b ()); - assert (ri->c () == ci->c ()); - - assert (ri->x () == ci->x ()); - if (ri->y ()) - assert (ri->y () == ci->y ()); - } - - // integers - // - assert (r->byte () == c->byte ()); - assert (r->unsigned_byte () == c->unsigned_byte ()); - assert (r->short_ () == c->short_ ()); - assert (r->unsigned_short () == c->unsigned_short ()); - assert (r->int_ () == c->int_ ()); - assert (r->unsigned_int () == c->unsigned_int ()); - assert (r->long_ () == c->long_ ()); - assert (r->unsigned_long () == c->unsigned_long ()); - assert (r->integer () == c->integer ()); - assert (r->non_positive_integer () == c->non_positive_integer ()); - assert (r->non_negative_integer () == c->non_negative_integer ()); - assert (r->positive_integer () == c->positive_integer ()); - assert (r->negative_integer () == c->negative_integer ()); - - // boolean - // - assert (r->boolean () == c->boolean ()); - - // floats - // - assert (r->float_ () == c->float_ ()); - assert (r->double_ () == c->double_ ()); - assert (r->decimal () == c->decimal ()); - - // strings - // - assert (r->string () == c->string ()); - assert (r->normalized_string () == c->normalized_string ()); - assert (r->token () == c->token ()); - assert (r->name () == c->name ()); - assert (r->name_token () == c->name_token ()); - assert (r->name_tokens () == c->name_tokens ()); - assert (r->ncname () == c->ncname ()); - assert (r->language () == c->language ()); - - // qualified name - // - assert (r->qname () == c->qname ()); - - // ID/IDREF - // - assert (r->id () == c->id ()); - assert (r->id_ref () == c->id_ref ()); - assert (r->id_refs () == c->id_refs ()); - - // URI - // - assert (r->any_uri () == c->any_uri ()); - - // binary - // - assert (r->base64_binary () == c->base64_binary ()); - assert (r->hex_binary () == c->hex_binary ()); - - // date/time - // - assert (r->day () == c->day ()); - assert (r->month () == c->month ()); - assert (r->year () == c->year ()); - assert (r->month_day () == c->month_day ()); - assert (r->year_month () == c->year_month ()); - assert (r->date () == c->date ()); - assert (r->time () == c->time ()); - assert (r->date_time () == c->date_time ()); - assert (r->duration () == c->duration ()); - - // anySimpleType - // - assert (!r->any_simple_type_attr ().text_content ().empty ()); - assert (r->any_simple_type_attr () == c->any_simple_type_attr ()); - - assert (!r->any_simple_type ().text_content ().empty ()); - assert (r->any_simple_type () == c->any_simple_type ()); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/binary/cdr/makefile b/tests/cxx/tree/binary/cdr/makefile deleted file mode 100644 index 2d452ee..0000000 --- a/tests/cxx/tree/binary/cdr/makefile +++ /dev/null @@ -1,89 +0,0 @@ -# file : tests/cxx/tree/binary/cdr/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libace/stub.make,\ - l: ace.l,cpp-options: ace.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) $(ace.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-insertion ACE_OutputCDR \ ---generate-extraction ACE_InputCDR --generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/binary/cdr/test.xml b/tests/cxx/tree/binary/cdr/test.xml deleted file mode 100644 index 5cedd98..0000000 --- a/tests/cxx/tree/binary/cdr/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - any simple content in element - - diff --git a/tests/cxx/tree/binary/cdr/test.xsd b/tests/cxx/tree/binary/cdr/test.xsd deleted file mode 100644 index 0629e94..0000000 --- a/tests/cxx/tree/binary/cdr/test.xsd +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/binary/makefile b/tests/cxx/tree/binary/makefile deleted file mode 100644 index 9ccc93f..0000000 --- a/tests/cxx/tree/binary/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/binary/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := cdr polymorphic xdr xdr-ordered - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/binary/polymorphic/driver.cxx b/tests/cxx/tree/binary/polymorphic/driver.cxx deleted file mode 100644 index 15ebf17..0000000 --- a/tests/cxx/tree/binary/polymorphic/driver.cxx +++ /dev/null @@ -1,164 +0,0 @@ -// file : tests/cxx/tree/binary/polymorphic/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test polymorphic binary serialization. -// - -#include // std::auto_ptr/unique_ptr -#include -#include -#include - -#include // ACE_HEX_DUMP - -#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])); - - // Save to a CDR stream. - // - ACE_OutputCDR ace_ocdr; - xml_schema::ostream ocdr (ace_ocdr); - ocdr << *r; - - /* - // Print the binary representation. - // - cerr << "binary representation size: " << ace_ocdr.total_length () << endl; - - for (const ACE_Message_Block* mb = ace_ocdr.begin (); - mb != 0; - mb = mb->cont ()) - { - ACE_HEX_DUMP ((LM_DEBUG, mb->rd_ptr (), mb->length ())); - } - */ - - // Load from a CDR stream. - // - ACE_InputCDR ace_icdr (ace_ocdr); - xml_schema::istream icdr (ace_icdr); - XSD_AUTO_PTR c (new type (icdr)); - - // Compare the two. - // - assert (r->list () == c->list ()); - assert (r->union_ () == c->union_ ()); - assert (r->enumeration () == c->enumeration ()); - - { - complex& rc (dynamic_cast (r->base ())); - complex& cc (dynamic_cast (c->base ())); - - assert (rc.a () == cc.a ()); - if (rc.b ()) - assert (rc.b () == cc.b ()); - assert (rc.c () == cc.c ()); - - assert (rc.x () == cc.x ()); - if (rc.y ()) - assert (rc.y () == cc.y ()); - } - - { - complex& rc (dynamic_cast (r->sbase ())); - complex& cc (dynamic_cast (c->sbase ())); - - assert (rc.a () == cc.a ()); - if (rc.b ()) - assert (rc.b () == cc.b ()); - assert (rc.c () == cc.c ()); - - assert (rc.x () == cc.x ()); - if (rc.y ()) - assert (rc.y () == cc.y ()); - } - - // integers - // - assert (r->byte () == c->byte ()); - assert (r->unsigned_byte () == c->unsigned_byte ()); - assert (r->short_ () == c->short_ ()); - assert (r->unsigned_short () == c->unsigned_short ()); - assert (r->int_ () == c->int_ ()); - assert (r->unsigned_int () == c->unsigned_int ()); - assert (r->long_ () == c->long_ ()); - assert (r->unsigned_long () == c->unsigned_long ()); - assert (r->integer () == c->integer ()); - assert (r->non_positive_integer () == c->non_positive_integer ()); - assert (r->non_negative_integer () == c->non_negative_integer ()); - assert (r->positive_integer () == c->positive_integer ()); - assert (r->negative_integer () == c->negative_integer ()); - - // boolean - // - assert (r->boolean () == c->boolean ()); - - // floats - // - assert (r->float_ () == c->float_ ()); - assert (r->double_ () == c->double_ ()); - assert (r->decimal () == c->decimal ()); - - // strings - // - assert (r->string () == c->string ()); - assert (r->normalized_string () == c->normalized_string ()); - assert (r->token () == c->token ()); - assert (r->name () == c->name ()); - assert (r->name_token () == c->name_token ()); - assert (r->name_tokens () == c->name_tokens ()); - assert (r->ncname () == c->ncname ()); - assert (r->language () == c->language ()); - - // qualified name - // - assert (r->qname () == c->qname ()); - - // ID/IDREF - // - assert (r->id () == c->id ()); - assert (r->id_ref () == c->id_ref ()); - assert (r->id_refs () == c->id_refs ()); - - // URI - // - assert (r->any_uri () == c->any_uri ()); - - // binary - // - assert (r->base64_binary () == c->base64_binary ()); - assert (r->hex_binary () == c->hex_binary ()); - - // date/time - // - assert (r->date () == c->date ()); - assert (r->date_time () == c->date_time ()); - assert (r->duration () == c->duration ()); - assert (r->day () == c->day ()); - assert (r->month () == c->month ()); - assert (r->month_day () == c->month_day ()); - assert (r->year () == c->year ()); - assert (r->year_month () == c->year_month ()); - assert (r->time () == c->time ()); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/binary/polymorphic/makefile b/tests/cxx/tree/binary/polymorphic/makefile deleted file mode 100644 index c88b79c..0000000 --- a/tests/cxx/tree/binary/polymorphic/makefile +++ /dev/null @@ -1,90 +0,0 @@ -# file : tests/cxx/tree/binary/polymorphic/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -$(call import,\ - $(scf_root)/import/libace/stub.make,\ - l: ace.l,cpp-options: ace.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) $(ace.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-polymorphic --root-element-last \ ---generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR \ - --generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/binary/polymorphic/test.xml b/tests/cxx/tree/binary/polymorphic/test.xml deleted file mode 100644 index ad3a403..0000000 --- a/tests/cxx/tree/binary/polymorphic/test.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - - aaa - bbb - c - cc - ccc - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - diff --git a/tests/cxx/tree/binary/polymorphic/test.xsd b/tests/cxx/tree/binary/polymorphic/test.xsd deleted file mode 100644 index 8c214e5..0000000 --- a/tests/cxx/tree/binary/polymorphic/test.xsd +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/binary/xdr-ordered/driver.cxx b/tests/cxx/tree/binary/xdr-ordered/driver.cxx deleted file mode 100644 index 8e2d845..0000000 --- a/tests/cxx/tree/binary/xdr-ordered/driver.cxx +++ /dev/null @@ -1,189 +0,0 @@ -// file : tests/cxx/tree/binary/xdr-ordered/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test non-polymorphic ordered binary serialization to XDR. -// -// Note: just a copy of xdr test with --ordered-type-all option. -// - -#include // std::auto_ptr/unique_ptr -#include // std::memcpy -#include -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -extern "C" int -overflow (char* p, char* buf, int in) -{ - xml_schema::buffer* dst (reinterpret_cast (p)); - - size_t n (static_cast (in)), size (dst->size ()); - dst->size (size + n); - memcpy (dst->data () + size, buf, n); - - return static_cast (n); -} - -struct underflow_info -{ - xml_schema::buffer* buf; - std::size_t pos; -}; - -extern "C" int -underflow (char* p, char* buf, int in) -{ - underflow_info* ui (reinterpret_cast (p)); - - size_t n (static_cast (in)), size (ui->buf->size () - ui->pos); - n = size > n ? n : size; - - memcpy (buf, ui->buf->data () + ui->pos, n); - ui->pos += n; - - return static_cast (n); -} - -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])); - - // Save to an XDR stream. - // - XDR xdr; - xml_schema::buffer buf; - xdrrec_create (&xdr, 0, 0, reinterpret_cast (&buf), 0, &overflow); - xdr.x_op = XDR_ENCODE; - xsd::cxx::tree::ostream oxdr (xdr); - oxdr << *r; - xdrrec_endofrecord (&xdr, true); // flush the data - xdr_destroy (&xdr); - - // Load from an XDR stream. - // - underflow_info ui; - ui.buf = &buf; - ui.pos = 0; - xdrrec_create (&xdr, 0, 0, reinterpret_cast (&ui), &underflow, 0); - xdr.x_op = XDR_DECODE; - xdrrec_skiprecord (&xdr); - xsd::cxx::tree::istream ixdr (xdr); - XSD_AUTO_PTR c (new type (ixdr)); - xdr_destroy (&xdr); - - // Compare the two. - // - assert (r->list () == c->list ()); - assert (r->union_ () == c->union_ ()); - assert (r->enumeration () == c->enumeration ()); - - type::complex_sequence rs (r->complex ()), cs (c->complex ()); - - for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ()); - ri != rs.end () && ci != rs.end (); ++ri, ++ci) - { - assert (ri->a () == ci->a ()); - if (ri->b ()) - assert (ri->b () == ci->b ()); - assert (ri->c () == ci->c ()); - - assert (ri->x () == ci->x ()); - if (ri->y ()) - assert (ri->y () == ci->y ()); - } - - // integers - // - assert (r->byte () == c->byte ()); - assert (r->unsigned_byte () == c->unsigned_byte ()); - assert (r->short_ () == c->short_ ()); - assert (r->unsigned_short () == c->unsigned_short ()); - assert (r->int_ () == c->int_ ()); - assert (r->unsigned_int () == c->unsigned_int ()); - assert (r->long_ () == c->long_ ()); - assert (r->unsigned_long () == c->unsigned_long ()); - assert (r->integer () == c->integer ()); - assert (r->non_positive_integer () == c->non_positive_integer ()); - assert (r->non_negative_integer () == c->non_negative_integer ()); - assert (r->positive_integer () == c->positive_integer ()); - assert (r->negative_integer () == c->negative_integer ()); - - // boolean - // - assert (r->boolean () == c->boolean ()); - - // floats - // - assert (r->float_ () == c->float_ ()); - assert (r->double_ () == c->double_ ()); - assert (r->decimal () == c->decimal ()); - - // strings - // - assert (r->string () == c->string ()); - assert (r->normalized_string () == c->normalized_string ()); - assert (r->token () == c->token ()); - assert (r->name () == c->name ()); - assert (r->name_token () == c->name_token ()); - assert (r->name_tokens () == c->name_tokens ()); - assert (r->ncname () == c->ncname ()); - assert (r->language () == c->language ()); - - // qualified name - // - assert (r->qname () == c->qname ()); - - // ID/IDREF - // - assert (r->id () == c->id ()); - assert (r->id_ref () == c->id_ref ()); - assert (r->id_refs () == c->id_refs ()); - - // URI - // - assert (r->any_uri () == c->any_uri ()); - - // binary - // - assert (r->base64_binary () == c->base64_binary ()); - assert (r->hex_binary () == c->hex_binary ()); - - // date/time - // - assert (r->date () == c->date ()); - assert (r->date_time () == c->date_time ()); - assert (r->duration () == c->duration ()); - assert (r->day () == c->day ()); - assert (r->month () == c->month ()); - assert (r->month_day () == c->month_day ()); - assert (r->year () == c->year ()); - assert (r->year_month () == c->year_month ()); - assert (r->time () == c->time ()); - - // anySimpleType - // - assert (!r->any_simple_type_attr ().text_content ().empty ()); - assert (r->any_simple_type_attr () == c->any_simple_type_attr ()); - - assert (!r->any_simple_type ().text_content ().empty ()); - assert (r->any_simple_type () == c->any_simple_type ()); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/binary/xdr-ordered/makefile b/tests/cxx/tree/binary/xdr-ordered/makefile deleted file mode 100644 index df3a945..0000000 --- a/tests/cxx/tree/binary/xdr-ordered/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/binary/xdr-ordered/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-insertion XDR --generate-extraction XDR \ ---generate-comparison --ordered-type-all -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/binary/xdr-ordered/test.xml b/tests/cxx/tree/binary/xdr-ordered/test.xml deleted file mode 100644 index 5cedd98..0000000 --- a/tests/cxx/tree/binary/xdr-ordered/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - any simple content in element - - diff --git a/tests/cxx/tree/binary/xdr-ordered/test.xsd b/tests/cxx/tree/binary/xdr-ordered/test.xsd deleted file mode 100644 index 0629e94..0000000 --- a/tests/cxx/tree/binary/xdr-ordered/test.xsd +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/binary/xdr/driver.cxx b/tests/cxx/tree/binary/xdr/driver.cxx deleted file mode 100644 index f5912c5..0000000 --- a/tests/cxx/tree/binary/xdr/driver.cxx +++ /dev/null @@ -1,187 +0,0 @@ -// file : tests/cxx/tree/binary/xdr/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test non-polymorphic binary serialization to XDR. -// - -#include // std::auto_ptr/unique_ptr -#include // std::memcpy -#include -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -extern "C" int -overflow (char* p, char* buf, int in) -{ - xml_schema::buffer* dst (reinterpret_cast (p)); - - size_t n (static_cast (in)), size (dst->size ()); - dst->size (size + n); - memcpy (dst->data () + size, buf, n); - - return static_cast (n); -} - -struct underflow_info -{ - xml_schema::buffer* buf; - std::size_t pos; -}; - -extern "C" int -underflow (char* p, char* buf, int in) -{ - underflow_info* ui (reinterpret_cast (p)); - - size_t n (static_cast (in)), size (ui->buf->size () - ui->pos); - n = size > n ? n : size; - - memcpy (buf, ui->buf->data () + ui->pos, n); - ui->pos += n; - - return static_cast (n); -} - -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])); - - // Save to an XDR stream. - // - XDR xdr; - xml_schema::buffer buf; - xdrrec_create (&xdr, 0, 0, reinterpret_cast (&buf), 0, &overflow); - xdr.x_op = XDR_ENCODE; - xsd::cxx::tree::ostream oxdr (xdr); - oxdr << *r; - xdrrec_endofrecord (&xdr, true); // flush the data - xdr_destroy (&xdr); - - // Load from an XDR stream. - // - underflow_info ui; - ui.buf = &buf; - ui.pos = 0; - xdrrec_create (&xdr, 0, 0, reinterpret_cast (&ui), &underflow, 0); - xdr.x_op = XDR_DECODE; - xdrrec_skiprecord (&xdr); - xsd::cxx::tree::istream ixdr (xdr); - XSD_AUTO_PTR c (new type (ixdr)); - xdr_destroy (&xdr); - - // Compare the two. - // - assert (r->list () == c->list ()); - assert (r->union_ () == c->union_ ()); - assert (r->enumeration () == c->enumeration ()); - - type::complex_sequence rs (r->complex ()), cs (c->complex ()); - - for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ()); - ri != rs.end () && ci != rs.end (); ++ri, ++ci) - { - assert (ri->a () == ci->a ()); - if (ri->b ()) - assert (ri->b () == ci->b ()); - assert (ri->c () == ci->c ()); - - assert (ri->x () == ci->x ()); - if (ri->y ()) - assert (ri->y () == ci->y ()); - } - - // integers - // - assert (r->byte () == c->byte ()); - assert (r->unsigned_byte () == c->unsigned_byte ()); - assert (r->short_ () == c->short_ ()); - assert (r->unsigned_short () == c->unsigned_short ()); - assert (r->int_ () == c->int_ ()); - assert (r->unsigned_int () == c->unsigned_int ()); - assert (r->long_ () == c->long_ ()); - assert (r->unsigned_long () == c->unsigned_long ()); - assert (r->integer () == c->integer ()); - assert (r->non_positive_integer () == c->non_positive_integer ()); - assert (r->non_negative_integer () == c->non_negative_integer ()); - assert (r->positive_integer () == c->positive_integer ()); - assert (r->negative_integer () == c->negative_integer ()); - - // boolean - // - assert (r->boolean () == c->boolean ()); - - // floats - // - assert (r->float_ () == c->float_ ()); - assert (r->double_ () == c->double_ ()); - assert (r->decimal () == c->decimal ()); - - // strings - // - assert (r->string () == c->string ()); - assert (r->normalized_string () == c->normalized_string ()); - assert (r->token () == c->token ()); - assert (r->name () == c->name ()); - assert (r->name_token () == c->name_token ()); - assert (r->name_tokens () == c->name_tokens ()); - assert (r->ncname () == c->ncname ()); - assert (r->language () == c->language ()); - - // qualified name - // - assert (r->qname () == c->qname ()); - - // ID/IDREF - // - assert (r->id () == c->id ()); - assert (r->id_ref () == c->id_ref ()); - assert (r->id_refs () == c->id_refs ()); - - // URI - // - assert (r->any_uri () == c->any_uri ()); - - // binary - // - assert (r->base64_binary () == c->base64_binary ()); - assert (r->hex_binary () == c->hex_binary ()); - - // date/time - // - assert (r->date () == c->date ()); - assert (r->date_time () == c->date_time ()); - assert (r->duration () == c->duration ()); - assert (r->day () == c->day ()); - assert (r->month () == c->month ()); - assert (r->month_day () == c->month_day ()); - assert (r->year () == c->year ()); - assert (r->year_month () == c->year_month ()); - assert (r->time () == c->time ()); - - // anySimpleType - // - assert (!r->any_simple_type_attr ().text_content ().empty ()); - assert (r->any_simple_type_attr () == c->any_simple_type_attr ()); - - assert (!r->any_simple_type ().text_content ().empty ()); - assert (r->any_simple_type () == c->any_simple_type ()); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/binary/xdr/makefile b/tests/cxx/tree/binary/xdr/makefile deleted file mode 100644 index dca3230..0000000 --- a/tests/cxx/tree/binary/xdr/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/binary/xdr/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-insertion XDR --generate-extraction XDR \ ---generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/binary/xdr/test.xml b/tests/cxx/tree/binary/xdr/test.xml deleted file mode 100644 index 5cedd98..0000000 --- a/tests/cxx/tree/binary/xdr/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - any simple content in element - - diff --git a/tests/cxx/tree/binary/xdr/test.xsd b/tests/cxx/tree/binary/xdr/test.xsd deleted file mode 100644 index 0629e94..0000000 --- a/tests/cxx/tree/binary/xdr/test.xsd +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/built-in/attributes.xml b/tests/cxx/tree/built-in/attributes.xml deleted file mode 100644 index 609a757..0000000 --- a/tests/cxx/tree/built-in/attributes.xml +++ /dev/null @@ -1,73 +0,0 @@ - - diff --git a/tests/cxx/tree/built-in/driver.cxx b/tests/cxx/tree/built-in/driver.cxx deleted file mode 100644 index f000f5a..0000000 --- a/tests/cxx/tree/built-in/driver.cxx +++ /dev/null @@ -1,93 +0,0 @@ -// file : tests/cxx/tree/built-in/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test built-in type mapping. -// - -#include // std::auto_ptr/unique_ptr -#include -#include - - -#include "types.hxx" - -using std::cerr; -using std::endl; - -int -main (int argc, char* argv[]) -{ - if (argc != 4) - { - cerr << "usage: " << argv[0] << " elements.xml attributes.xml inherited.xml" << endl; - return 1; - } - - XSD_AUTO_PTR elements ( - xmlns::test::elements (argv[1])); - - XSD_AUTO_PTR attributes ( - xmlns::test::attributes (argv[2])); - - XSD_AUTO_PTR inherited ( - xmlns::test::inherited (argv[3])); - - cerr << "elements: " << *elements << endl - << endl - << "attributes: " << *attributes << endl - << endl - << "inherited: " << *inherited << endl; - - // Test parsing/serialization. - // - - xml_schema::namespace_infomap map; - - map["test"].name = "http://www.codesynthesis.com/xmlns/test"; - map["test"].schema = "types.xsd"; - - { - std::ostringstream ostr; - xmlns::test::elements (ostr, *elements, map); - - std::istringstream istr (ostr.str ()); - XSD_AUTO_PTR elements1 ( - xmlns::test::elements (istr)); - - std::ostringstream ostr1; - xmlns::test::elements (ostr1, *elements1, map); - - if (ostr.str () != ostr1.str ()) - return 1; - } - - { - std::ostringstream ostr; - xmlns::test::attributes (ostr, *attributes, map); - - std::istringstream istr (ostr.str ()); - XSD_AUTO_PTR attributes1 ( - xmlns::test::attributes (istr)); - - std::ostringstream ostr1; - xmlns::test::attributes (ostr1, *attributes1, map); - - if (ostr.str () != ostr1.str ()) - return 1; - } - - { - std::ostringstream ostr; - xmlns::test::inherited (ostr, *inherited, map); - - std::istringstream istr (ostr.str ()); - XSD_AUTO_PTR inherited1 ( - xmlns::test::inherited (istr)); - - std::ostringstream ostr1; - xmlns::test::inherited (ostr1, *inherited1, map); - - if (ostr.str () != ostr1.str ()) - return 1; - } -} diff --git a/tests/cxx/tree/built-in/elements.xml b/tests/cxx/tree/built-in/elements.xml deleted file mode 100644 index f76f019..0000000 --- a/tests/cxx/tree/built-in/elements.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 12345678.12345678 - - - - string - normalized -string - - one - two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - - - - diff --git a/tests/cxx/tree/built-in/inherited.xml b/tests/cxx/tree/built-in/inherited.xml deleted file mode 100644 index 1781a69..0000000 --- a/tests/cxx/tree/built-in/inherited.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -3735928559 - 16045690984833335023 - -3735928559 - -3735928559 - 3735928559 - 3735928559 - -3735928559 - - - - true - - - - 1234.1234 - 12345678.12345678 - 12345678.12345678 - - - - string - normalized -string - - one - two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - - - - diff --git a/tests/cxx/tree/built-in/makefile b/tests/cxx/tree/built-in/makefile deleted file mode 100644 index b989fd1..0000000 --- a/tests/cxx/tree/built-in/makefile +++ /dev/null @@ -1,99 +0,0 @@ -# file : tests/cxx/tree/built-in/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := types.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options += \ ---char-type char \ ---generate-inline \ ---generate-ostream \ ---generate-serialization \ ---generate-default-ctor \ ---generate-from-base-ctor \ ---root-element-all - -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -# We need to cd to src_base in order to have the schema in the working -# directory. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/elements.xml $(src_base)/attributes.xml \ -$(src_base)/inherited.xml - cd $(src_base) && $(driver) $(src_base)/elements.xml \ -$(src_base)/attributes.xml $(src_base)/inherited.xml - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/built-in/types.xsd b/tests/cxx/tree/built-in/types.xsd deleted file mode 100644 index 22582cb..0000000 --- a/tests/cxx/tree/built-in/types.xsd +++ /dev/null @@ -1,460 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/chameleon/driver.cxx b/tests/cxx/tree/chameleon/driver.cxx deleted file mode 100644 index f196128..0000000 --- a/tests/cxx/tree/chameleon/driver.cxx +++ /dev/null @@ -1,35 +0,0 @@ -// file : tests/cxx/tree/chameleon/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test chameleon inclusion. -// - -#include // std::auto_ptr/unique_ptr -#include - -#include "includer.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/tests/cxx/tree/chameleon/includee.xsd b/tests/cxx/tree/chameleon/includee.xsd deleted file mode 100644 index 531a7d0..0000000 --- a/tests/cxx/tree/chameleon/includee.xsd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/cxx/tree/chameleon/includer.xsd b/tests/cxx/tree/chameleon/includer.xsd deleted file mode 100644 index a1c850a..0000000 --- a/tests/cxx/tree/chameleon/includer.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/tests/cxx/tree/chameleon/makefile b/tests/cxx/tree/chameleon/makefile deleted file mode 100644 index b647ae3..0000000 --- a/tests/cxx/tree/chameleon/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/chameleon/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := includer.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --root-element root --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/chameleon/output b/tests/cxx/tree/chameleon/output deleted file mode 100644 index c40f715..0000000 --- a/tests/cxx/tree/chameleon/output +++ /dev/null @@ -1,3 +0,0 @@ - -a: a -b: b diff --git a/tests/cxx/tree/chameleon/test.xml b/tests/cxx/tree/chameleon/test.xml deleted file mode 100644 index 12ff279..0000000 --- a/tests/cxx/tree/chameleon/test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - a - b - - diff --git a/tests/cxx/tree/comparison/driver.cxx b/tests/cxx/tree/comparison/driver.cxx deleted file mode 100644 index c44598c..0000000 --- a/tests/cxx/tree/comparison/driver.cxx +++ /dev/null @@ -1,38 +0,0 @@ -// file : tests/cxx/tree/comparison/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test generated comparison operators. -// - -#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])); - - type::complex_sequence s (r->complex ()); - - assert (s[0] == s[0]); - assert (s[0] != s[1]); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/comparison/makefile b/tests/cxx/tree/comparison/makefile deleted file mode 100644 index 373391b..0000000 --- a/tests/cxx/tree/comparison/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/comparison/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/comparison/test.xml b/tests/cxx/tree/comparison/test.xml deleted file mode 100644 index b5d8158..0000000 --- a/tests/cxx/tree/comparison/test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 123 - abc - abc - def - - - - 123 - abc - abc - xyz - - - diff --git a/tests/cxx/tree/comparison/test.xsd b/tests/cxx/tree/comparison/test.xsd deleted file mode 100644 index c234add..0000000 --- a/tests/cxx/tree/comparison/test.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/compilation/driver.cxx b/tests/cxx/tree/compilation/driver.cxx deleted file mode 100644 index 4318d97..0000000 --- a/tests/cxx/tree/compilation/driver.cxx +++ /dev/null @@ -1,116 +0,0 @@ -// file : tests/cxx/tree/compilation/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Make sure the runtime library compiles by explicitly instantiating -// all the types. -// - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -template class xsd::cxx::tree::simple_type; - -// String types. -// -template class xsd::cxx::tree::string< char, xml_schema::simple_type >; -template class xsd::cxx::tree::normalized_string< char, xml_schema::string >; -template class xsd::cxx::tree::token< char, xml_schema::normalized_string >; -template class xsd::cxx::tree::name< char, xml_schema::token >; -template class xsd::cxx::tree::nmtoken< char, xml_schema::token >; -template class xsd::cxx::tree::nmtokens< char, xml_schema::simple_type, xml_schema::nmtoken >; -template class xsd::cxx::tree::ncname< char, xml_schema::name >; -template class xsd::cxx::tree::language< char, xml_schema::token >; - -// ID/IDREF. -// -template class xsd::cxx::tree::id< char, xml_schema::ncname >; -template class xsd::cxx::tree::idref< char, xml_schema::ncname, xml_schema::type >; -template class xsd::cxx::tree::idrefs< char, xml_schema::simple_type, xml_schema::idref >; - -// URI. -// -template class xsd::cxx::tree::uri< char, xml_schema::simple_type >; - -// Qualified name. -// -template class xsd::cxx::tree::qname< char, xml_schema::simple_type, xml_schema::uri, xml_schema::ncname >; - -// Binary. -// -template class xsd::cxx::tree::buffer< char >; -template class xsd::cxx::tree::base64_binary< char, xml_schema::simple_type >; -template class xsd::cxx::tree::hex_binary< char, xml_schema::simple_type >; - -// Date/time. -// -template class xsd::cxx::tree::date< char, xml_schema::simple_type >; -template class xsd::cxx::tree::date_time< char, xml_schema::simple_type >; -template class xsd::cxx::tree::duration< char, xml_schema::simple_type >; -template class xsd::cxx::tree::gday< char, xml_schema::simple_type >; -template class xsd::cxx::tree::gmonth< char, xml_schema::simple_type >; -template class xsd::cxx::tree::gmonth_day< char, xml_schema::simple_type >; -template class xsd::cxx::tree::gyear< char, xml_schema::simple_type >; -template class xsd::cxx::tree::gyear_month< char, xml_schema::simple_type >; -template class xsd::cxx::tree::time< char, xml_schema::simple_type >; - -// Entity. -// -template class xsd::cxx::tree::entity< char, xml_schema::ncname >; -template class xsd::cxx::tree::entities< char, xml_schema::simple_type, xml_schema::entity >; - -// Namespace information and list stream. Used in -// serialization functions. -// -template class xsd::cxx::xml::dom::namespace_info < char >; -template class xsd::cxx::xml::dom::namespace_infomap < char >; -template class xsd::cxx::tree::list_stream < char >; - -// Flags and properties. -// -template class xsd::cxx::tree::properties< char >; - -// Exceptions. -// -template class xsd::cxx::tree::exception< char >; -template class xsd::cxx::tree::parsing< char >; -template class xsd::cxx::tree::expected_element< char >; -template class xsd::cxx::tree::unexpected_element< char >; -template class xsd::cxx::tree::expected_attribute< char >; -template class xsd::cxx::tree::unexpected_enumerator< char >; -template class xsd::cxx::tree::expected_text_content< char >; -template class xsd::cxx::tree::no_type_info< char >; -template class xsd::cxx::tree::not_derived< char >; -template class xsd::cxx::tree::duplicate_id< char >; -template class xsd::cxx::tree::serialization< char >; -template class xsd::cxx::tree::no_prefix_mapping< char >; -template class xsd::cxx::tree::bounds< char >; - -// Parsing/serialization diagnostics. -// -template class xsd::cxx::tree::error< char >; -template class xsd::cxx::tree::diagnostics< char >; - -// Error handler interface. -// -template class xsd::cxx::xml::error_handler< char >; - - -// -// -template class xsd::cxx::tree::fundamental_base; -template class xsd::cxx::tree::one; -template class xsd::cxx::tree::one; -template class xsd::cxx::tree::optional; -template class xsd::cxx::tree::optional; -template class xsd::cxx::tree::sequence; -template class xsd::cxx::tree::sequence; - - -int -main () -{ -} diff --git a/tests/cxx/tree/compilation/makefile b/tests/cxx/tree/compilation/makefile deleted file mode 100644 index 3856416..0000000 --- a/tests/cxx/tree/compilation/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/compilation/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/compilation/test.xsd b/tests/cxx/tree/compilation/test.xsd deleted file mode 100644 index 07bebc7..0000000 --- a/tests/cxx/tree/compilation/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/tree/complex/ctor/driver.cxx b/tests/cxx/tree/complex/ctor/driver.cxx deleted file mode 100644 index 0d691ac..0000000 --- a/tests/cxx/tree/complex/ctor/driver.cxx +++ /dev/null @@ -1,122 +0,0 @@ -// file : tests/cxx/tree/complex/ctor/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test generation of varous complex type constructors. -// - -#include -#include - -#include "test.hxx" - -#ifdef XSD_CXX11 -# include // std::move -# define XSD_MOVE(x) std::move(x) -#else -# define XSD_MOVE(x) x -#endif - -using namespace std; -using namespace test; - -int -main () -{ - // Test case A. - // - { - a_base b1; - a_base b2 ("abc"); // empty ultimate base + required - a_base b3 ("abc", "foo"); // ultimate base + required - - a_derived a1; - a_derived a2 ("foo", "bar"); // empty ultimate base + required - a_derived a3 (b3, "bar"); // base + required - a_derived a4 ("abc", "foo", "bar"); // ultimate base + required - } - - // Test case B. - // - { - b_simple s ("base"); - b_base b ("base", "foo"); - b_derived d ("base", "foo", "bar"); - b_type t ("base"); - } - - // Test case C. - // - { - c_simple s (c_enum::a); - c_base b (c_enum::a, "foo"); - c_derived d (c_enum::a, "foo", "bar"); - c_type t (c_enum::a); - } - - // Test case D. - // - { - d_simple s (1); - d_base b (1, "foo"); - d_derived d (1, "foo", "bar"); - d_type t (1); - } - - // Test case E. - // - { - // e_base - // - e_base b1 (1, "foo", e_complex_type ("bar")); - - XSD_AUTO_PTR c2 (new e_complex_type ("bar")); - e_base b2 (1, "foo", XSD_MOVE (c2)); - - XSD_AUTO_PTR s3 (new e_simple_type ("foo")); - XSD_AUTO_PTR c3 (new e_complex_type ("bar")); - e_base b3 (1, XSD_MOVE (s3), XSD_MOVE (c3)); - - assert (b1 == b2); - assert (b1 == b3); - - // e_derived - // - e_derived d1 (1, "foo", e_complex_type ("bar"), - true, "baz", e_complex_type ("biz")); - - XSD_AUTO_PTR c2a (new e_complex_type ("bar")); - XSD_AUTO_PTR c2b (new e_complex_type ("biz")); - e_derived d2 (1, "foo", XSD_MOVE (c2a), true, "baz", XSD_MOVE (c2b)); - - XSD_AUTO_PTR s3a (new e_simple_type ("foo")); - XSD_AUTO_PTR s3b (new xml_schema::string ("baz")); - XSD_AUTO_PTR c3a (new e_complex_type ("bar")); - XSD_AUTO_PTR c3b (new e_complex_type ("biz")); - e_derived d3 (1, - XSD_MOVE (s3a), - XSD_MOVE (c3a), - true, - XSD_MOVE (s3b), - XSD_MOVE (c3b)); - - assert (d1 == d2); - assert (d1 == d3); - - } - - // Test case F. - // - { - f_type f1 (xml_schema::type (), 1, "foo", f_complex_type ("bar")); - - XSD_AUTO_PTR c2 (new f_complex_type ("bar")); - f_type f2 (1, "foo", XSD_MOVE (c2)); - - XSD_AUTO_PTR s3 (new f_simple_type ("foo")); - XSD_AUTO_PTR c3 (new f_complex_type ("bar")); - f_type f3 (1, XSD_MOVE (s3), XSD_MOVE (c3)); - - assert (f1 == f2); - assert (f1 == f3); - } -} diff --git a/tests/cxx/tree/complex/ctor/makefile b/tests/cxx/tree/complex/ctor/makefile deleted file mode 100644 index db592ff..0000000 --- a/tests/cxx/tree/complex/ctor/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/complex/ctor/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-default-ctor --generate-from-base-ctor \ ---generate-doxygen --generate-polymorphic --polymorphic-type-all \ ---generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/complex/ctor/test.xsd b/tests/cxx/tree/complex/ctor/test.xsd deleted file mode 100644 index b8dd95e..0000000 --- a/tests/cxx/tree/complex/ctor/test.xsd +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/complex/makefile b/tests/cxx/tree/complex/makefile deleted file mode 100644 index 95ff3f6..0000000 --- a/tests/cxx/tree/complex/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/complex/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := ctor - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/containment/driver.cxx b/tests/cxx/tree/containment/driver.cxx deleted file mode 100644 index 954b76b..0000000 --- a/tests/cxx/tree/containment/driver.cxx +++ /dev/null @@ -1,118 +0,0 @@ -// file : tests/cxx/tree/containment/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test tree node containment. -// - -#include // std::auto_ptr/unique_ptr -#include - -#include "test.hxx" - -#ifdef XSD_CXX11 -# include // std::move -# define XSD_MOVE(x) std::move(x) -#else -# define XSD_MOVE(x) x -#endif - -using namespace std; -using namespace test; - -int -main () -{ - // Change of a container in a sub-tree without ID. - // - { - XSD_AUTO_PTR i (new inner ()); - i->ref ("foo"); - - outer o; - o.i (XSD_MOVE (i)); - o.ref ("foo"); - - assert (o.i ()->ref ()->get () == 0); - assert (o.ref ()->get () == 0); - } - - // Change of container in a sub-tree with ID inside. - // - { - XSD_AUTO_PTR i (new inner ()); - inner* p (i.get ()); - i->id ("foo"); - i->ref ("foo"); - assert (i->ref ()->get () == p); - - outer o; - o.i (XSD_MOVE (i)); - o.ref ("foo"); - - assert (o.i ()->ref ()->get () == p); - assert (o.ref ()->get () == p); - } - - // Change of a container in ID. - // - { - XSD_AUTO_PTR id (new xml_schema::id ("foo")); - - inner i; - i.id (XSD_MOVE (id)); - i.ref ("foo"); - assert (i.ref ()->get () == &i); - } - - // Change of a container in a type derived from ID with ID inside. - // - { - XSD_AUTO_PTR id (new id_ex ("foo")); - id_ex* p (id.get ()); - id->id ("bar"); - - inner i; - i.id_ex (XSD_MOVE (id)); - - i.ref ("foo"); - assert (i.ref ()->get () == &i); - - i.ref ("bar"); - assert (i.ref ()->get () == p); - } - - // IDREF lists - // - { - id i1 ("a"), i2 ("b"); - - XSD_AUTO_PTR ic (new ids); - ic->id ().push_back (i1); - ic->id ().push_back (i2); - - XSD_AUTO_PTR r1 (new xml_schema::idrefs); - r1->push_back (xml_schema::idref ("a")); - r1->push_back (xml_schema::idref ("b")); - - XSD_AUTO_PTR r2 (new idref_list); - r2->push_back (xml_schema::idref ("a")); - r2->push_back (xml_schema::idref ("b")); - - XSD_AUTO_PTR rc1 (new idrefs1); - XSD_AUTO_PTR rc2 (new idrefs2); - - rc1->idrefs (XSD_MOVE (r1)); - rc2->idrefs (XSD_MOVE (r2)); - - model m; - m.ids (XSD_MOVE (ic)); - m.idrefs1 (XSD_MOVE (rc1)); - m.idrefs2 (XSD_MOVE (rc2)); - - assert (m.idrefs1 ().idrefs ()[0].get () != 0); - assert (m.idrefs1 ().idrefs ()[1].get () != 0); - - assert (m.idrefs2 ().idrefs ()[0].get () != 0); - assert (m.idrefs2 ().idrefs ()[1].get () != 0); - } -} diff --git a/tests/cxx/tree/containment/makefile b/tests/cxx/tree/containment/makefile deleted file mode 100644 index dc7ca7b..0000000 --- a/tests/cxx/tree/containment/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/containment/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-default-ctor -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/containment/test.xsd b/tests/cxx/tree/containment/test.xsd deleted file mode 100644 index 72c9379..0000000 --- a/tests/cxx/tree/containment/test.xsd +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/default/general/driver.cxx b/tests/cxx/tree/default/general/driver.cxx deleted file mode 100644 index 97d0a7d..0000000 --- a/tests/cxx/tree/default/general/driver.cxx +++ /dev/null @@ -1,37 +0,0 @@ -// file : tests/cxx/tree/default/general/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test default attribute/element values. -// - -#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], xml_schema::flags::dont_validate)); - - xml_schema::namespace_infomap map; - map["t"].name = "test"; - root (cout, *r, map); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/default/general/makefile b/tests/cxx/tree/default/general/makefile deleted file mode 100644 index fc1bca1..0000000 --- a/tests/cxx/tree/default/general/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/default/general/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream --generate-serialization \ ---generate-default-ctor --generate-from-base-ctor -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/default/general/output b/tests/cxx/tree/default/general/output deleted file mode 100644 index 396a698..0000000 --- a/tests/cxx/tree/default/general/output +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/tests/cxx/tree/default/general/test.xml b/tests/cxx/tree/default/general/test.xml deleted file mode 100644 index 11bd0a7..0000000 --- a/tests/cxx/tree/default/general/test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/tests/cxx/tree/default/general/test.xsd b/tests/cxx/tree/default/general/test.xsd deleted file mode 100644 index 9d9cd38..0000000 --- a/tests/cxx/tree/default/general/test.xsd +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/default/makefile b/tests/cxx/tree/default/makefile deleted file mode 100644 index 304640e..0000000 --- a/tests/cxx/tree/default/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/default/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := general omit - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/default/omit/driver.cxx b/tests/cxx/tree/default/omit/driver.cxx deleted file mode 100644 index e588a34..0000000 --- a/tests/cxx/tree/default/omit/driver.cxx +++ /dev/null @@ -1,46 +0,0 @@ -// file : tests/cxx/tree/default/omit/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test default attribute omission from the output. -// - -#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], xml_schema::flags::dont_validate)); - - cout << *r << endl - << "default x: " << derived::x_default_value () << endl - << "default y: " << derived::y_default_value () << endl - << "fixed p: " << derived::p_default_value () << endl - << "fixed q1: " << derived::q1_default_value () << endl - << "fixed q2: " << derived::q2_default_value () << endl; - - // Serialize. - // - xml_schema::namespace_infomap map; - map["t"].name = "test"; - root (cout, *r, map); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/default/omit/makefile b/tests/cxx/tree/default/omit/makefile deleted file mode 100644 index 93a9cd2..0000000 --- a/tests/cxx/tree/default/omit/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/default/omit/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream --generate-serialization \ ---generate-default-ctor --generate-from-base-ctor --omit-default-attributes -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/default/omit/output b/tests/cxx/tree/default/omit/output deleted file mode 100644 index 150ad58..0000000 --- a/tests/cxx/tree/default/omit/output +++ /dev/null @@ -1,19 +0,0 @@ - -derived: -a: a -x: foo -q1: 1 -y: -20 -p: bar -q2: 2 -default x: foo -default y: -20 -fixed p: bar -fixed q1: 1 -fixed q2: 2 - - - - a - - diff --git a/tests/cxx/tree/default/omit/test.xml b/tests/cxx/tree/default/omit/test.xml deleted file mode 100644 index dec39b4..0000000 --- a/tests/cxx/tree/default/omit/test.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - a - - - diff --git a/tests/cxx/tree/default/omit/test.xsd b/tests/cxx/tree/default/omit/test.xsd deleted file mode 100644 index bfc68d4..0000000 --- a/tests/cxx/tree/default/omit/test.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/detach/driver.cxx b/tests/cxx/tree/detach/driver.cxx deleted file mode 100644 index d1a8f6f..0000000 --- a/tests/cxx/tree/detach/driver.cxx +++ /dev/null @@ -1,108 +0,0 @@ -// file : tests/cxx/tree/detach/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the detach functionality. -// - -#include // std::auto_ptr/unique_ptr -#include - -#include "test.hxx" - -#ifdef XSD_CXX11 -# include // std::move -# define XSD_MOVE(x) std::move(x) -#else -# define XSD_MOVE(x) x -#endif - -using namespace std; -using namespace test; - -int -main () -{ - using test::ref; - - // Construct the model. - // - object o1 ("o1"); - o1.data ().push_back ("1-1"); - o1.data ().push_back ("1-2"); - o1.data ().push_back ("1-3"); - - object o2 ("o2"); - o1.data ().push_back ("2-1"); - o1.data ().push_back ("2-2"); - o1.data ().push_back ("2-3"); - - object o3 ("o3"); - o1.data ().push_back ("3-1"); - o1.data ().push_back ("3-2"); - o1.data ().push_back ("3-3"); - - object o4 ("o4"); - o1.data ().push_back ("4-1"); - o1.data ().push_back ("4-2"); - o1.data ().push_back ("4-3"); - - subtree s1; - s1.o ().push_back (o1); - s1.o ().push_back (o2); - s1.r ().push_back (ref ("o2")); - s1.r ().push_back (ref ("o3")); - - subtree s2; - s2.o ().push_back (o3); - s2.o ().push_back (o4); - s2.r ().push_back (ref ("o4")); - s2.r ().push_back (ref ("o1")); - - model m; - m.one (s1); - m.opt (s2); - - // Detach one. - // - XSD_AUTO_PTR p (m.detach_one ()); - assert (p->_container () == 0); - assert (p->r ()[0].get () == &p->o ()[1]); - assert (m.opt ()->r ()[1].get () == 0); - - m.one (XSD_MOVE (p)); - assert (m.opt ()->r ()[1].get () == &m.one ().o ()[0]); - p = m.detach_one (); - - model m1; - m1.one (XSD_MOVE (p)); - m1.opt (s2); - assert (m1.opt ()->r ()[1].get () == &m1.one ().o ()[0]); - - p = m1.detach_one (); - m.seq ().push_back (XSD_MOVE (p)); - - // Detach opt. - // - p = m.opt ().detach (); - assert (!m.opt ()); - assert (p->_container () == 0); - assert (p->r ()[0].get () == &p->o ()[1]); - assert (m.seq ()[0].r ()[1].get () == 0); - - m.seq ().push_back (XSD_MOVE (p)); - - // Detach seq. - // - p = m.seq ().detach_back (); - assert (p->_container () == 0); - assert (p->r ()[0].get () == &p->o ()[1]); - assert (m.seq ()[0].r ()[1].get () == 0); - - m.seq ().push_back (XSD_MOVE (p)); - assert (m.seq ()[0].r ()[1].get () == &m.seq ()[1].o ()[0]); - - m.seq ().detach (m.seq ().begin (), p); - assert (p->_container () == 0); - assert (p->r ()[0].get () == &p->o ()[1]); - assert (m.seq ()[0].r ()[1].get () == 0); -} diff --git a/tests/cxx/tree/detach/makefile b/tests/cxx/tree/detach/makefile deleted file mode 100644 index 56c59fa..0000000 --- a/tests/cxx/tree/detach/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/detach/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-detach --generate-default-ctor -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/detach/test.xsd b/tests/cxx/tree/detach/test.xsd deleted file mode 100644 index b9f5166..0000000 --- a/tests/cxx/tree/detach/test.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/dom-association/dom-parse.cxx b/tests/cxx/tree/dom-association/dom-parse.cxx deleted file mode 100644 index 0d26d02..0000000 --- a/tests/cxx/tree/dom-association/dom-parse.cxx +++ /dev/null @@ -1,95 +0,0 @@ -// file : tests/cxx/tree/dom-association/dom-parse.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#include "dom-parse.hxx" - -#include - -#include -#include // chLatin_* -#include - -#include -#include - -#include -#include - -using namespace xercesc; -namespace xml = xsd::cxx::xml; -namespace tree = xsd::cxx::tree; - -XSD_DOM_AUTO_PTR -parse (std::istream& is, - const std::string& id, - bool validate) -{ - const XMLCh ls_id [] = {chLatin_L, chLatin_S, chNull}; - - // Get an implementation of the Load-Store (LS) interface. - // - DOMImplementation* impl ( - DOMImplementationRegistry::getDOMImplementation (ls_id)); - - XSD_DOM_AUTO_PTR parser ( - impl->createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0)); - - DOMConfiguration* conf (parser->getDomConfig ()); - - // Discard comment nodes in the document. - // - conf->setParameter (XMLUni::fgDOMComments, false); - - // Enable datatype normalization. - // - conf->setParameter (XMLUni::fgDOMDatatypeNormalization, true); - - // Do not create EntityReference nodes in the DOM tree. No - // EntityReference nodes will be created, only the nodes - // corresponding to their fully expanded substitution text - // will be created. - // - conf->setParameter (XMLUni::fgDOMEntities, false); - - // Perform namespace processing. - // - conf->setParameter (XMLUni::fgDOMNamespaces, true); - - // Do not include ignorable whitespace in the DOM tree. - // - conf->setParameter (XMLUni::fgDOMElementContentWhitespace, false); - - // Enable/Disable validation. - // - conf->setParameter (XMLUni::fgDOMValidate, validate); - conf->setParameter (XMLUni::fgXercesSchema, validate); - conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); - - // Xerces-C++ 3.1.0 is the first version with working multi import - // support. - // -#if _XERCES_VERSION >= 30100 - conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); -#endif - - // We will release the DOM document ourselves. - // - conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true); - - // Set error handler. - // - tree::error_handler eh; - xml::dom::bits::error_handler_proxy ehp (eh); - conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp); - - // Prepare input stream. - // - xml::sax::std_input_source isrc (is, id); - Wrapper4InputSource wrap (&isrc, false); - - XSD_DOM_AUTO_PTR doc (parser->parse (&wrap)); - - eh.throw_if_failed > (); - - return doc; -} diff --git a/tests/cxx/tree/dom-association/dom-parse.hxx b/tests/cxx/tree/dom-association/dom-parse.hxx deleted file mode 100644 index c1c9326..0000000 --- a/tests/cxx/tree/dom-association/dom-parse.hxx +++ /dev/null @@ -1,23 +0,0 @@ -// file : tests/cxx/tree/dom-association/dom-parse.hxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#ifndef DOM_PARSE -#define DOM_PARSE - -#include -#include - -#include - -#include - -// Parse an XML document from the standard input stream with an -// optional resource id. Resource id is used in diagnostics as -// well as to locate schemas referenced from inside the document. -// -XSD_DOM_AUTO_PTR -parse (std::istream& is, - const std::string& id, - bool validate); - -#endif // DOM_PARSE diff --git a/tests/cxx/tree/dom-association/driver.cxx b/tests/cxx/tree/dom-association/driver.cxx deleted file mode 100644 index 44343a3..0000000 --- a/tests/cxx/tree/dom-association/driver.cxx +++ /dev/null @@ -1,71 +0,0 @@ -// file : tests/cxx/tree/dom-association/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test DOM association/ownership. -// - -#include // std::auto_ptr/unique_ptr -#include -#include - -#include - -#include "dom-parse.hxx" -#include "test.hxx" - -using namespace std; -using namespace test; -using namespace xercesc; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - int r (0); - - XMLPlatformUtils::Initialize (); - - try - { - ifstream ifs; - ifs.exceptions (ifstream::badbit | ifstream::failbit); - ifs.open (argv[1]); - - DOMDocument* ptr; - -#ifdef XSD_CXX11 - xml_schema::dom::unique_ptr doc (parse (ifs, argv[1], true)); - ptr = doc.get (); - unique_ptr r ( - root (std::move (doc), - xml_schema::flags::keep_dom | xml_schema::flags::own_dom)); -#else - xml_schema::dom::auto_ptr doc (parse (ifs, argv[1], true)); - ptr = doc.get (); - auto_ptr r ( - root (doc, - xml_schema::flags::keep_dom | xml_schema::flags::own_dom)); -#endif - - assert (doc.get () == 0); - assert (r->_node ()->getOwnerDocument () == ptr); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - r = 1; - } - catch (const std::ios_base::failure&) - { - cerr << argv[1] << ": unable to open or read failure" << endl; - r = 1; - } - - XMLPlatformUtils::Terminate (); - return r; -} diff --git a/tests/cxx/tree/dom-association/makefile b/tests/cxx/tree/dom-association/makefile deleted file mode 100644 index 6c1f44c..0000000 --- a/tests/cxx/tree/dom-association/makefile +++ /dev/null @@ -1,91 +0,0 @@ -# file : tests/cxx/tree/dom-association/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx dom-parse.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -# Define XSD_CXX11 since we include libxsd headers directly. -# -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifeq ($(cxx_standard),c++11) -$(obj) $(dep): cpp_options += -DXSD_CXX11 -endif - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/dom-association/output b/tests/cxx/tree/dom-association/output deleted file mode 100644 index e69de29..0000000 diff --git a/tests/cxx/tree/dom-association/test.xml b/tests/cxx/tree/dom-association/test.xml deleted file mode 100644 index 624a80c..0000000 --- a/tests/cxx/tree/dom-association/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a - - diff --git a/tests/cxx/tree/dom-association/test.xsd b/tests/cxx/tree/dom-association/test.xsd deleted file mode 100644 index 07bebc7..0000000 --- a/tests/cxx/tree/dom-association/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx deleted file mode 100644 index 2840e0a..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx +++ /dev/null @@ -1,74 +0,0 @@ -// file : tests/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/tests/cxx/tree/encoding/char/iso-8859-1/makefile b/tests/cxx/tree/encoding/char/iso-8859-1/makefile deleted file mode 100644 index 8b28e4e..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/encoding/char/iso-8859-1/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --char-encoding iso8859-1 --generate-serialization \ ---generate-doxygen -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.std b/tests/cxx/tree/encoding/char/iso-8859-1/test.std deleted file mode 100644 index cb73faa..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.std +++ /dev/null @@ -1,10 +0,0 @@ - - - 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 deleted file mode 100644 index cc05f8d..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - abc - æ - ¢£¤¥ - Āꪪ - - abc - aâc - âòbc - - diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd b/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd deleted file mode 100644 index 31b8901..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - aâc - òbc - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/char/lcp/driver.cxx b/tests/cxx/tree/encoding/char/lcp/driver.cxx deleted file mode 100644 index 4e2933d..0000000 --- a/tests/cxx/tree/encoding/char/lcp/driver.cxx +++ /dev/null @@ -1,40 +0,0 @@ -// file : tests/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/tests/cxx/tree/encoding/char/lcp/makefile b/tests/cxx/tree/encoding/char/lcp/makefile deleted file mode 100644 index bb99e33..0000000 --- a/tests/cxx/tree/encoding/char/lcp/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/encoding/char/lcp/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --char-encoding lcp -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/encoding/char/lcp/test.std b/tests/cxx/tree/encoding/char/lcp/test.std deleted file mode 100644 index 368826d..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.std +++ /dev/null @@ -1,4 +0,0 @@ - - - abcd - diff --git a/tests/cxx/tree/encoding/char/lcp/test.xml b/tests/cxx/tree/encoding/char/lcp/test.xml deleted file mode 100644 index 772512e..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - abcd - - diff --git a/tests/cxx/tree/encoding/char/lcp/test.xsd b/tests/cxx/tree/encoding/char/lcp/test.xsd deleted file mode 100644 index 1e264e3..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/char/makefile b/tests/cxx/tree/encoding/char/makefile deleted file mode 100644 index cd7a325..0000000 --- a/tests/cxx/tree/encoding/char/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/encoding/char/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -tests := lcp utf-8 iso-8859-1 - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/encoding/char/utf-8/driver.cxx b/tests/cxx/tree/encoding/char/utf-8/driver.cxx deleted file mode 100644 index 38fae4d..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/driver.cxx +++ /dev/null @@ -1,63 +0,0 @@ -// file : tests/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/tests/cxx/tree/encoding/char/utf-8/makefile b/tests/cxx/tree/encoding/char/utf-8/makefile deleted file mode 100644 index fd465f3..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/encoding/char/utf-8/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --generate-doxygen -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/encoding/char/utf-8/test.std b/tests/cxx/tree/encoding/char/utf-8/test.std deleted file mode 100644 index fdfef4c..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.std +++ /dev/null @@ -1,9 +0,0 @@ - - - abc - Օ - ꪪ - abc - aՕc - ꪪbc - diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xml b/tests/cxx/tree/encoding/char/utf-8/test.xml deleted file mode 100644 index 0d3e27a..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - abc - Օ - ꪪ - - abc - aՕc - ꪪbc - - diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xsd b/tests/cxx/tree/encoding/char/utf-8/test.xsd deleted file mode 100644 index d5ee868..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - aՕc - ꪪbc - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/makefile b/tests/cxx/tree/encoding/makefile deleted file mode 100644 index b6f2ea6..0000000 --- a/tests/cxx/tree/encoding/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/encoding/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := char wchar - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/encoding/wchar/driver.cxx b/tests/cxx/tree/encoding/wchar/driver.cxx deleted file mode 100644 index 0756d4e..0000000 --- a/tests/cxx/tree/encoding/wchar/driver.cxx +++ /dev/null @@ -1,55 +0,0 @@ -// file : tests/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/tests/cxx/tree/encoding/wchar/makefile b/tests/cxx/tree/encoding/wchar/makefile deleted file mode 100644 index 1e351fa..0000000 --- a/tests/cxx/tree/encoding/wchar/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/encoding/wchar/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --generate-doxygen \ ---char-type wchar_t -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/encoding/wchar/test.std b/tests/cxx/tree/encoding/wchar/test.std deleted file mode 100644 index e0eaef0..0000000 --- a/tests/cxx/tree/encoding/wchar/test.std +++ /dev/null @@ -1,10 +0,0 @@ - - - abc - ῿퟿ - ကჿ - abc - a῿퟿c - ကჿbc - abကჿ - diff --git a/tests/cxx/tree/encoding/wchar/test.xml b/tests/cxx/tree/encoding/wchar/test.xml deleted file mode 100644 index 9abb1b6..0000000 --- a/tests/cxx/tree/encoding/wchar/test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - abc - ῿퟿ - ကჿ - - abc - a῿퟿c - ကჿbc - abကჿ - - diff --git a/tests/cxx/tree/encoding/wchar/test.xsd b/tests/cxx/tree/encoding/wchar/test.xsd deleted file mode 100644 index 0151d2f..0000000 --- a/tests/cxx/tree/encoding/wchar/test.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - a῿퟿c - ကჿbc - abကჿ - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/enumeration/ctor/driver.cxx b/tests/cxx/tree/enumeration/ctor/driver.cxx deleted file mode 100644 index beda424..0000000 --- a/tests/cxx/tree/enumeration/ctor/driver.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// file : tests/cxx/tree/enumeration/ctor/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test enumeration constructors. -// -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - // Test ctor(const char*). - // - { - string_enum se ("a"); - type t ("a", 1); - } - - // Test ctor(const std::string&) - // - { - string const s ("c"); - string_enum se (s); - type t (s, 3); - } -} diff --git a/tests/cxx/tree/enumeration/ctor/makefile b/tests/cxx/tree/enumeration/ctor/makefile deleted file mode 100644 index 463997b..0000000 --- a/tests/cxx/tree/enumeration/ctor/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/enumeration/ctor/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-default-ctor --generate-from-base-ctor \ ---generate-doxygen -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/enumeration/ctor/test.xsd b/tests/cxx/tree/enumeration/ctor/test.xsd deleted file mode 100644 index c5d625a..0000000 --- a/tests/cxx/tree/enumeration/ctor/test.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/enumeration/inheritance/driver.cxx b/tests/cxx/tree/enumeration/inheritance/driver.cxx deleted file mode 100644 index 4592099..0000000 --- a/tests/cxx/tree/enumeration/inheritance/driver.cxx +++ /dev/null @@ -1,53 +0,0 @@ -// file : tests/cxx/tree/enumeration/inheritance/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Insert test description here. -// - -#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])); - - switch (*r) - { - case top_bottom::top: - { - cout << "top" << endl; - break; - } - case top_bottom::bottom: - { - cout << "bottom" << endl; - break; - } - default: // Suppress warning. - { - assert (false); - break; - } - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/enumeration/inheritance/makefile b/tests/cxx/tree/enumeration/inheritance/makefile deleted file mode 100644 index 716df9b..0000000 --- a/tests/cxx/tree/enumeration/inheritance/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/enumeration/inheritance/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/enumeration/inheritance/output b/tests/cxx/tree/enumeration/inheritance/output deleted file mode 100644 index fef12e2..0000000 --- a/tests/cxx/tree/enumeration/inheritance/output +++ /dev/null @@ -1 +0,0 @@ -bottom diff --git a/tests/cxx/tree/enumeration/inheritance/test.xml b/tests/cxx/tree/enumeration/inheritance/test.xml deleted file mode 100644 index 1de9043..0000000 --- a/tests/cxx/tree/enumeration/inheritance/test.xml +++ /dev/null @@ -1,3 +0,0 @@ -bottom diff --git a/tests/cxx/tree/enumeration/inheritance/test.xsd b/tests/cxx/tree/enumeration/inheritance/test.xsd deleted file mode 100644 index cf2eeb1..0000000 --- a/tests/cxx/tree/enumeration/inheritance/test.xsd +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/enumeration/makefile b/tests/cxx/tree/enumeration/makefile deleted file mode 100644 index 03f31f4..0000000 --- a/tests/cxx/tree/enumeration/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/enumeration/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := ctor inheritance - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/float/driver.cxx b/tests/cxx/tree/float/driver.cxx deleted file mode 100644 index fbbad95..0000000 --- a/tests/cxx/tree/float/driver.cxx +++ /dev/null @@ -1,53 +0,0 @@ -// file : tests/cxx/tree/float/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test floating point (xsd:{float, double, decimal}) type parsing -// and serialization. -// - -#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])); - - r->simple ().push_back (12.129456); - r->simple ().push_back (123.129456); - r->simple ().push_back (1234.129456); - - r->s (12.129456); - - r->complex ().push_back (12.129456); - r->complex ().push_back (123.129456); - r->complex ().push_back (1234.129456); - r->complex ().push_back (-12.12); - r->complex ().push_back (-123.12); - - r->s (12.129456); - - xml_schema::namespace_infomap map; - - map["t"].name = "test"; - root (cout, *r, map); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/float/makefile b/tests/cxx/tree/float/makefile deleted file mode 100644 index 1bd8069..0000000 --- a/tests/cxx/tree/float/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/float/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --root-element-all -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/float/test.std b/tests/cxx/tree/float/test.std deleted file mode 100644 index 399e28c..0000000 --- a/tests/cxx/tree/float/test.std +++ /dev/null @@ -1,35 +0,0 @@ - - - 0 - 1 - 1e+06 - 1e-07 - 0 1 1e+06 1e-07 - 0 - 1 - 100000000000000 - 1e-15 - 0 1 100000000000000 1e-15 - 0 - 1 - 10000 - 100000000000000 - 0.000000000000001 - 0 1 100000000000000 0.000000000000001 - 0 - 1 - 12.34 - 0.12 - 12.13 - 123.1 - 1234 - 0 - 1 - 12.34 - 0.12 - 12.13 - 123.1 - 1234 - -12.12 - -123.1 - diff --git a/tests/cxx/tree/float/test.xml b/tests/cxx/tree/float/test.xml deleted file mode 100644 index e5124a4..0000000 --- a/tests/cxx/tree/float/test.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 0.0 - 1.0 - 1000000.0 - 0.0000001 - 0.0 1.0 1000000.0 0.0000001 - - 0.0 - 1.0 - 100000000000000.0 - 0.000000000000001 - 0.0 1.0 100000000000000.0 0.000000000000001 - - 0.0 - 1.0 - 10000 - 100000000000000.0 - 0.000000000000001 - 0.0 1.0 100000000000000.0 0.000000000000001 - - 0.0 - 1.0 - 12.34 - 0.12 - - 0.0 - 1.0 - 12.34 - 0.12 - - diff --git a/tests/cxx/tree/float/test.xsd b/tests/cxx/tree/float/test.xsd deleted file mode 100644 index c02678d..0000000 --- a/tests/cxx/tree/float/test.xsd +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/list/ctor/driver.cxx b/tests/cxx/tree/list/ctor/driver.cxx deleted file mode 100644 index 7dfe301..0000000 --- a/tests/cxx/tree/list/ctor/driver.cxx +++ /dev/null @@ -1,50 +0,0 @@ -// file : tests/cxx/tree/list/ctor/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test list constructors. -// -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - // Test ctor() - // - { - string_list sl; - - xml_schema::nmtokens nt; - xml_schema::idrefs id; - } - - // Test ctor(size_type, const X&) - // - { - string_list sl (10, "abc"); - size_type st (10, 123); - - xml_schema::nmtokens nt (10, "abc"); - xml_schema::idrefs id (10, "abc"); - } - - // Test ctor(const I& begin, const I& end) - // - { - string_list sl1 (10, "abc"); - string_list sl2 (sl1.begin (), sl1.end ()); - - I i1 (10, 123); - I i2 (i1.begin (), i1.end ()); - - xml_schema::nmtokens nt1 (10, "abc"); - xml_schema::nmtokens nt2 (nt1.begin (), nt1.end ()); - - xml_schema::idrefs id1 (10, "abc"); - xml_schema::idrefs id2 (id1.begin (), id1.end ()); - } -} diff --git a/tests/cxx/tree/list/ctor/makefile b/tests/cxx/tree/list/ctor/makefile deleted file mode 100644 index c379934..0000000 --- a/tests/cxx/tree/list/ctor/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/list/ctor/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-default-ctor --generate-from-base-ctor \ ---generate-doxygen -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/list/ctor/test.xsd b/tests/cxx/tree/list/ctor/test.xsd deleted file mode 100644 index f090bb8..0000000 --- a/tests/cxx/tree/list/ctor/test.xsd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/list/makefile b/tests/cxx/tree/list/makefile deleted file mode 100644 index 55bc85a..0000000 --- a/tests/cxx/tree/list/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/list/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := ctor - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/makefile b/tests/cxx/tree/makefile deleted file mode 100644 index 21c79f3..0000000 --- a/tests/cxx/tree/makefile +++ /dev/null @@ -1,43 +0,0 @@ -# file : tests/cxx/tree/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -tests := \ -any-type \ -built-in \ -chameleon \ -comparison \ -compilation \ -complex \ -containment \ -default \ -detach \ -dom-association \ -encoding \ -enumeration \ -float \ -list \ -name-clash \ -naming \ -order \ -polymorphism \ -prefix \ -test-template \ -types-only \ -union \ -wildcard - -ifeq ($(xsd_with_ace),y) -tests += binary -endif - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/name-clash/inheritance/driver.cxx b/tests/cxx/tree/name-clash/inheritance/driver.cxx deleted file mode 100644 index b27d18c..0000000 --- a/tests/cxx/tree/name-clash/inheritance/driver.cxx +++ /dev/null @@ -1,35 +0,0 @@ -// file : tests/cxx/tree/name-clash/inheritance/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test for name clashes across inheritance hierarchy. -// - -#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/tests/cxx/tree/name-clash/inheritance/makefile b/tests/cxx/tree/name-clash/inheritance/makefile deleted file mode 100644 index 23e3cf7..0000000 --- a/tests/cxx/tree/name-clash/inheritance/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/name-clash/inheritance/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/name-clash/inheritance/output b/tests/cxx/tree/name-clash/inheritance/output deleted file mode 100644 index 54565bb..0000000 --- a/tests/cxx/tree/name-clash/inheritance/output +++ /dev/null @@ -1,3 +0,0 @@ - -e: e -e: e1 diff --git a/tests/cxx/tree/name-clash/inheritance/test.xml b/tests/cxx/tree/name-clash/inheritance/test.xml deleted file mode 100644 index 8c17101..0000000 --- a/tests/cxx/tree/name-clash/inheritance/test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - e - e1 - - diff --git a/tests/cxx/tree/name-clash/inheritance/test.xsd b/tests/cxx/tree/name-clash/inheritance/test.xsd deleted file mode 100644 index b83d7df..0000000 --- a/tests/cxx/tree/name-clash/inheritance/test.xsd +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/name-clash/makefile b/tests/cxx/tree/name-clash/makefile deleted file mode 100644 index 5d2b24c..0000000 --- a/tests/cxx/tree/name-clash/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/name-clash/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := inheritance - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/naming/camel/driver.cxx b/tests/cxx/tree/naming/camel/driver.cxx deleted file mode 100644 index e9d7180..0000000 --- a/tests/cxx/tree/naming/camel/driver.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// file : tests/cxx/tree/naming/camel/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test camel case (upper for types, lower for functions) naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - Gender::Value v; - v = Gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - Foo f ("a", "b"); - - if (f.a () != "a" || f.b () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - Type t ("bar"); - - // foo - // - { - Type::FooType* p = 0; - XSD_UNUSED (p); - - Type::FooOptional o; - - if (t.foo ().present ()) - return 1; - - t.foo (o); - } - - // bar - // - { - Type::BarType* p = 0; - XSD_UNUSED (p); - - if (t.bar () != "bar") - return 1; - - t.bar ("barbar"); - } - - // baz - // - { - Type::BazType* p = 0; - XSD_UNUSED (p); - - Type::BazSequence s; - Type::BazIterator i (s.begin ()); - Type::BazConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.baz () != s) - return 1; - - t.baz (s); - } - - // any - // - { - Type::AnySequence s (t.domDocument ()); - Type::AnyIterator i (s.begin ()); - Type::AnyConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any () != s) - return 1; - - t.any (s); - } - - // foo - // - { - Type::FoxType x = Type::foxDefaultValue (); - - if (t.fox () != x) - return 1; - - t.fox ("fox"); - } - - // any_attribute - // - { - Type::AnyAttributeSet s (t.domDocument ()); - Type::AnyAttributeIterator i (s.begin ()); - Type::AnyAttributeConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.anyAttribute () != s) - return 1; - - t.anyAttribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - root (is, xml_schema::Flags::dont_validate); - } - - { - ostringstream os; - xml_schema::NamespaceInfomap m; - m["t"].name = "test"; - - root (os, "foo", m); - } - } - catch (xml_schema::Exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/camel/makefile b/tests/cxx/tree/naming/camel/makefile deleted file mode 100644 index 3fc0dcc..0000000 --- a/tests/cxx/tree/naming/camel/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/camel/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options += \ ---type-naming ucc \ ---function-naming lcc \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/naming/camel/test.xsd b/tests/cxx/tree/naming/camel/test.xsd deleted file mode 100644 index 7d0a745..0000000 --- a/tests/cxx/tree/naming/camel/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/java/driver.cxx b/tests/cxx/tree/naming/java/driver.cxx deleted file mode 100644 index b96917b..0000000 --- a/tests/cxx/tree/naming/java/driver.cxx +++ /dev/null @@ -1,153 +0,0 @@ -// file : tests/cxx/tree/naming/java/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test Java naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - Gender::Value v; - v = Gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - Foo f ("a", "b"); - - if (f.getA () != "a" || f.getB () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - Type t ("bar"); - - // foo - // - { - Type::FooType* p = 0; - XSD_UNUSED (p); - Type::FooOptional o; - - if (t.getFoo ().present ()) - return 1; - - t.setFoo (o); - } - - // bar - // - { - Type::BarType* p = 0; - XSD_UNUSED (p); - - if (t.getBar () != "bar") - return 1; - - t.setBar ("barbar"); - } - - // baz - // - { - Type::BazType* p = 0; - XSD_UNUSED (p); - - Type::BazSequence s; - Type::BazIterator i (s.begin ()); - Type::BazConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getBaz () != s) - return 1; - - t.setBaz (s); - } - - // any - // - { - Type::AnySequence s (t.getDomDocument ()); - Type::AnyIterator i (s.begin ()); - Type::AnyConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getAny () != s) - return 1; - - t.setAny (s); - } - - // foo - // - { - Type::FoxType x = Type::getFoxDefaultValue (); - - if (t.getFox () != x) - return 1; - - t.setFox ("fox"); - } - - // any_attribute - // - { - Type::AnyAttributeSet s (t.getDomDocument ()); - Type::AnyAttributeIterator i (s.begin ()); - Type::AnyAttributeConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getAnyAttribute () != s) - return 1; - - t.setAnyAttribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - parseRoot (is, xml_schema::Flags::dont_validate); - } - - { - ostringstream os; - xml_schema::NamespaceInfomap m; - m["t"].name = "test"; - - serializeRoot (os, "foo", m); - } - } - catch (xml_schema::Exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/java/makefile b/tests/cxx/tree/naming/java/makefile deleted file mode 100644 index 713126d..0000000 --- a/tests/cxx/tree/naming/java/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/java/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options += \ ---type-naming java \ ---function-naming java \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/naming/java/test.xsd b/tests/cxx/tree/naming/java/test.xsd deleted file mode 100644 index f525534..0000000 --- a/tests/cxx/tree/naming/java/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/knr/driver.cxx b/tests/cxx/tree/naming/knr/driver.cxx deleted file mode 100644 index 28e6562..0000000 --- a/tests/cxx/tree/naming/knr/driver.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// file : tests/cxx/tree/naming/knr/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test K&R naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - gender::value v; - v = gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - foo f ("a", "b"); - - if (f.a () != "a" || f.b () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - type t ("bar"); - - // foo - // - { - type::foo_type* p = 0; - XSD_UNUSED (p); - - type::foo_optional o; - - if (t.foo ().present ()) - return 1; - - t.foo (o); - } - - // bar - // - { - type::bar_type* p = 0; - XSD_UNUSED (p); - - if (t.bar () != "bar") - return 1; - - t.bar ("barbar"); - } - - // baz - // - { - type::baz_type* p = 0; - XSD_UNUSED (p); - - type::baz_sequence s; - type::baz_iterator i (s.begin ()); - type::baz_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.baz () != s) - return 1; - - t.baz (s); - } - - // any - // - { - type::any_sequence s (t.dom_document ()); - type::any_iterator i (s.begin ()); - type::any_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any () != s) - return 1; - - t.any (s); - } - - // foo - // - { - type::fox_type x = type::fox_default_value (); - - if (t.fox () != x) - return 1; - - t.fox ("fox"); - } - - // any_attribute - // - { - type::any_attribute_set s (t.dom_document ()); - type::any_attribute_iterator i (s.begin ()); - type::any_attribute_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any_attribute () != s) - return 1; - - t.any_attribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - root (is, xml_schema::flags::dont_validate); - } - - { - ostringstream os; - xml_schema::namespace_infomap m; - m["t"].name = "test"; - - root (os, "foo", m); - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/knr/makefile b/tests/cxx/tree/naming/knr/makefile deleted file mode 100644 index 364a491..0000000 --- a/tests/cxx/tree/naming/knr/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/knr/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options += \ ---type-naming knr \ ---function-naming knr \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/naming/knr/test.xsd b/tests/cxx/tree/naming/knr/test.xsd deleted file mode 100644 index 4361544..0000000 --- a/tests/cxx/tree/naming/knr/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/makefile b/tests/cxx/tree/naming/makefile deleted file mode 100644 index 3c974ef..0000000 --- a/tests/cxx/tree/naming/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/naming/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := camel java knr - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/order/driver.cxx b/tests/cxx/tree/order/driver.cxx deleted file mode 100644 index 839191a..0000000 --- a/tests/cxx/tree/order/driver.cxx +++ /dev/null @@ -1,64 +0,0 @@ -// file : tests/cxx/tree/order/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test ordered type support. -// - -#include // std::auto_ptr/unique_ptr -#include -#include - -#include -#include - -#include "test.hxx" - -using namespace std; -using namespace test; -using namespace xercesc; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - XMLPlatformUtils::Initialize (); - - try - { - XSD_AUTO_PTR r (root_ (argv[1], xml_schema::flags::dont_initialize)); - - root c (*r); - assert (c == *r); - - for (root::t1_const_iterator j (r->t1 ().begin ()); - j != r->t1 ().end (); ++j) - { - const t1_derived& d (*j); - - for (t1_derived::content_order_const_iterator i ( - d.content_order ().begin ()); i != d.content_order ().end (); ++i) - { - cout << i->id << ' ' << i->index << endl; - } - } - - xml_schema::namespace_infomap map; - - map["t"].name = "test"; - map["t1"].name = "test1"; - - root_ (cout, *r, map, "UTF-8", xml_schema::flags::dont_initialize); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - - XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/order/makefile b/tests/cxx/tree/order/makefile deleted file mode 100644 index 251b1f3..0000000 --- a/tests/cxx/tree/order/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/order/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --generate-wildcard \ ---generate-comparison \ ---ordered-type t1_base --ordered-type t1_derived \ ---ordered-type t2_base --ordered-type t2_derived \ ---ordered-type t3_type \ ---ordered-type t4_base --ordered-type t4_derived \ ---ordered-type t5_base --ordered-type t5_derived \ ---ordered-type t6_base --ordered-type t6_derived \ ---ordered-type t7_type -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/order/output b/tests/cxx/tree/order/output deleted file mode 100644 index 73442fe..0000000 --- a/tests/cxx/tree/order/output +++ /dev/null @@ -1,92 +0,0 @@ -2 0 -1 0 -1 1 -2 1 -3 0 -4 0 -3 1 -4 1 - - - - b1 - a1 - a2 - b2 - c1 - d1 - e1 - d2 - f1 - - - b1 - a1 - b2 - a2 - - - a1 - b1 - c1 - c2 - - - a1 - c1 - - - t1 - - b1 - t2 - - a1 - t3 - - b2 - t4 - - a2 - t5 - - d1 - t6 - - c1 - t7 - - - - t5a - - - t1 - - b1 - t2 - - a1 - t3 - - a2 - t4 - - b2 - t5 - - - - t6 - - - t1 - - a1 - t2 - - b1 - t3 - - - diff --git a/tests/cxx/tree/order/test.xml b/tests/cxx/tree/order/test.xml deleted file mode 100644 index cd82936..0000000 --- a/tests/cxx/tree/order/test.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - b1 - a1 - a2 - b2 - c1 - d1 - e1 - d2 - f1 - - - b1 - a1 - b2 - a2 - - - a1 - b1 - c1 - c2 - - - a1 - c1 - - - t1 - b1 - t2 - a1 - t3 - b2 - t4 - a2 - t5 - d1 - t6 - c1 - t7 - - - t5a - - - t1 - b1 - t2 - a1 - t3 - a2 - t4 - b2 - t5 - - - t6 - - - t1 - a1 - t2 - b1 - t3 - - diff --git a/tests/cxx/tree/order/test.xsd b/tests/cxx/tree/order/test.xsd deleted file mode 100644 index c30c027..0000000 --- a/tests/cxx/tree/order/test.xsd +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/polymorphism/comparison/driver.cxx b/tests/cxx/tree/polymorphism/comparison/driver.cxx deleted file mode 100644 index 8685a2e..0000000 --- a/tests/cxx/tree/polymorphism/comparison/driver.cxx +++ /dev/null @@ -1,85 +0,0 @@ -// file : tests/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/tests/cxx/tree/polymorphism/comparison/makefile b/tests/cxx/tree/polymorphism/comparison/makefile deleted file mode 100644 index 15e6d02..0000000 --- a/tests/cxx/tree/polymorphism/comparison/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/polymorphism/comparison/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-polymorphic --polymorphic-type base \ ---generate-comparison --generate-serialization -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml - $(call message,test $$1,$$1 $(src_base)/test.xml,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/polymorphism/comparison/test.xml b/tests/cxx/tree/polymorphism/comparison/test.xml deleted file mode 100644 index 0b8c125..0000000 --- a/tests/cxx/tree/polymorphism/comparison/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a1b - - diff --git a/tests/cxx/tree/polymorphism/comparison/test.xsd b/tests/cxx/tree/polymorphism/comparison/test.xsd deleted file mode 100644 index 364d1b3..0000000 --- a/tests/cxx/tree/polymorphism/comparison/test.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/polymorphism/makefile b/tests/cxx/tree/polymorphism/makefile deleted file mode 100644 index 93a3ad2..0000000 --- a/tests/cxx/tree/polymorphism/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/polymorphism/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := comparison ostream same-type - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/polymorphism/ostream/driver.cxx b/tests/cxx/tree/polymorphism/ostream/driver.cxx deleted file mode 100644 index 7da2030..0000000 --- a/tests/cxx/tree/polymorphism/ostream/driver.cxx +++ /dev/null @@ -1,34 +0,0 @@ -// file : tests/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/tests/cxx/tree/polymorphism/ostream/makefile b/tests/cxx/tree/polymorphism/ostream/makefile deleted file mode 100644 index 65c37b1..0000000 --- a/tests/cxx/tree/polymorphism/ostream/makefile +++ /dev/null @@ -1,87 +0,0 @@ -# file : tests/cxx/tree/polymorphism/ostream/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-polymorphic --polymorphic-type-all \ ---root-element root --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/polymorphism/ostream/output b/tests/cxx/tree/polymorphism/ostream/output deleted file mode 100644 index e7fbd68..0000000 --- a/tests/cxx/tree/polymorphism/ostream/output +++ /dev/null @@ -1,18 +0,0 @@ - -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/tests/cxx/tree/polymorphism/ostream/test.xml b/tests/cxx/tree/polymorphism/ostream/test.xml deleted file mode 100644 index 5409d2a..0000000 --- a/tests/cxx/tree/polymorphism/ostream/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - a1 - a1b - a1c1c2 - a1d1d2 - - diff --git a/tests/cxx/tree/polymorphism/ostream/test.xsd b/tests/cxx/tree/polymorphism/ostream/test.xsd deleted file mode 100644 index 688cd5a..0000000 --- a/tests/cxx/tree/polymorphism/ostream/test.xsd +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/polymorphism/same-type/driver.cxx b/tests/cxx/tree/polymorphism/same-type/driver.cxx deleted file mode 100644 index 883ba64..0000000 --- a/tests/cxx/tree/polymorphism/same-type/driver.cxx +++ /dev/null @@ -1,35 +0,0 @@ -// file : tests/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/tests/cxx/tree/polymorphism/same-type/makefile b/tests/cxx/tree/polymorphism/same-type/makefile deleted file mode 100644 index 3185804..0000000 --- a/tests/cxx/tree/polymorphism/same-type/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/polymorphism/same-type/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream --generate-polymorphic \ ---root-element root -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/polymorphism/same-type/output b/tests/cxx/tree/polymorphism/same-type/output deleted file mode 100644 index 04b5cbf..0000000 --- a/tests/cxx/tree/polymorphism/same-type/output +++ /dev/null @@ -1,9 +0,0 @@ - -base: -a: a1 -base: -a: a2 -base: -a: a3 -base: -a: a4 diff --git a/tests/cxx/tree/polymorphism/same-type/test.xml b/tests/cxx/tree/polymorphism/same-type/test.xml deleted file mode 100644 index f8b6d1e..0000000 --- a/tests/cxx/tree/polymorphism/same-type/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - a1 - a2 - a3 - a4 - - diff --git a/tests/cxx/tree/polymorphism/same-type/test.xsd b/tests/cxx/tree/polymorphism/same-type/test.xsd deleted file mode 100644 index a4157d3..0000000 --- a/tests/cxx/tree/polymorphism/same-type/test.xsd +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/prefix/bar.xsd b/tests/cxx/tree/prefix/bar.xsd deleted file mode 100644 index 4e20902..0000000 --- a/tests/cxx/tree/prefix/bar.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/prefix/driver.cxx b/tests/cxx/tree/prefix/driver.cxx deleted file mode 100644 index 4c99fd9..0000000 --- a/tests/cxx/tree/prefix/driver.cxx +++ /dev/null @@ -1,34 +0,0 @@ -// file : tests/cxx/tree/prefix/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test automatic prefix assignment. -// - -#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])); - root (std::cout, *r); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/prefix/foo.xsd b/tests/cxx/tree/prefix/foo.xsd deleted file mode 100644 index 97a35cf..0000000 --- a/tests/cxx/tree/prefix/foo.xsd +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/prefix/makefile b/tests/cxx/tree/prefix/makefile deleted file mode 100644 index 0e5e3f3..0000000 --- a/tests/cxx/tree/prefix/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/prefix/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd foo.xsd bar.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-serialization --generate-polymorphic \ ---polymorphic-type foo\#base --root-element root -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/prefix/output b/tests/cxx/tree/prefix/output deleted file mode 100644 index 9801a23..0000000 --- a/tests/cxx/tree/prefix/output +++ /dev/null @@ -1,18 +0,0 @@ - - - - 123 - - - - 1 - 2 - - - - - 1 - 2 - - - diff --git a/tests/cxx/tree/prefix/test.xml b/tests/cxx/tree/prefix/test.xml deleted file mode 100644 index b6d0dd6..0000000 --- a/tests/cxx/tree/prefix/test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 123 - - - - 12 - - - - 12 - - - diff --git a/tests/cxx/tree/prefix/test.xsd b/tests/cxx/tree/prefix/test.xsd deleted file mode 100644 index 421fdc0..0000000 --- a/tests/cxx/tree/prefix/test.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/test-template/driver.cxx b/tests/cxx/tree/test-template/driver.cxx deleted file mode 100644 index be345f6..0000000 --- a/tests/cxx/tree/test-template/driver.cxx +++ /dev/null @@ -1,35 +0,0 @@ -// file : tests/cxx/tree/test-template/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Insert test description here. -// - -#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/tests/cxx/tree/test-template/makefile b/tests/cxx/tree/test-template/makefile deleted file mode 100644 index 1b1e531..0000000 --- a/tests/cxx/tree/test-template/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/test-template/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-ostream -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/test-template/output b/tests/cxx/tree/test-template/output deleted file mode 100644 index 2a50681..0000000 --- a/tests/cxx/tree/test-template/output +++ /dev/null @@ -1,2 +0,0 @@ - -a: a diff --git a/tests/cxx/tree/test-template/test.xml b/tests/cxx/tree/test-template/test.xml deleted file mode 100644 index 624a80c..0000000 --- a/tests/cxx/tree/test-template/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a - - diff --git a/tests/cxx/tree/test-template/test.xsd b/tests/cxx/tree/test-template/test.xsd deleted file mode 100644 index 07bebc7..0000000 --- a/tests/cxx/tree/test-template/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/tree/types-only/driver.cxx b/tests/cxx/tree/types-only/driver.cxx deleted file mode 100644 index fd1b8f6..0000000 --- a/tests/cxx/tree/types-only/driver.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// file : tests/cxx/tree/types-only/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test that code generated without parsing and serialization functions -// still compiles. -// - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - color_enum red (color_enum::red); - red_blue_enum blue (red_blue_enum::blue); - - long_string_union num ("123"); - - string_list list; - list.push_back ("Hello"); - list.push_back ("World"); - - complex_type t ("Hello, World!", "foo", color_enum::red); - - anon a ("Hello, World!"); -} diff --git a/tests/cxx/tree/types-only/makefile b/tests/cxx/tree/types-only/makefile deleted file mode 100644 index 3c156ac..0000000 --- a/tests/cxx/tree/types-only/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/types-only/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --suppress-parsing -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/types-only/test.xsd b/tests/cxx/tree/types-only/test.xsd deleted file mode 100644 index 9f02240..0000000 --- a/tests/cxx/tree/types-only/test.xsd +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/union/ctor/driver.cxx b/tests/cxx/tree/union/ctor/driver.cxx deleted file mode 100644 index df60a93..0000000 --- a/tests/cxx/tree/union/ctor/driver.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// file : tests/cxx/tree/union/ctor/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test union constructors. -// -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - // Test ctor(const std::string&) - // - { - string const s ("123"); - int_string_union u (s); - type t (s); - } - - // Test ctor(const char*). - // - { - int_string_union u ("123"); - type t ("123"); - } -} diff --git a/tests/cxx/tree/union/ctor/makefile b/tests/cxx/tree/union/ctor/makefile deleted file mode 100644 index 45dc1c5..0000000 --- a/tests/cxx/tree/union/ctor/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/union/ctor/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-default-ctor --generate-from-base-ctor \ ---generate-doxygen -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) - $(call message,test $$1,$$1,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/union/ctor/test.xsd b/tests/cxx/tree/union/ctor/test.xsd deleted file mode 100644 index 9601093..0000000 --- a/tests/cxx/tree/union/ctor/test.xsd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/union/makefile b/tests/cxx/tree/union/makefile deleted file mode 100644 index 59fa39c..0000000 --- a/tests/cxx/tree/union/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/union/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := ctor - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/cxx/tree/wildcard/driver.cxx b/tests/cxx/tree/wildcard/driver.cxx deleted file mode 100644 index 51a17a3..0000000 --- a/tests/cxx/tree/wildcard/driver.cxx +++ /dev/null @@ -1,203 +0,0 @@ -// file : tests/cxx/tree/wildcard/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test wildcard (any & anyAttribute) mapping. -// - -#include // std::auto_ptr/unique_ptr -#include -#include - -#include -#include - -#include "test.hxx" // Get XSD_CXX11 defined. - -#include - -using namespace std; -using namespace test; -using namespace xercesc; - -namespace xml = xsd::cxx::xml; - -void -print (type& t) -{ - if (t.att ()) - cout << *t.att () << endl; - - type::any_attribute_set& as (t.any_attribute ()); - - for (type::any_attribute_iterator i (as.begin ()); i != as.end (); ++i) - { - cout << xml::transcode (i->getTextContent ()) << endl; - } - - cout << xml::transcode (t.any ().getTextContent ()) << endl - << t.foo () << endl; - - if (t.any1 ()) - cout << xml::transcode (t.any1 ()->getTextContent ()) << endl; - - cout << t.bar () << endl; - - type::any2_sequence& es (t.any2 ()); - - for (type::any2_iterator i (es.begin ()); i != es.end (); ++i) - { - cout << xml::transcode (i->getTextContent ()) << endl; - } - - cout << endl; -} - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - XMLPlatformUtils::Initialize (); - - try - { - // Test accessors/modifiers for various cardinalities. - // - type t; - - DOMDocument& doc (t.dom_document ()); - - // one - // - { - DOMElement* e (doc.createElement (xml::string ("a").c_str ())); - t.any (*e); - e->release (); - assert (xml::transcode (t.any ().getTagName ()) == "a"); - - t.any (doc.createElement (xml::string ("b").c_str ())); - assert (xml::transcode (t.any ().getTagName ()) == "b"); - } - - // optional - // - { - assert (!t.any1 ().present ()); - - DOMElement* e (doc.createElement (xml::string ("a").c_str ())); - t.any1 (*e); - e->release (); - assert (t.any1 ().present ()); - assert (xml::transcode (t.any1 ().get ().getTagName ()) == "a"); - - t.any1 (doc.createElement (xml::string ("b").c_str ())); - assert (xml::transcode (t.any1 ()->getTagName ()) == "b"); - - type::any1_optional c ( - doc.createElement (xml::string ("c").c_str ()), doc); - t.any1 (c); - assert (xml::transcode (t.any1 ()->getTagName ()) == "c"); - } - - - // sequence - // - { - type::any2_sequence& s (t.any2 ()); - - DOMElement* e (doc.createElement (xml::string ("a").c_str ())); - s.push_back (*e); - e->release (); - s.push_back (doc.createElement (xml::string ("b").c_str ())); - assert (s.size () == 2); - - for (type::any2_iterator i (s.begin ()); i != s.end (); ++i) - { - if (i == s.begin ()) - assert (xml::transcode (i->getTagName ()) == "a"); - else - assert (xml::transcode ((*i).getTagName ()) == "b"); - } - - // copy c-tor - type::any2_sequence cs (s, doc); - assert (cs.size () == 2); - assert (xml::transcode (cs[0].getTagName ()) == "a"); - assert (xml::transcode (cs[1].getTagName ()) == "b"); - - // assignment - t.any2 (cs); - assert (s.size () == 2); - assert (xml::transcode (s[0].getTagName ()) == "a"); - assert (xml::transcode (s[1].getTagName ()) == "b"); - } - - // anyAttribute - // - { - type::any_attribute_set& s (t.any_attribute ()); - - DOMAttr* a (doc.createAttribute (xml::string ("a").c_str ())); - s.insert (*a); - a->release (); - s.insert (doc.createAttribute (xml::string ("b").c_str ())); - assert (s.size () == 2); - - assert (s.find ("a") != s.end ()); - assert (s.find ("b") != s.end ()); - - for (type::any_attribute_iterator i (s.begin ()); i != s.end (); ++i) - { - assert (xml::transcode (i->getName ()) == "a" || - xml::transcode ((*i).getName ()) == "b"); - } - - // copy c-tor - type::any_attribute_set cs (s, doc); - assert (cs.size () == 2); - assert (cs.count ("a")); - assert (cs.count ("b")); - - // assignment - t.any_attribute (cs); - assert (s.size () == 2); - assert (s.count ("a")); - assert (s.count ("b")); - } - - // Test parsing - // - XSD_AUTO_PTR r (root (argv[1])); - print (*r); - - // Test serialization. - // - xml_schema::namespace_infomap map; - - map["t"].name = "test"; - map["t"].schema = "test.xsd"; - map["o"].name = "other"; - - stringstream iostr; - root (iostr, *r, map); - - // cout << iostr.str () << endl - // << endl; - - XSD_AUTO_PTR copy (root (iostr, argv[1])); - assert (*copy == *r); - - print (*copy); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - - XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/wildcard/makefile b/tests/cxx/tree/wildcard/makefile deleted file mode 100644 index 39f4846..0000000 --- a/tests/cxx/tree/wildcard/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/wildcard/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -xsd := test.xsd -cxx := driver.cxx - -obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) -dep := $(obj:.o=.o.d) - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - - -# Import. -# -$(call import,\ - $(scf_root)/import/libxerces-c/stub.make,\ - l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) - - -# Build. -# -$(driver): $(obj) $(xerces_c.l) - -$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) - -genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-wildcard --generate-default-ctor \ ---generate-from-base-ctor --generate-serialization --generate-comparison -$(gen): $(out_root)/xsd/xsd - -$(call include-dep,$(dep),$(obj),$(gen)) - -# Convenience alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) - -# Clean. -# -$(clean): $(driver).o.clean \ - $(addsuffix .cxx.clean,$(obj)) \ - $(addsuffix .cxx.clean,$(dep)) \ - $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(gen): | $(out_base)/.gitignore -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver $(genf) -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -$(call include,$(bld_root)/cxx/standard.make) # cxx_standard -ifdef cxx_standard -$(gen): xsd_options += --std $(cxx_standard) -$(call include,$(scf_root)/xsd/tree/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/tree/wildcard/output b/tests/cxx/tree/wildcard/output deleted file mode 100644 index b23b488..0000000 --- a/tests/cxx/tree/wildcard/output +++ /dev/null @@ -1,24 +0,0 @@ -att -any -o:any -t:any -o:one -foo -t:bar -bar -o:one1 -o:one2 -o:one3 - -att -any -o:any -t:any -o:one -foo -t:bar -bar -o:one1 -o:one2 -o:one3 - diff --git a/tests/cxx/tree/wildcard/test.xml b/tests/cxx/tree/wildcard/test.xml deleted file mode 100644 index b0c3267..0000000 --- a/tests/cxx/tree/wildcard/test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - o:one - foo - t:bar - bar - o:one1 - o:one2 - o:one3 - - diff --git a/tests/cxx/tree/wildcard/test.xsd b/tests/cxx/tree/wildcard/test.xsd deleted file mode 100644 index 6c7b308..0000000 --- a/tests/cxx/tree/wildcard/test.xsd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - -- cgit v1.1