3 files changed, 161 insertions, 0 deletions
diff --git a/xsd-tests/cxx/tree/detach/buildfile b/xsd-tests/cxx/tree/detach/buildfile
new file mode 100644
index 0000000..07f5f03
--- /dev/null
+++ b/xsd-tests/cxx/tree/detach/buildfile
@@ -0,0 +1,21 @@
+# file      : cxx/tree/detach/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
+
+<{hxx ixx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11    \
+       --generate-inline       \
+       --generate-detach       \
+       --generate-default-ctor \
+       --output-dir $out_base  \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/cxx/tree/detach/driver.cxx b/xsd-tests/cxx/tree/detach/driver.cxx
new file mode 100644
index 0000000..b632b5d
--- /dev/null
+++ b/xsd-tests/cxx/tree/detach/driver.cxx
@@ -0,0 +1,108 @@
+// file      : cxx/tree/detach/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test the detach functionality.
+//
+
+#include <memory> // std::auto_ptr/unique_ptr
+#include <cassert>
+
+#include "test.hxx"
+
+#ifdef XSD_CXX11
+#  include <utility> // 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<subtree> 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/xsd-tests/cxx/tree/detach/test.xsd b/xsd-tests/cxx/tree/detach/test.xsd
new file mode 100644
index 0000000..b9f5166
--- /dev/null
+++ b/xsd-tests/cxx/tree/detach/test.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <complexType name="object">
+    <sequence>
+      <element name="data" type="string" maxOccurs="unbounded"/>
+    </sequence>
+    <attribute name="id" type="ID" use="required"/>
+  </complexType>
+
+  <complexType name="ref">
+    <simpleContent>
+      <extension base="IDREF"/>
+    </simpleContent>
+  </complexType>
+
+  <complexType name="subtree">
+    <sequence>
+      <element name="o" type="t:object" minOccurs="0" maxOccurs="unbounded"/>
+      <element name="r" type="t:ref" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="model">
+    <sequence>
+      <element name="one" type="t:subtree"/>
+      <element name="opt" type="t:subtree" minOccurs="0"/>
+      <element name="seq" type="t:subtree" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+</schema>