5 files changed, 326 insertions, 0 deletions
diff --git a/xsd-tests/cxx/parser/validation/attribute/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile
new file mode 100644
index 0000000..d486193
--- /dev/null
+++ b/xsd-tests/cxx/parser/validation/attribute/buildfile
@@ -0,0 +1,24 @@
+# file      : cxx/parser/validation/attribute/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs
+
+exe{driver}: xml{test}:    test.input  = true
+exe{driver}: file{output}: test.stdout = true
+
+<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-parser --std c++11    \
+       --generate-inline         \
+       --skel-file-suffix -pskel \
+       --output-dir $out_base    \
+       --generate-validation     \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/cxx/parser/validation/attribute/driver.cxx b/xsd-tests/cxx/parser/validation/attribute/driver.cxx
new file mode 100644
index 0000000..4710564
--- /dev/null
+++ b/xsd-tests/cxx/parser/validation/attribute/driver.cxx
@@ -0,0 +1,197 @@
+// file      : cxx/parser/validation/attribute/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test attribute and attribute wildcard (anyAttribute) validation.
+//
+
+#include <string>
+#include <fstream>
+#include <iostream>
+
+#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/xsd-tests/cxx/parser/validation/attribute/output b/xsd-tests/cxx/parser/validation/attribute/output
new file mode 100644
index 0000000..847b054
--- /dev/null
+++ b/xsd-tests/cxx/parser/validation/attribute/output
@@ -0,0 +1,24 @@
+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/xsd-tests/cxx/parser/validation/attribute/test.xml b/xsd-tests/cxx/parser/validation/attribute/test.xml
new file mode 100644
index 0000000..b994d1a
--- /dev/null
+++ b/xsd-tests/cxx/parser/validation/attribute/test.xml
@@ -0,0 +1,10 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <pass-a b="b" t:foo="foo" t:bar="bar"/>
+  <pass-b a="a" b="b"/>
+  <pass-c a="a" b="b"/>
+  <fail/>
+
+</t:root>
diff --git a/xsd-tests/cxx/parser/validation/attribute/test.xsd b/xsd-tests/cxx/parser/validation/attribute/test.xsd
new file mode 100644
index 0000000..833eb8e
--- /dev/null
+++ b/xsd-tests/cxx/parser/validation/attribute/test.xsd
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+
+  <!-- Test optional and required attributes as well as a wildcard. -->
+  <complexType name="pass-a">
+    <attribute name="a" type="string" use="optional"/>
+    <attribute name="b" type="string" use="required"/>
+    <anyAttribute namespace="##targetNamespace" processContents="skip"/>
+  </complexType>
+
+
+  <!-- Test that in inheritance attributes are checked before wildcards. -->
+  <complexType name="pass-b-base">
+    <attribute name="a" type="string"/>
+    <anyAttribute namespace="#any" processContents="skip"/>
+  </complexType>
+
+  <complexType name="pass-b">
+    <complexContent>
+      <extension base="t:pass-b-base">
+        <attribute name="b" type="string"/>
+	<anyAttribute namespace="#any" processContents="skip"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+
+  <!-- Test that in inheritance by restriction required attribute is
+       checked for even though it is not explicitly mentioned in
+       derived. -->
+  <complexType name="pass-c-base">
+    <attribute name="a" type="string" use="required"/>
+    <attribute name="b" type="string" use="optional"/>
+  </complexType>
+
+  <complexType name="pass-c">
+    <complexContent>
+      <restriction base="t:pass-c-base">
+        <attribute name="b" type="string" use="required"/>
+      </restriction>
+    </complexContent>
+  </complexType>
+
+
+  <!-- Test detection of missing required attribute. -->
+  <complexType name="fail-base">
+    <attribute name="a" type="string" use="optional"/>
+  </complexType>
+
+  <complexType name="fail">
+    <complexContent>
+      <restriction base="t:fail-base">
+        <attribute name="a" type="string" use="required"/>
+      </restriction>
+    </complexContent>
+  </complexType>
+
+
+  <complexType name="type">
+    <sequence>
+      <element name="pass-a" type="t:pass-a"/>
+      <element name="pass-b" type="t:pass-b"/>
+      <element name="pass-c" type="t:pass-c"/>
+      <element name="fail" type="t:fail"/>
+    </sequence>
+  </complexType>
+
+  <element name="root" type="t:type"/>
+
+</schema>