Switch to build2

5 files changed, 131 insertions, 0 deletions

diff --git a/xsd-tests/cxx/tree/default/omit/buildfile b/xsd-tests/cxx/tree/default/omit/buildfile
new file mode 100644
index 0000000..407ab1e
--- /dev/null
+++ b/xsd-tests/cxx/tree/default/omit/buildfile
@@ -0,0 +1,27 @@
+# file      : cxx/tree/default/omit/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
+
+exe{driver}: xml{test}:    test.input  = true
+exe{driver}: file{output}: test.stdout = true
+
+<{hxx ixx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11      \
+       --generate-inline         \
+       --generate-serialization  \
+       --generate-ostream        \
+       --generate-default-ctor   \
+       --generate-from-base-ctor \
+       --omit-default-attributes \
+       --output-dir $out_base    \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/cxx/tree/default/omit/driver.cxx b/xsd-tests/cxx/tree/default/omit/driver.cxx
new file mode 100644
index 0000000..3dcc0d8
--- /dev/null
+++ b/xsd-tests/cxx/tree/default/omit/driver.cxx
@@ -0,0 +1,46 @@
+// file      : cxx/tree/default/omit/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test default attribute omission from the output.
+//
+
+#include <memory> // std::auto_ptr/unique_ptr
+#include <iostream>
+
+#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<type> 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/xsd-tests/cxx/tree/default/omit/output b/xsd-tests/cxx/tree/default/omit/output
new file mode 100644
index 0000000..150ad58
--- /dev/null
+++ b/xsd-tests/cxx/tree/default/omit/output
@@ -0,0 +1,19 @@
+
+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
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<t:root xmlns:t="test">
+  <derived q1="1" q2="2">
+    <a>a</a>
+  </derived>
+</t:root>
diff --git a/xsd-tests/cxx/tree/default/omit/test.xml b/xsd-tests/cxx/tree/default/omit/test.xml
new file mode 100644
index 0000000..dec39b4
--- /dev/null
+++ b/xsd-tests/cxx/tree/default/omit/test.xml
@@ -0,0 +1,9 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <derived q1="1" q2="2">
+    <a>a</a>
+  </derived>
+
+</t:root>
diff --git a/xsd-tests/cxx/tree/default/omit/test.xsd b/xsd-tests/cxx/tree/default/omit/test.xsd
new file mode 100644
index 0000000..bfc68d4
--- /dev/null
+++ b/xsd-tests/cxx/tree/default/omit/test.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <complexType name="base">
+    <sequence>
+      <element name="a" type="string"/>
+    </sequence>
+    <attribute name="x" type="string" default="foo"/>
+    <attribute name="q1" type="int" fixed="1" use="required"/>
+  </complexType>
+
+  <complexType name="derived">
+    <complexContent>
+      <extension base="t:base">
+        <attribute name="y" type="int" default="-20"/>
+        <attribute name="p" type="string" fixed="bar"/>
+        <attribute name="q2" type="int" fixed="2" use="required"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="type">
+    <sequence>
+      <element name="derived" type="t:derived"/>
+    </sequence>
+  </complexType>
+
+  <element name="root" type="t:type"/>
+
+</schema>