diff options
author | Kasimier T. Buchcik <kbuchcik@src.gnome.org> | 2004-08-25 20:35:45 +0000 |
---|---|---|
committer | Kasimier T. Buchcik <kbuchcik@src.gnome.org> | 2004-08-25 20:35:45 +0000 |
commit | bea2354a33de9fe90e801234506a4e549e44e528 (patch) | |
tree | 3a519b4dfb10529864e269019449dd422feb4c17 /result | |
parent | 4c3bb7d8a20c5262882af7fcd41afe3b3d482f12 (diff) | |
download | android_external_libxml2-bea2354a33de9fe90e801234506a4e549e44e528.tar.gz android_external_libxml2-bea2354a33de9fe90e801234506a4e549e44e528.tar.bz2 android_external_libxml2-bea2354a33de9fe90e801234506a4e549e44e528.zip |
Added missing test file. Substituted the obsolete xmlSchemaValidError(s)
* test/schemas/import-bad-1_0.imp: Added missing test file.
* xmlschemas.c include/libxml/xmlerror.h include/libxml/xmlschemas.h:
Substituted the obsolete xmlSchemaValidError(s) for xmlParserErrors
- see #150840.
Changed the import of schemas to allow failure of location
of a resource to be imported.
* result/schemas/all_* result/schemas/any3_0_0.err
result/schemas/choice_* result/schemas/import1_0_0.err
result/schemas/list0_0_1.err result/schemas/list0_1_0.err
result/schemas/list0_1_1.err result/schemas/ns0_0_2.err
result/schemas/ns0_1_2.err: Adapted regression test results.
Diffstat (limited to 'result')
29 files changed, 31 insertions, 33 deletions
diff --git a/result/schemas/all_0_3.err b/result/schemas/all_0_3.err index bed5faad..cac6c186 100644 --- a/result/schemas/all_0_3.err +++ b/result/schemas/all_0_3.err @@ -1 +1 @@ -./test/schemas/all_3.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_3.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_0_4.err b/result/schemas/all_0_4.err index 8ec7445d..6774c04a 100644 --- a/result/schemas/all_0_4.err +++ b/result/schemas/all_0_4.err @@ -1 +1 @@ -./test/schemas/all_4.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_0_5.err b/result/schemas/all_0_5.err index 8fb8f3f5..19152d4b 100644 --- a/result/schemas/all_0_5.err +++ b/result/schemas/all_0_5.err @@ -1 +1 @@ -./test/schemas/all_5.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_0_6.err b/result/schemas/all_0_6.err index 10c25c4f..70eee9fb 100644 --- a/result/schemas/all_0_6.err +++ b/result/schemas/all_0_6.err @@ -1 +1 @@ -./test/schemas/all_6.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_6.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_0_7.err b/result/schemas/all_0_7.err index 9e108307..0fe325d7 100644 --- a/result/schemas/all_0_7.err +++ b/result/schemas/all_0_7.err @@ -1 +1 @@ -./test/schemas/all_7.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_7.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_1_5.err b/result/schemas/all_1_5.err index 8fb8f3f5..19152d4b 100644 --- a/result/schemas/all_1_5.err +++ b/result/schemas/all_1_5.err @@ -1 +1 @@ -./test/schemas/all_5.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_2_0.err b/result/schemas/all_2_0.err index 02a13710..c7e94499 100644 --- a/result/schemas/all_2_0.err +++ b/result/schemas/all_2_0.err @@ -1 +1 @@ -./test/schemas/all_0.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_0.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_2_1.err b/result/schemas/all_2_1.err index c7211c87..944ab08a 100644 --- a/result/schemas/all_2_1.err +++ b/result/schemas/all_2_1.err @@ -1 +1 @@ -./test/schemas/all_1.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_1.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_2_2.err b/result/schemas/all_2_2.err index 0de12e5f..22d4e6f3 100644 --- a/result/schemas/all_2_2.err +++ b/result/schemas/all_2_2.err @@ -1 +1 @@ -./test/schemas/all_2.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_2.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_2_4.err b/result/schemas/all_2_4.err index 8ec7445d..6774c04a 100644 --- a/result/schemas/all_2_4.err +++ b/result/schemas/all_2_4.err @@ -1 +1 @@ -./test/schemas/all_4.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/all_2_5.err b/result/schemas/all_2_5.err index 8fb8f3f5..19152d4b 100644 --- a/result/schemas/all_2_5.err +++ b/result/schemas/all_2_5.err @@ -1 +1 @@ -./test/schemas/all_5.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/any3_0_0.err b/result/schemas/any3_0_0.err index 0a4d727f..1b8b8f67 100644 --- a/result/schemas/any3_0_0.err +++ b/result/schemas/any3_0_0.err @@ -1 +1 @@ -./test/schemas/any3_0.xml:10: element foo: Schemas parser error : Element 'foo:foo': The element content is not valid. +./test/schemas/any3_0.xml:10: element foo: Schemas validity error : Element 'foo:foo' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_0_2.err b/result/schemas/choice_0_2.err index 327a3ad5..0f0dc595 100644 --- a/result/schemas/choice_0_2.err +++ b/result/schemas/choice_0_2.err @@ -1 +1 @@ -./test/schemas/choice_2.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_2.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_0_3.err b/result/schemas/choice_0_3.err index 9620d723..95089b35 100644 --- a/result/schemas/choice_0_3.err +++ b/result/schemas/choice_0_3.err @@ -1 +1 @@ -./test/schemas/choice_3.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_3.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_0_4.err b/result/schemas/choice_0_4.err index dfce746a..bd30cc76 100644 --- a/result/schemas/choice_0_4.err +++ b/result/schemas/choice_0_4.err @@ -1 +1 @@ -./test/schemas/choice_4.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_0_5.err b/result/schemas/choice_0_5.err index 0fb33b05..b6ec45bf 100644 --- a/result/schemas/choice_0_5.err +++ b/result/schemas/choice_0_5.err @@ -1 +1 @@ -./test/schemas/choice_5.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_5.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_0_6.err b/result/schemas/choice_0_6.err index 868e5860..b83b4601 100644 --- a/result/schemas/choice_0_6.err +++ b/result/schemas/choice_0_6.err @@ -1 +1 @@ -./test/schemas/choice_6.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_1_2.err b/result/schemas/choice_1_2.err index 327a3ad5..0f0dc595 100644 --- a/result/schemas/choice_1_2.err +++ b/result/schemas/choice_1_2.err @@ -1 +1 @@ -./test/schemas/choice_2.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_2.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_1_3.err b/result/schemas/choice_1_3.err index 9620d723..95089b35 100644 --- a/result/schemas/choice_1_3.err +++ b/result/schemas/choice_1_3.err @@ -1 +1 @@ -./test/schemas/choice_3.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_3.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_1_5.err b/result/schemas/choice_1_5.err index 0fb33b05..b6ec45bf 100644 --- a/result/schemas/choice_1_5.err +++ b/result/schemas/choice_1_5.err @@ -1 +1 @@ -./test/schemas/choice_5.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_5.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_1_6.err b/result/schemas/choice_1_6.err index 868e5860..b83b4601 100644 --- a/result/schemas/choice_1_6.err +++ b/result/schemas/choice_1_6.err @@ -1 +1 @@ -./test/schemas/choice_6.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_2_4.err b/result/schemas/choice_2_4.err index dfce746a..bd30cc76 100644 --- a/result/schemas/choice_2_4.err +++ b/result/schemas/choice_2_4.err @@ -1 +1 @@ -./test/schemas/choice_4.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/choice_2_6.err b/result/schemas/choice_2_6.err index 868e5860..b83b4601 100644 --- a/result/schemas/choice_2_6.err +++ b/result/schemas/choice_2_6.err @@ -1 +1 @@ -./test/schemas/choice_6.xml:1: element doc: Schemas parser error : Element 'doc': The element content is not valid. +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element 'doc' [CT local]: The element content is not valid. diff --git a/result/schemas/import1_0_0.err b/result/schemas/import1_0_0.err index f5ec5f0b..2fb1e7e2 100644 --- a/result/schemas/import1_0_0.err +++ b/result/schemas/import1_0_0.err @@ -1,4 +1,2 @@ -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. +./test/schemas/import1_0.xsd:10: element import: Schemas parser error : Element 'import': The XML document 'test/schemas/import-bad-1_0.imp' to be imported is not a XML schema document. 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/list0_0_1.err b/result/schemas/list0_0_1.err index 69c2c06d..0fa52687 100644 --- a/result/schemas/list0_0_1.err +++ b/result/schemas/list0_0_1.err @@ -1 +1 @@ -./test/schemas/list0_1.xml:1: element test: Schemas parser error : Element 'test': The element content is not valid. +./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test' [CT local]: The element content is not valid. diff --git a/result/schemas/list0_1_0.err b/result/schemas/list0_1_0.err index 676266cd..de7b589c 100644 --- a/result/schemas/list0_1_0.err +++ b/result/schemas/list0_1_0.err @@ -1 +1 @@ -./test/schemas/list0_0.xml:1: element test: Schemas parser error : Element 'test': The element content is not valid. +./test/schemas/list0_0.xml:1: element test: Schemas validity error : Element 'test' [CT local]: The element content is not valid. diff --git a/result/schemas/list0_1_1.err b/result/schemas/list0_1_1.err index 69c2c06d..0fa52687 100644 --- a/result/schemas/list0_1_1.err +++ b/result/schemas/list0_1_1.err @@ -1 +1 @@ -./test/schemas/list0_1.xml:1: element test: Schemas parser error : Element 'test': The element content is not valid. +./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test' [CT local]: The element content is not valid. diff --git a/result/schemas/ns0_0_2.err b/result/schemas/ns0_0_2.err index ff70f7dc..0ba0285e 100644 --- a/result/schemas/ns0_0_2.err +++ b/result/schemas/ns0_0_2.err @@ -1,2 +1,2 @@ -./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element foo not declared -./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element foo not declared +./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element 'foo': Global declaration is absent. +./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element 'foo': Global declaration is absent. diff --git a/result/schemas/ns0_1_2.err b/result/schemas/ns0_1_2.err index ff70f7dc..0ba0285e 100644 --- a/result/schemas/ns0_1_2.err +++ b/result/schemas/ns0_1_2.err @@ -1,2 +1,2 @@ -./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element foo not declared -./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element foo not declared +./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element 'foo': Global declaration is absent. +./test/schemas/ns0_2.xml:1: element foo: Schemas validity error : Element 'foo': Global declaration is absent. |