aboutsummaryrefslogtreecommitdiffstats
path: root/result
diff options
context:
space:
mode:
authorWilliam M. Brack <wbrack@src.gnome.org>2004-08-20 23:09:47 +0000
committerWilliam M. Brack <wbrack@src.gnome.org>2004-08-20 23:09:47 +0000
commit2f2a66324d18afa655d6aa659b2089c36e2c4a92 (patch)
treef00814844906f06b1c97bdc7b132f8882d3140cf /result
parentdab93ea749a541ed654752a0daa64f5dec32b094 (diff)
downloadandroid_external_libxml2-2f2a66324d18afa655d6aa659b2089c36e2c4a92.tar.gz
android_external_libxml2-2f2a66324d18afa655d6aa659b2089c36e2c4a92.tar.bz2
android_external_libxml2-2f2a66324d18afa655d6aa659b2089c36e2c4a92.zip
modified parsing of <list>, <union>, <restriction>, <sequence>, <choice>,
* xmlschemas.c: modified parsing of <list>, <union>, <restriction>, <sequence>, <choice>, <include>, <import>. Fixed schema defaults (elementFormDefault, etc.) for included schemas. Fixed a bug which reported attributes as invalid on elements declarations with the built-in type 'anyType'. Added "lax" validation of the content of elements of type 'anyType'. Fixed: element declarations with the same name were treated as duplicate if located in the subtree of <choice> -> <sequence>. (This was bug 150623, submitted by Roland Lezuo) Fixed cleanup of error codes in xmlSchemaValidateDoc as proposed by Igor Kapitanker. (This was bug 150647, submitted by Igor Kapitanker) * xmlschemastypes.c: Changed the type of anyType to XML_SCHEMAS_ANYTYPE. * include/libxml/xmlerror.h: Added schema parser errors. * result/schemas/bug145246_0_0* result/schemas/extension1_0_2.err: Changed test results. * result/schemas/ct-sc-nobase_0_0* result/schemas/facet-whiteSpace_0_0* result/schemas/import1_0_0* result/schemas/import2_0_0* result/schemas/include2_0_0* result/schemas/include3_0_0* result/schemas/restriction-attr1_0_0* result/schemas/seq-dubl-elem1_0_0* result/schemas/xsd-list-itemType_0_0*: Added new rest results. test/schemas/bug145246.xsd.imp test/schemas/ct-sc-nobase_0* test/schemas/facet-whiteSpace_0* test/schemas/import1_0* test/schemas/import2_0* test/schemas/include2_0* test/schemas/include3_0* test/schemas/restriction-attr1_0* test/schemas/seq-dubl-elem1_0* test/schemas/xml.xsd test/schemas/xsd-list-itemType_0*: Added new tests and missing files.
Diffstat (limited to 'result')
-rw-r--r--result/schemas/bug145246_0_01
-rw-r--r--result/schemas/bug145246_0_0.err3
-rw-r--r--result/schemas/ct-sc-nobase_0_01
-rw-r--r--result/schemas/ct-sc-nobase_0_0.err0
-rw-r--r--result/schemas/extension1_0_2.err2
-rw-r--r--result/schemas/facet-whiteSpace_0_01
-rw-r--r--result/schemas/facet-whiteSpace_0_0.err0
-rw-r--r--result/schemas/import1_0_00
-rw-r--r--result/schemas/import1_0_0.err4
-rw-r--r--result/schemas/import2_0_01
-rw-r--r--result/schemas/import2_0_0.err0
-rw-r--r--result/schemas/include2_0_01
-rw-r--r--result/schemas/include2_0_0.err0
-rw-r--r--result/schemas/include3_0_00
-rw-r--r--result/schemas/include3_0_0.err1
-rw-r--r--result/schemas/restriction-attr1_0_00
-rw-r--r--result/schemas/restriction-attr1_0_0.err1
-rw-r--r--result/schemas/seq-dubl-elem1_0_01
-rw-r--r--result/schemas/seq-dubl-elem1_0_0.err0
-rw-r--r--result/schemas/xsd-list-itemType_0_01
-rw-r--r--result/schemas/xsd-list-itemType_0_0.err0
21 files changed, 14 insertions, 4 deletions
diff --git a/result/schemas/bug145246_0_0 b/result/schemas/bug145246_0_0
index e69de29b..d28ccf7b 100644
--- a/result/schemas/bug145246_0_0
+++ b/result/schemas/bug145246_0_0
@@ -0,0 +1 @@
+./test/schemas/bug145246_0.xml validates
diff --git a/result/schemas/bug145246_0_0.err b/result/schemas/bug145246_0_0.err
index c729c491..e69de29b 100644
--- a/result/schemas/bug145246_0_0.err
+++ b/result/schemas/bug145246_0_0.err
@@ -1,3 +0,0 @@
-I/O warning : failed to load external entity "test/schemas/bug145246.xsd.imp"
-Schemas parser error : xmlSchemaParse: could not load 'test/schemas/bug145246.xsd.imp'.
-Schemas parser error : Failed to import schema from location "test/schemas/bug145246.xsd.imp".
diff --git a/result/schemas/ct-sc-nobase_0_0 b/result/schemas/ct-sc-nobase_0_0
new file mode 100644
index 00000000..168712a1
--- /dev/null
+++ b/result/schemas/ct-sc-nobase_0_0
@@ -0,0 +1 @@
+./test/schemas/ct-sc-nobase_0.xml validates
diff --git a/result/schemas/ct-sc-nobase_0_0.err b/result/schemas/ct-sc-nobase_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/ct-sc-nobase_0_0.err
diff --git a/result/schemas/extension1_0_2.err b/result/schemas/extension1_0_2.err
index 4eaa6635..3952e5b2 100644
--- a/result/schemas/extension1_0_2.err
+++ b/result/schemas/extension1_0_2.err
@@ -1 +1 @@
-./test/schemas/extension1_2.xml:1: element title: Schemas validity error : Element children are not allowed, because the content type is a simple type.
+./test/schemas/extension1_2.xml:1: element title: Schemas validity error : Element 'title' [CT local]: Element content is not allowed, because the content type is a simple type.
diff --git a/result/schemas/facet-whiteSpace_0_0 b/result/schemas/facet-whiteSpace_0_0
new file mode 100644
index 00000000..63276c6b
--- /dev/null
+++ b/result/schemas/facet-whiteSpace_0_0
@@ -0,0 +1 @@
+./test/schemas/facet-whiteSpace_0.xml validates
diff --git a/result/schemas/facet-whiteSpace_0_0.err b/result/schemas/facet-whiteSpace_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/facet-whiteSpace_0_0.err
diff --git a/result/schemas/import1_0_0 b/result/schemas/import1_0_0
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/import1_0_0
diff --git a/result/schemas/import1_0_0.err b/result/schemas/import1_0_0.err
new file mode 100644
index 00000000..f5ec5f0b
--- /dev/null
+++ b/result/schemas/import1_0_0.err
@@ -0,0 +1,4 @@
+I/O warning : failed to load external entity "test/schemas/import-bad-1_0.imp"
+./test/schemas/import1_0.xsd:10: element import: Schemas parser error : Element 'import': Failed to parse the resource 'test/schemas/import-bad-1_0.imp' for import.
+I/O warning : failed to load external entity "test/schemas/import1_0bc.imp"
+./test/schemas/import1_0.xsd:12: element import: Schemas parser error : Element 'import': Failed to parse the resource 'test/schemas/import1_0bc.imp' for import.
diff --git a/result/schemas/import2_0_0 b/result/schemas/import2_0_0
new file mode 100644
index 00000000..2960b486
--- /dev/null
+++ b/result/schemas/import2_0_0
@@ -0,0 +1 @@
+./test/schemas/import2_0.xml validates
diff --git a/result/schemas/import2_0_0.err b/result/schemas/import2_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/import2_0_0.err
diff --git a/result/schemas/include2_0_0 b/result/schemas/include2_0_0
new file mode 100644
index 00000000..7aea2b09
--- /dev/null
+++ b/result/schemas/include2_0_0
@@ -0,0 +1 @@
+./test/schemas/include2_0.xml validates
diff --git a/result/schemas/include2_0_0.err b/result/schemas/include2_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/include2_0_0.err
diff --git a/result/schemas/include3_0_0 b/result/schemas/include3_0_0
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/include3_0_0
diff --git a/result/schemas/include3_0_0.err b/result/schemas/include3_0_0.err
new file mode 100644
index 00000000..cb90d4e6
--- /dev/null
+++ b/result/schemas/include3_0_0.err
@@ -0,0 +1 @@
+./test/schemas/include3_0.xsd:7: element element: Schemas parser error : Element 'element': A global element declaration with the name 'bar' does already exist.
diff --git a/result/schemas/restriction-attr1_0_0 b/result/schemas/restriction-attr1_0_0
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/restriction-attr1_0_0
diff --git a/result/schemas/restriction-attr1_0_0.err b/result/schemas/restriction-attr1_0_0.err
new file mode 100644
index 00000000..8214d73e
--- /dev/null
+++ b/result/schemas/restriction-attr1_0_0.err
@@ -0,0 +1 @@
+./test/schemas/restriction-attr1_0.xsd:5: element complexType: Schemas parser error : CT local, attr. use {'barA'}: The 'optional' use is inconsistent with a matching 'required' use of the base type.
diff --git a/result/schemas/seq-dubl-elem1_0_0 b/result/schemas/seq-dubl-elem1_0_0
new file mode 100644
index 00000000..466d3a8c
--- /dev/null
+++ b/result/schemas/seq-dubl-elem1_0_0
@@ -0,0 +1 @@
+./test/schemas/seq-dubl-elem1_0.xml validates
diff --git a/result/schemas/seq-dubl-elem1_0_0.err b/result/schemas/seq-dubl-elem1_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/seq-dubl-elem1_0_0.err
diff --git a/result/schemas/xsd-list-itemType_0_0 b/result/schemas/xsd-list-itemType_0_0
new file mode 100644
index 00000000..5ecd8856
--- /dev/null
+++ b/result/schemas/xsd-list-itemType_0_0
@@ -0,0 +1 @@
+./test/schemas/xsd-list-itemType_0.xml validates
diff --git a/result/schemas/xsd-list-itemType_0_0.err b/result/schemas/xsd-list-itemType_0_0.err
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/result/schemas/xsd-list-itemType_0_0.err