From a668f1930ebc136d540f7678997e9b2342966d4f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 24 Sep 2009 06:45:10 +0200
Subject: Remove invalid multiple anyAttribute declarations

---
 tests/cxx/serializer/restriction/test.xsd          |  3 +-
 tests/cxx/serializer/validation/attribute/test.xsd | 38 +++++++++++++++++++---
 tests/cxx/serializer/wildcard/test.xsd             | 11 +++++--
 3 files changed, 43 insertions(+), 9 deletions(-)

(limited to 'tests/cxx')

diff --git a/tests/cxx/serializer/restriction/test.xsd b/tests/cxx/serializer/restriction/test.xsd
index 0557e5e..414a7a3 100644
--- a/tests/cxx/serializer/restriction/test.xsd
+++ b/tests/cxx/serializer/restriction/test.xsd
@@ -127,8 +127,7 @@
             </choice>
           </sequence>
         </sequence>
-        <anyAttribute namespace="foo" processContents="skip"/>
-        <anyAttribute namespace="baz" processContents="skip"/>
+        <anyAttribute namespace="foo baz" processContents="skip"/>
       </restriction>
     </complexContent>
   </complexType>
diff --git a/tests/cxx/serializer/validation/attribute/test.xsd b/tests/cxx/serializer/validation/attribute/test.xsd
index deb3f3b..ca00b02 100644
--- a/tests/cxx/serializer/validation/attribute/test.xsd
+++ b/tests/cxx/serializer/validation/attribute/test.xsd
@@ -1,13 +1,41 @@
 <?xml version="1.0"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
 
-  <complexType name="test-1">
+  <complexType name="test-1-b1">
     <attribute name="x" type="int" use="required"/>
     <anyAttribute namespace="##any" processContents="skip"/>
-    <anyAttribute namespace="##other" processContents="skip"/>
-    <anyAttribute namespace="##local" processContents="skip"/>
-    <anyAttribute namespace="##targetNamespace" processContents="skip"/>
-    <anyAttribute namespace="foo" processContents="skip"/>
+  </complexType>
+
+  <complexType name="test-1-b2">
+    <complexContent>
+      <extension base="t:test-1-b1">
+        <anyAttribute namespace="##other" processContents="skip"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="test-1-b3">
+    <complexContent>
+      <extension base="t:test-1-b2">
+        <anyAttribute namespace="##local" processContents="skip"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="test-1-b4">
+    <complexContent>
+      <extension base="t:test-1-b3">
+        <anyAttribute namespace="##targetNamespace" processContents="skip"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="test-1">
+    <complexContent>
+      <extension base="t:test-1-b4">
+        <anyAttribute namespace="foo" processContents="skip"/>
+      </extension>
+    </complexContent>
   </complexType>
 
   <complexType name="root">
diff --git a/tests/cxx/serializer/wildcard/test.xsd b/tests/cxx/serializer/wildcard/test.xsd
index 074679f..e62fb85 100644
--- a/tests/cxx/serializer/wildcard/test.xsd
+++ b/tests/cxx/serializer/wildcard/test.xsd
@@ -8,7 +8,7 @@
     <attribute name="x" type="int" use="required"/>
   </complexType>
 
-  <complexType name="root">
+  <complexType name="root-base">
     <sequence>
       <any namespace="##local" processContents="skip"/>
       <choice maxOccurs="unbounded">
@@ -17,7 +17,14 @@
       </choice>
     </sequence>
     <anyAttribute namespace="foo" processContents="skip"/>
-    <anyAttribute namespace="##local" processContents="skip"/>
+  </complexType>
+
+  <complexType name="root">
+    <complexContent>
+      <extension base="t:root-base">
+        <anyAttribute namespace="##local" processContents="skip"/>
+      </extension>
+    </complexContent>
   </complexType>
 
   <element name="root" type="t:root"/>
-- 
cgit v1.1