9 files changed, 33 insertions, 5 deletions
diff --git a/tests/cxx/tree/binary/cdr/driver.cxx b/tests/cxx/tree/binary/cdr/driver.cxx
index 65c88fa..a2d7195 100644
--- a/tests/cxx/tree/binary/cdr/driver.cxx
+++ b/tests/cxx/tree/binary/cdr/driver.cxx
@@ -127,6 +127,14 @@ main (int argc, char* argv[])
     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)
   {
diff --git a/tests/cxx/tree/binary/cdr/makefile b/tests/cxx/tree/binary/cdr/makefile
index 9613841..eb80d35 100644
--- a/tests/cxx/tree/binary/cdr/makefile
+++ b/tests/cxx/tree/binary/cdr/makefile
@@ -37,7 +37,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options += --generate-insertion ACE_OutputCDR \
---generate-extraction ACE_InputCDR
+--generate-extraction ACE_InputCDR --generate-comparison
 $(gen): $(out_root)/xsd/xsd
 
 $(call include-dep,$(dep),$(obj),$(gen))
diff --git a/tests/cxx/tree/binary/cdr/test.xml b/tests/cxx/tree/binary/cdr/test.xml
index 928b4cf..5cedd98 100644
--- a/tests/cxx/tree/binary/cdr/test.xml
+++ b/tests/cxx/tree/binary/cdr/test.xml
@@ -1,6 +1,7 @@
 <t:root xmlns:t="test"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">
+        xsi:schemaLocation="test test.xsd"
+        any_simple_type_attr="any simple content">
 
   <list>1 2 3</list>
 
@@ -87,5 +88,6 @@
   <year_month>2001-11+02:00</year_month>
   <time>21:32:52+02:00</time>
 
+  <any_simple_type>any simple content in element</any_simple_type>
 
 </t:root>
diff --git a/tests/cxx/tree/binary/cdr/test.xsd b/tests/cxx/tree/binary/cdr/test.xsd
index e593f64..0629e94 100644
--- a/tests/cxx/tree/binary/cdr/test.xsd
+++ b/tests/cxx/tree/binary/cdr/test.xsd
@@ -112,7 +112,10 @@
       <element name="year"                  type="gYear"/>
       <element name="year_month"            type="gYearMonth"/>
       <element name="time"                  type="time"/>
+
+      <element name="any_simple_type"       type="anySimpleType"/>
     </sequence>
+    <attribute name="any_simple_type_attr"  type="anySimpleType" use="required"/>
   </complexType>
 
   <element name="root" type="t:type"/>
diff --git a/tests/cxx/tree/binary/polymorphic/makefile b/tests/cxx/tree/binary/polymorphic/makefile
index f9ddf67..05c5186 100644
--- a/tests/cxx/tree/binary/polymorphic/makefile
+++ b/tests/cxx/tree/binary/polymorphic/makefile
@@ -37,7 +37,8 @@ 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-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR \
+ --generate-comparison
 $(gen): $(out_root)/xsd/xsd
 
 $(call include-dep,$(dep),$(obj),$(gen))
diff --git a/tests/cxx/tree/binary/xdr/driver.cxx b/tests/cxx/tree/binary/xdr/driver.cxx
index ddc196d..623a953 100644
--- a/tests/cxx/tree/binary/xdr/driver.cxx
+++ b/tests/cxx/tree/binary/xdr/driver.cxx
@@ -171,6 +171,14 @@ main (int argc, char* argv[])
     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)
   {
diff --git a/tests/cxx/tree/binary/xdr/makefile b/tests/cxx/tree/binary/xdr/makefile
index 184c5d2..2994134 100644
--- a/tests/cxx/tree/binary/xdr/makefile
+++ b/tests/cxx/tree/binary/xdr/makefile
@@ -32,7 +32,8 @@ 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
+$(gen): xsd_options += --generate-insertion XDR --generate-extraction XDR \
+--generate-comparison
 $(gen): $(out_root)/xsd/xsd
 
 $(call include-dep,$(dep),$(obj),$(gen))
diff --git a/tests/cxx/tree/binary/xdr/test.xml b/tests/cxx/tree/binary/xdr/test.xml
index 928b4cf..5cedd98 100644
--- a/tests/cxx/tree/binary/xdr/test.xml
+++ b/tests/cxx/tree/binary/xdr/test.xml
@@ -1,6 +1,7 @@
 <t:root xmlns:t="test"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">
+        xsi:schemaLocation="test test.xsd"
+        any_simple_type_attr="any simple content">
 
   <list>1 2 3</list>
 
@@ -87,5 +88,6 @@
   <year_month>2001-11+02:00</year_month>
   <time>21:32:52+02:00</time>
 
+  <any_simple_type>any simple content in element</any_simple_type>
 
 </t:root>
diff --git a/tests/cxx/tree/binary/xdr/test.xsd b/tests/cxx/tree/binary/xdr/test.xsd
index e593f64..0629e94 100644
--- a/tests/cxx/tree/binary/xdr/test.xsd
+++ b/tests/cxx/tree/binary/xdr/test.xsd
@@ -112,7 +112,10 @@
       <element name="year"                  type="gYear"/>
       <element name="year_month"            type="gYearMonth"/>
       <element name="time"                  type="time"/>
+
+      <element name="any_simple_type"       type="anySimpleType"/>
     </sequence>
+    <attribute name="any_simple_type_attr"  type="anySimpleType" use="required"/>
   </complexType>
 
   <element name="root" type="t:type"/>