diff --git a/Makefile.am b/Makefile.am index 6e96d57c..79f1e3ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -196,41 +196,6 @@ asan: @echo '## rebuilding for ASAN' ./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff ; $(MAKE) clean ; $(MAKE) -# Old test suite. This should be ported to C. - -OLD_TESTS = -if WITH_SCHEMATRON_SOURCES -OLD_TESTS += Schematrontests -endif - -tests: $(OLD_TESTS) - -Schematrontests: xmllint$(EXEEXT) - @echo "## Schematron regression tests" - -@(for i in $(srcdir)/test/schematron/*.sct ; do \ - name=`basename $$i | sed 's+\.sct++'`; \ - for j in $(srcdir)/test/schematron/"$$name"_*.xml ; do \ - if [ -f $$j ] ; then \ - xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \ - if [ ! -f $(srcdir)/result/schematron/"$$name"_"$$xno" ]; \ - then \ - echo New test file "$$name"_"$$xno" ; \ - $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \ - > $(srcdir)/result/schematron/"$$name"_"$$xno" \ - 2> $(srcdir)/result/schematron/"$$name"_"$$xno".err; \ - else \ - log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \ - > res.$$name 2> err.$$name;\ - diff $(srcdir)/result/schematron/"$$name"_"$$xno" \ - res.$$name;\ - diff $(srcdir)/result/schematron/"$$name"_"$$xno".err \ - err.$$name | grep -v "error detected at";\ - grep Unimplemented err.$$name`; \ - if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo "$$log" ; fi ; \ - rm res.$$name err.$$name ; \ - fi ; fi ; \ - done; done) - cleanup: -@(find . -name .\#\* -exec rm {} \;) -@(find . -name \*.gcda -o -name \*.gcno -exec rm -f {} \;) diff --git a/result/schematron/zvon10_0 b/result/schematron/zvon10_0 deleted file mode 100644 index 9aae4b1e..00000000 --- a/result/schematron/zvon10_0 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon10_0.err b/result/schematron/zvon10_0.err index 524ecd89..f96d8822 100644 --- a/result/schematron/zvon10_0.err +++ b/result/schematron/zvon10_0.err @@ -1,5 +1,3 @@ -Pattern: Open model -/AAA line 1: CCC element is not present -Pattern: Closed model -/AAA line 1: CCC element is not present +./test/schematron/zvon10_0.xml:1: element AAA: schematron error : /AAA line 1: CCC element is not present +./test/schematron/zvon10_0.xml:1: element AAA: schematron error : /AAA line 1: CCC element is not present ./test/schematron/zvon10_0.xml fails to validate diff --git a/result/schematron/zvon10_1 b/result/schematron/zvon10_1 deleted file mode 100644 index d82353ae..00000000 --- a/result/schematron/zvon10_1 +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/result/schematron/zvon10_1.err b/result/schematron/zvon10_1.err index 9bc361c3..b7a2835a 100644 --- a/result/schematron/zvon10_1.err +++ b/result/schematron/zvon10_1.err @@ -1,6 +1,4 @@ -Pattern: Open model -/AAA line 1: CCC element is not present -Pattern: Closed model -/AAA line 1: CCC element is not present -/AAA line 1: There is an extra element +./test/schematron/zvon10_1.xml:1: element AAA: schematron error : /AAA line 1: CCC element is not present +./test/schematron/zvon10_1.xml:1: element AAA: schematron error : /AAA line 1: CCC element is not present +./test/schematron/zvon10_1.xml:1: element AAA: schematron error : /AAA line 1: There is an extra element ./test/schematron/zvon10_1.xml fails to validate diff --git a/result/schematron/zvon11_0 b/result/schematron/zvon11_0 deleted file mode 100644 index 49c80056..00000000 --- a/result/schematron/zvon11_0 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon11_0.err b/result/schematron/zvon11_0.err index ab4aa742..12d673c6 100644 --- a/result/schematron/zvon11_0.err +++ b/result/schematron/zvon11_0.err @@ -1,2 +1 @@ -Pattern: Attributes present ./test/schematron/zvon11_0.xml validates diff --git a/result/schematron/zvon11_1 b/result/schematron/zvon11_1 deleted file mode 100644 index a5328e0f..00000000 --- a/result/schematron/zvon11_1 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon11_1.err b/result/schematron/zvon11_1.err index c1ae2433..c3e55fcc 100644 --- a/result/schematron/zvon11_1.err +++ b/result/schematron/zvon11_1.err @@ -1,3 +1,2 @@ -Pattern: Attributes present -/AAA/BBB line 2: The element must not have an isolated bbb attribute +./test/schematron/zvon11_1.xml:2: element BBB: schematron error : /AAA/BBB line 2: The element must not have an isolated bbb attribute ./test/schematron/zvon11_1.xml fails to validate diff --git a/result/schematron/zvon11_2 b/result/schematron/zvon11_2 deleted file mode 100644 index 673a7afd..00000000 --- a/result/schematron/zvon11_2 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon11_2.err b/result/schematron/zvon11_2.err index 35117f7f..edb96302 100644 --- a/result/schematron/zvon11_2.err +++ b/result/schematron/zvon11_2.err @@ -1,3 +1,2 @@ -Pattern: Attributes present -/AAA/BBB line 2: The element must not have an isolated aaa attribute +./test/schematron/zvon11_2.xml:2: element BBB: schematron error : /AAA/BBB line 2: The element must not have an isolated aaa attribute ./test/schematron/zvon11_2.xml fails to validate diff --git a/result/schematron/zvon11_3 b/result/schematron/zvon11_3 deleted file mode 100644 index 9aae4b1e..00000000 --- a/result/schematron/zvon11_3 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon11_3.err b/result/schematron/zvon11_3.err index 18517e58..637c19b8 100644 --- a/result/schematron/zvon11_3.err +++ b/result/schematron/zvon11_3.err @@ -1,2 +1 @@ -Pattern: Attributes present ./test/schematron/zvon11_3.xml validates diff --git a/result/schematron/zvon12_0 b/result/schematron/zvon12_0 deleted file mode 100644 index 72208046..00000000 --- a/result/schematron/zvon12_0 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon12_0.err b/result/schematron/zvon12_0.err index c7e9ed25..74d0e0c8 100644 --- a/result/schematron/zvon12_0.err +++ b/result/schematron/zvon12_0.err @@ -1,3 +1,2 @@ -Pattern: Number of characters in an abbreviation -/AAA/BBB line 2: There is not enough letters in the abbreviation +./test/schematron/zvon12_0.xml:2: element BBB: schematron error : /AAA/BBB line 2: There is not enough letters in the abbreviation ./test/schematron/zvon12_0.xml fails to validate diff --git a/result/schematron/zvon12_1 b/result/schematron/zvon12_1 deleted file mode 100644 index 362de34e..00000000 --- a/result/schematron/zvon12_1 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon12_1.err b/result/schematron/zvon12_1.err index 486c0bea..24ca7913 100644 --- a/result/schematron/zvon12_1.err +++ b/result/schematron/zvon12_1.err @@ -1,2 +1 @@ -Pattern: Number of characters in an abbreviation ./test/schematron/zvon12_1.xml validates diff --git a/result/schematron/zvon12_2 b/result/schematron/zvon12_2 deleted file mode 100644 index bbbf7c7f..00000000 --- a/result/schematron/zvon12_2 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon12_2.err b/result/schematron/zvon12_2.err index 5edaf307..a2870c6f 100644 --- a/result/schematron/zvon12_2.err +++ b/result/schematron/zvon12_2.err @@ -1,3 +1,2 @@ -Pattern: Number of characters in an abbreviation -/AAA/BBB line 2: There is too much letters in the abbreviation +./test/schematron/zvon12_2.xml:2: element BBB: schematron error : /AAA/BBB line 2: There is too much letters in the abbreviation ./test/schematron/zvon12_2.xml fails to validate diff --git a/result/schematron/zvon13_0 b/result/schematron/zvon13_0 deleted file mode 100644 index e1295c37..00000000 --- a/result/schematron/zvon13_0 +++ /dev/null @@ -1,7 +0,0 @@ - - - 20 - 30 - 10 - 50 - diff --git a/result/schematron/zvon13_0.err b/result/schematron/zvon13_0.err index ed98cb3d..355f0d06 100644 --- a/result/schematron/zvon13_0.err +++ b/result/schematron/zvon13_0.err @@ -1,3 +1,2 @@ -Pattern: Sum equals 100%. -/Total line 1: The values do not sum to 100%. +./test/schematron/zvon13_0.xml:1: element Total: schematron error : /Total line 1: The values do not sum to 100%. ./test/schematron/zvon13_0.xml fails to validate diff --git a/result/schematron/zvon13_1 b/result/schematron/zvon13_1 deleted file mode 100644 index 401e919b..00000000 --- a/result/schematron/zvon13_1 +++ /dev/null @@ -1,6 +0,0 @@ - - - 20 - 10 - 50 - diff --git a/result/schematron/zvon13_1.err b/result/schematron/zvon13_1.err index e0f02c2a..e0b97457 100644 --- a/result/schematron/zvon13_1.err +++ b/result/schematron/zvon13_1.err @@ -1,3 +1,2 @@ -Pattern: Sum equals 100%. -/Total line 1: The values do not sum to 100%. +./test/schematron/zvon13_1.xml:1: element Total: schematron error : /Total line 1: The values do not sum to 100%. ./test/schematron/zvon13_1.xml fails to validate diff --git a/result/schematron/zvon13_2 b/result/schematron/zvon13_2 deleted file mode 100644 index cb1df2ed..00000000 --- a/result/schematron/zvon13_2 +++ /dev/null @@ -1,6 +0,0 @@ - - - 20 - 30 - 50 - diff --git a/result/schematron/zvon13_2.err b/result/schematron/zvon13_2.err index dfab61f9..bc8ec2d4 100644 --- a/result/schematron/zvon13_2.err +++ b/result/schematron/zvon13_2.err @@ -1,2 +1 @@ -Pattern: Sum equals 100%. ./test/schematron/zvon13_2.xml validates diff --git a/result/schematron/zvon14_0 b/result/schematron/zvon14_0 deleted file mode 100644 index c72e0c28..00000000 --- a/result/schematron/zvon14_0 +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/result/schematron/zvon14_0.err b/result/schematron/zvon14_0.err index 60155da7..68d9ce7f 100644 --- a/result/schematron/zvon14_0.err +++ b/result/schematron/zvon14_0.err @@ -1,4 +1,3 @@ -Pattern: a child of selected elements -/AAA/CCC line 5: Element CCC must not be a child of element AAA -/AAA/DDD/EEE/CCC line 9: Element CCC must not be a child of element EEE +./test/schematron/zvon14_0.xml:5: element CCC: schematron error : /AAA/CCC line 5: Element CCC must not be a child of element AAA +./test/schematron/zvon14_0.xml:9: element CCC: schematron error : /AAA/DDD/EEE/CCC line 9: Element CCC must not be a child of element EEE ./test/schematron/zvon14_0.xml fails to validate diff --git a/result/schematron/zvon15_0 b/result/schematron/zvon15_0 deleted file mode 100644 index 56500fe8..00000000 --- a/result/schematron/zvon15_0 +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/result/schematron/zvon15_0.err b/result/schematron/zvon15_0.err index 52348897..c6ecda26 100644 --- a/result/schematron/zvon15_0.err +++ b/result/schematron/zvon15_0.err @@ -1,4 +1,3 @@ -Pattern: id is the only permited attribute name -/AAA line 1: Attribute name is forbidden in element AAA -/AAA/CCC line 3: Attribute color is forbidden in element CCC +./test/schematron/zvon15_0.xml:1: element AAA: schematron error : /AAA line 1: Attribute name is forbidden in element AAA +./test/schematron/zvon15_0.xml:3: element CCC: schematron error : /AAA/CCC line 3: Attribute color is forbidden in element CCC ./test/schematron/zvon15_0.xml fails to validate diff --git a/result/schematron/zvon1_0 b/result/schematron/zvon1_0 deleted file mode 100644 index 9aae4b1e..00000000 --- a/result/schematron/zvon1_0 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon1_0.err b/result/schematron/zvon1_0.err index 0d421844..19f95cc3 100644 --- a/result/schematron/zvon1_0.err +++ b/result/schematron/zvon1_0.err @@ -1,8 +1,5 @@ -Pattern: Print both cases -/AAA line 1: BBB element is present. -/AAA line 1: AAA misses attribute name. -Pattern: Print positive result only -/AAA line 1: BBB element is present. -Pattern: Print negative result only -/AAA line 1: AAA misses attribute name. +./test/schematron/zvon1_0.xml:1: element AAA: schematron error : /AAA line 1: BBB element is present. +./test/schematron/zvon1_0.xml:1: element AAA: schematron error : /AAA line 1: AAA misses attribute name. +./test/schematron/zvon1_0.xml:1: element AAA: schematron error : /AAA line 1: BBB element is present. +./test/schematron/zvon1_0.xml:1: element AAA: schematron error : /AAA line 1: AAA misses attribute name. ./test/schematron/zvon1_0.xml fails to validate diff --git a/result/schematron/zvon1_1 b/result/schematron/zvon1_1 deleted file mode 100644 index 0a06953a..00000000 --- a/result/schematron/zvon1_1 +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/result/schematron/zvon1_1.err b/result/schematron/zvon1_1.err index 70ee87a7..f5548c93 100644 --- a/result/schematron/zvon1_1.err +++ b/result/schematron/zvon1_1.err @@ -1,8 +1,5 @@ -Pattern: Print both cases -/AAA line 1: BBB element is missing. -/AAA line 1: AAA misses attribute name. -Pattern: Print positive result only -Pattern: Print negative result only -/AAA line 1: BBB element is missing. -/AAA line 1: AAA misses attribute name. +./test/schematron/zvon1_1.xml:1: element AAA: schematron error : /AAA line 1: BBB element is missing. +./test/schematron/zvon1_1.xml:1: element AAA: schematron error : /AAA line 1: AAA misses attribute name. +./test/schematron/zvon1_1.xml:1: element AAA: schematron error : /AAA line 1: BBB element is missing. +./test/schematron/zvon1_1.xml:1: element AAA: schematron error : /AAA line 1: AAA misses attribute name. ./test/schematron/zvon1_1.xml fails to validate diff --git a/result/schematron/zvon2_0 b/result/schematron/zvon2_0 deleted file mode 100644 index 695bc8f1..00000000 --- a/result/schematron/zvon2_0 +++ /dev/null @@ -1,5 +0,0 @@ - - - bbbb - cccc - diff --git a/result/schematron/zvon2_0.err b/result/schematron/zvon2_0.err index f4e4a7f5..7c791711 100644 --- a/result/schematron/zvon2_0.err +++ b/result/schematron/zvon2_0.err @@ -1,2 +1 @@ -Pattern: Character @ forbidden ./test/schematron/zvon2_0.xml validates diff --git a/result/schematron/zvon2_1 b/result/schematron/zvon2_1 deleted file mode 100644 index 2af2cd0f..00000000 --- a/result/schematron/zvon2_1 +++ /dev/null @@ -1,5 +0,0 @@ - - - bbbb@bbb.com - ccc@ccc.com - diff --git a/result/schematron/zvon2_1.err b/result/schematron/zvon2_1.err index 28f3e99e..ca4d0fd4 100644 --- a/result/schematron/zvon2_1.err +++ b/result/schematron/zvon2_1.err @@ -1,5 +1,4 @@ -Pattern: Character @ forbidden -/AAA line 1: Text in element AAA must not contain character @ -/AAA/BBB line 2: Text in element BBB must not contain character @ -/AAA/CCC line 3: Text in element CCC must not contain character @ +./test/schematron/zvon2_1.xml:1: element AAA: schematron error : /AAA line 1: Text in element AAA must not contain character @ +./test/schematron/zvon2_1.xml:2: element BBB: schematron error : /AAA/BBB line 2: Text in element BBB must not contain character @ +./test/schematron/zvon2_1.xml:3: element CCC: schematron error : /AAA/CCC line 3: Text in element CCC must not contain character @ ./test/schematron/zvon2_1.xml fails to validate diff --git a/result/schematron/zvon2_2 b/result/schematron/zvon2_2 deleted file mode 100644 index 585cf0c3..00000000 --- a/result/schematron/zvon2_2 +++ /dev/null @@ -1,6 +0,0 @@ - - - bbbb - cccc - aaa@aaa.net - diff --git a/result/schematron/zvon2_2.err b/result/schematron/zvon2_2.err index 40dc7ca9..38669f1d 100644 --- a/result/schematron/zvon2_2.err +++ b/result/schematron/zvon2_2.err @@ -1,3 +1,2 @@ -Pattern: Character @ forbidden -/AAA line 1: Text in element AAA must not contain character @ +./test/schematron/zvon2_2.xml:1: element AAA: schematron error : /AAA line 1: Text in element AAA must not contain character @ ./test/schematron/zvon2_2.xml fails to validate diff --git a/result/schematron/zvon3_0 b/result/schematron/zvon3_0 deleted file mode 100644 index a8a6ed77..00000000 --- a/result/schematron/zvon3_0 +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/result/schematron/zvon3_0.err b/result/schematron/zvon3_0.err index 419e7291..7028b739 100644 --- a/result/schematron/zvon3_0.err +++ b/result/schematron/zvon3_0.err @@ -1,6 +1,5 @@ -Pattern: Attribute test -/AAA/BBB/CCC[1] line 3: attribute name is not present -/AAA/BBB/CCC[2] line 4: attribute name is not present -/AAA/CCC[1] line 6: attribute name is present -/AAA/CCC[2] line 7: attribute name is present +./test/schematron/zvon3_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC[1] line 3: attribute name is not present +./test/schematron/zvon3_0.xml:4: element CCC: schematron error : /AAA/BBB/CCC[2] line 4: attribute name is not present +./test/schematron/zvon3_0.xml:6: element CCC: schematron error : /AAA/CCC[1] line 6: attribute name is present +./test/schematron/zvon3_0.xml:7: element CCC: schematron error : /AAA/CCC[2] line 7: attribute name is present ./test/schematron/zvon3_0.xml fails to validate diff --git a/result/schematron/zvon4_0 b/result/schematron/zvon4_0 deleted file mode 100644 index b1e694e5..00000000 --- a/result/schematron/zvon4_0 +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/result/schematron/zvon4_0.err b/result/schematron/zvon4_0.err index 6aa6b2b5..9032c55e 100644 --- a/result/schematron/zvon4_0.err +++ b/result/schematron/zvon4_0.err @@ -1,3 +1,2 @@ -Pattern: Root test -/AAA line 1: Root element is AAA +./test/schematron/zvon4_0.xml:1: element AAA: schematron error : /AAA line 1: Root element is AAA ./test/schematron/zvon4_0.xml fails to validate diff --git a/result/schematron/zvon4_1 b/result/schematron/zvon4_1 deleted file mode 100644 index 6b1facc6..00000000 --- a/result/schematron/zvon4_1 +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/result/schematron/zvon4_1.err b/result/schematron/zvon4_1.err index 4ad324f9..aacdd3aa 100644 --- a/result/schematron/zvon4_1.err +++ b/result/schematron/zvon4_1.err @@ -1,3 +1,2 @@ -Pattern: Root test -/XXX line 1: Root element is XXX, not AAA +./test/schematron/zvon4_1.xml:1: element XXX: schematron error : /XXX line 1: Root element is XXX, not AAA ./test/schematron/zvon4_1.xml fails to validate diff --git a/result/schematron/zvon5_0 b/result/schematron/zvon5_0 deleted file mode 100644 index d763505b..00000000 --- a/result/schematron/zvon5_0 +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/result/schematron/zvon5_0.err b/result/schematron/zvon5_0.err index 91ef5f28..50183299 100644 --- a/result/schematron/zvon5_0.err +++ b/result/schematron/zvon5_0.err @@ -1,7 +1,6 @@ -Pattern: Select empty elements CCC -/AAA/BBB/CCC line 3: Source contains an empty element CCC -/AAA/BBB/CCC line 3: [1]An element CCC does not contain any text -/AAA/BBB/CCC line 3: [2]An element CCC does not contain any text -/AAA/BBB/CCC line 3: [1]An element CCC does not contain any child element -/AAA/BBB/CCC line 3: [2]An element CCC does not contain any child element +./test/schematron/zvon5_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: Source contains an empty element CCC +./test/schematron/zvon5_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [1]An element CCC does not contain any text +./test/schematron/zvon5_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [2]An element CCC does not contain any text +./test/schematron/zvon5_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [1]An element CCC does not contain any child element +./test/schematron/zvon5_0.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [2]An element CCC does not contain any child element ./test/schematron/zvon5_0.xml fails to validate diff --git a/result/schematron/zvon5_1 b/result/schematron/zvon5_1 deleted file mode 100644 index c76b7562..00000000 --- a/result/schematron/zvon5_1 +++ /dev/null @@ -1,6 +0,0 @@ - - - - I am CCC element - - diff --git a/result/schematron/zvon5_1.err b/result/schematron/zvon5_1.err index f4ce6d41..ad6f2fc1 100644 --- a/result/schematron/zvon5_1.err +++ b/result/schematron/zvon5_1.err @@ -1,5 +1,4 @@ -Pattern: Select empty elements CCC -/AAA/BBB/CCC line 3: Source contains an empty element CCC -/AAA/BBB/CCC line 3: [1]An element CCC does not contain any child element -/AAA/BBB/CCC line 3: [2]An element CCC does not contain any child element +./test/schematron/zvon5_1.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: Source contains an empty element CCC +./test/schematron/zvon5_1.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [1]An element CCC does not contain any child element +./test/schematron/zvon5_1.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [2]An element CCC does not contain any child element ./test/schematron/zvon5_1.xml fails to validate diff --git a/result/schematron/zvon5_2 b/result/schematron/zvon5_2 deleted file mode 100644 index ddc11fe3..00000000 --- a/result/schematron/zvon5_2 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon5_2.err b/result/schematron/zvon5_2.err index 8c69e79f..03f07967 100644 --- a/result/schematron/zvon5_2.err +++ b/result/schematron/zvon5_2.err @@ -1,5 +1,4 @@ -Pattern: Select empty elements CCC -/AAA/BBB/CCC line 3: Source contains an empty element CCC -/AAA/BBB/CCC line 3: [1]An element CCC does not contain any text -/AAA/BBB/CCC line 3: [2]An element CCC does not contain any text +./test/schematron/zvon5_2.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: Source contains an empty element CCC +./test/schematron/zvon5_2.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [1]An element CCC does not contain any text +./test/schematron/zvon5_2.xml:3: element CCC: schematron error : /AAA/BBB/CCC line 3: [2]An element CCC does not contain any text ./test/schematron/zvon5_2.xml fails to validate diff --git a/result/schematron/zvon6_0 b/result/schematron/zvon6_0 deleted file mode 100644 index 65397651..00000000 --- a/result/schematron/zvon6_0 +++ /dev/null @@ -1,4 +0,0 @@ - - -aaa - diff --git a/result/schematron/zvon6_0.err b/result/schematron/zvon6_0.err index 5cc3b372..0a3428b7 100644 --- a/result/schematron/zvon6_0.err +++ b/result/schematron/zvon6_0.err @@ -1,3 +1,2 @@ -Pattern: Predefined values -/AAA line 1: O.K. +./test/schematron/zvon6_0.xml:1: element AAA: schematron error : /AAA line 1: O.K. ./test/schematron/zvon6_0.xml fails to validate diff --git a/result/schematron/zvon6_1 b/result/schematron/zvon6_1 deleted file mode 100644 index e0c2e73c..00000000 --- a/result/schematron/zvon6_1 +++ /dev/null @@ -1,4 +0,0 @@ - - - bbb - diff --git a/result/schematron/zvon6_1.err b/result/schematron/zvon6_1.err index 8b728d41..c0b5f137 100644 --- a/result/schematron/zvon6_1.err +++ b/result/schematron/zvon6_1.err @@ -1,3 +1,2 @@ -Pattern: Predefined values -/AAA line 1: O.K. +./test/schematron/zvon6_1.xml:1: element AAA: schematron error : /AAA line 1: O.K. ./test/schematron/zvon6_1.xml fails to validate diff --git a/result/schematron/zvon6_2 b/result/schematron/zvon6_2 deleted file mode 100644 index edc24a97..00000000 --- a/result/schematron/zvon6_2 +++ /dev/null @@ -1,4 +0,0 @@ - - - ccc - diff --git a/result/schematron/zvon6_2.err b/result/schematron/zvon6_2.err index 18689342..9bcc3232 100644 --- a/result/schematron/zvon6_2.err +++ b/result/schematron/zvon6_2.err @@ -1,3 +1,2 @@ -Pattern: Predefined values -/AAA line 1: The AAA value is not permitted. +./test/schematron/zvon6_2.xml:1: element AAA: schematron error : /AAA line 1: The AAA value is not permitted. ./test/schematron/zvon6_2.xml fails to validate diff --git a/result/schematron/zvon7_0 b/result/schematron/zvon7_0 deleted file mode 100644 index 65397651..00000000 --- a/result/schematron/zvon7_0 +++ /dev/null @@ -1,4 +0,0 @@ - - -aaa - diff --git a/result/schematron/zvon7_0.err b/result/schematron/zvon7_0.err index df427d68..74cd995a 100644 --- a/result/schematron/zvon7_0.err +++ b/result/schematron/zvon7_0.err @@ -1,3 +1,2 @@ -Pattern: Test integer -/AAA line 1: The AAA value is not an integer. +./test/schematron/zvon7_0.xml:1: element AAA: schematron error : /AAA line 1: The AAA value is not an integer. ./test/schematron/zvon7_0.xml fails to validate diff --git a/result/schematron/zvon7_1 b/result/schematron/zvon7_1 deleted file mode 100644 index 0a4007ac..00000000 --- a/result/schematron/zvon7_1 +++ /dev/null @@ -1,4 +0,0 @@ - - - 12.234 - diff --git a/result/schematron/zvon7_1.err b/result/schematron/zvon7_1.err index aa1e0a15..ac6bfa43 100644 --- a/result/schematron/zvon7_1.err +++ b/result/schematron/zvon7_1.err @@ -1,3 +1,2 @@ -Pattern: Test integer -/AAA line 1: The AAA value is not an integer. +./test/schematron/zvon7_1.xml:1: element AAA: schematron error : /AAA line 1: The AAA value is not an integer. ./test/schematron/zvon7_1.xml fails to validate diff --git a/result/schematron/zvon7_2 b/result/schematron/zvon7_2 deleted file mode 100644 index 8eb45e30..00000000 --- a/result/schematron/zvon7_2 +++ /dev/null @@ -1,4 +0,0 @@ - - -45 - diff --git a/result/schematron/zvon7_2.err b/result/schematron/zvon7_2.err index abf8cc7e..b0d06d7c 100644 --- a/result/schematron/zvon7_2.err +++ b/result/schematron/zvon7_2.err @@ -1,3 +1,2 @@ -Pattern: Test integer -/AAA line 1: O.K. +./test/schematron/zvon7_2.xml:1: element AAA: schematron error : /AAA line 1: O.K. ./test/schematron/zvon7_2.xml fails to validate diff --git a/result/schematron/zvon7_3 b/result/schematron/zvon7_3 deleted file mode 100644 index 35089dd2..00000000 --- a/result/schematron/zvon7_3 +++ /dev/null @@ -1,4 +0,0 @@ - - -0 - diff --git a/result/schematron/zvon7_3.err b/result/schematron/zvon7_3.err index 5b4b59fe..07e36664 100644 --- a/result/schematron/zvon7_3.err +++ b/result/schematron/zvon7_3.err @@ -1,3 +1,2 @@ -Pattern: Test integer -/AAA line 1: O.K. +./test/schematron/zvon7_3.xml:1: element AAA: schematron error : /AAA line 1: O.K. ./test/schematron/zvon7_3.xml fails to validate diff --git a/result/schematron/zvon7_4 b/result/schematron/zvon7_4 deleted file mode 100644 index 0739eb4d..00000000 --- a/result/schematron/zvon7_4 +++ /dev/null @@ -1,4 +0,0 @@ - - --45 - diff --git a/result/schematron/zvon7_4.err b/result/schematron/zvon7_4.err index de1ee894..e754afbe 100644 --- a/result/schematron/zvon7_4.err +++ b/result/schematron/zvon7_4.err @@ -1,3 +1,2 @@ -Pattern: Test integer -/AAA line 1: O.K. +./test/schematron/zvon7_4.xml:1: element AAA: schematron error : /AAA line 1: O.K. ./test/schematron/zvon7_4.xml fails to validate diff --git a/result/schematron/zvon8_0 b/result/schematron/zvon8_0 deleted file mode 100644 index 1932cd04..00000000 --- a/result/schematron/zvon8_0 +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/result/schematron/zvon8_0.err b/result/schematron/zvon8_0.err index 085e1dee..006dbe76 100644 --- a/result/schematron/zvon8_0.err +++ b/result/schematron/zvon8_0.err @@ -1,3 +1,2 @@ -Pattern: Test count -/XXX line 1: O.K. +./test/schematron/zvon8_0.xml:1: element XXX: schematron error : /XXX line 1: O.K. ./test/schematron/zvon8_0.xml fails to validate diff --git a/result/schematron/zvon8_1 b/result/schematron/zvon8_1 deleted file mode 100644 index 93e5cfdf..00000000 --- a/result/schematron/zvon8_1 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon8_1.err b/result/schematron/zvon8_1.err index ae07d059..7ce3306b 100644 --- a/result/schematron/zvon8_1.err +++ b/result/schematron/zvon8_1.err @@ -1,3 +1,2 @@ -Pattern: Test count -/XXX line 1: Some BBB are missing +./test/schematron/zvon8_1.xml:1: element XXX: schematron error : /XXX line 1: Some BBB are missing ./test/schematron/zvon8_1.xml fails to validate diff --git a/result/schematron/zvon8_2 b/result/schematron/zvon8_2 deleted file mode 100644 index 4eea77ba..00000000 --- a/result/schematron/zvon8_2 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon8_2.err b/result/schematron/zvon8_2.err index 37e8432c..009a4f8e 100644 --- a/result/schematron/zvon8_2.err +++ b/result/schematron/zvon8_2.err @@ -1,3 +1,2 @@ -Pattern: Test count -/XXX line 1: Some AAA are missing +./test/schematron/zvon8_2.xml:1: element XXX: schematron error : /XXX line 1: Some AAA are missing ./test/schematron/zvon8_2.xml fails to validate diff --git a/result/schematron/zvon9_0 b/result/schematron/zvon9_0 deleted file mode 100644 index 1f254ec2..00000000 --- a/result/schematron/zvon9_0 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon9_0.err b/result/schematron/zvon9_0.err index a39ceebe..c17642f1 100644 --- a/result/schematron/zvon9_0.err +++ b/result/schematron/zvon9_0.err @@ -1,2 +1 @@ -Pattern: Test attribute ./test/schematron/zvon9_0.xml validates diff --git a/result/schematron/zvon9_1 b/result/schematron/zvon9_1 deleted file mode 100644 index 0dc0df72..00000000 --- a/result/schematron/zvon9_1 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon9_1.err b/result/schematron/zvon9_1.err index 44c6f67f..11e8d5dc 100644 --- a/result/schematron/zvon9_1.err +++ b/result/schematron/zvon9_1.err @@ -1,3 +1,2 @@ -Pattern: Test attribute -/AAA/CCC[1] line 2: Attribute id is used in wrong context +./test/schematron/zvon9_1.xml:2: element CCC: schematron error : /AAA/CCC[1] line 2: Attribute id is used in wrong context ./test/schematron/zvon9_1.xml fails to validate diff --git a/result/schematron/zvon9_2 b/result/schematron/zvon9_2 deleted file mode 100644 index b9218fc9..00000000 --- a/result/schematron/zvon9_2 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/result/schematron/zvon9_2.err b/result/schematron/zvon9_2.err index 20b08844..2c4bdf27 100644 --- a/result/schematron/zvon9_2.err +++ b/result/schematron/zvon9_2.err @@ -1,3 +1,2 @@ -Pattern: Test attribute -/AAA/BBB/CCC line 5: Attribute id is missing +./test/schematron/zvon9_2.xml:5: element CCC: schematron error : /AAA/BBB/CCC line 5: Attribute id is missing ./test/schematron/zvon9_2.xml fails to validate diff --git a/runtest.c b/runtest.c index 33e50434..68554927 100644 --- a/runtest.c +++ b/runtest.c @@ -57,6 +57,10 @@ #include #endif +#ifdef LIBXML_SCHEMATRON_ENABLED +#include +#endif + #ifdef LIBXML_PATTERN_ENABLED #include #endif @@ -3626,6 +3630,131 @@ rngStreamTest(const char *filename, #endif +/************************************************************************ + * * + * Schematron tests * + * * + ************************************************************************/ + +#ifdef LIBXML_SCHEMATRON_ENABLED +static int +schematronOneTest(const char *sch, const char *filename, int options, + xmlSchematronPtr schematron) { + xmlDocPtr doc; + xmlSchematronValidCtxtPtr ctxt; + int ret; + + doc = xmlReadFile(filename, NULL, options); + if (doc == NULL) { + fprintf(stderr, "failed to parse instance %s for %s\n", filename, sch); + return(-1); + } + + ctxt = xmlSchematronNewValidCtxt(schematron, XML_SCHEMATRON_OUT_ERROR); + xmlSchematronSetValidStructuredErrors(ctxt, testStructuredErrorHandler, + NULL); + ret = xmlSchematronValidateDoc(ctxt, doc); + if (ret == 0) { + testErrorHandler(NULL, "%s validates\n", filename); + } else if (ret > 0) { + testErrorHandler(NULL, "%s fails to validate\n", filename); + } else { + testErrorHandler(NULL, "%s validation generated an internal error\n", + filename); + } + + xmlSchematronFreeValidCtxt(ctxt); + xmlFreeDoc(doc); + return(0); +} + +/** + * schematronTest: + * @filename: the schemas file + * @result: the file with expected result + * @err: the file with error messages + * + * Returns 0 in case of success, an error code otherwise + */ +static int +schematronTest(const char *filename, + const char *resul ATTRIBUTE_UNUSED, + const char *errr ATTRIBUTE_UNUSED, + int options) { + const char *base = baseFilename(filename); + const char *base2; + const char *instance; + xmlSchematronParserCtxtPtr pctxt; + xmlSchematronPtr schematron; + int res = 0, len, ret = 0; + int parseErrorsSize; + char pattern[500]; + char prefix[500]; + char err[500]; + glob_t globbuf; + size_t i; + char count = 0; + + pctxt = xmlSchematronNewParserCtxt(filename); + schematron = xmlSchematronParse(pctxt); + xmlSchematronFreeParserCtxt(pctxt); + if (schematron == NULL) + testErrorHandler(NULL, "Schematron schema %s failed to compile\n", + filename); + parseErrorsSize = testErrorsSize; + + /* + * most of the mess is about the output filenames generated by the Makefile + */ + len = strlen(base); + if ((len > 499) || (len < 5)) { + xmlSchematronFree(schematron); + return(-1); + } + len -= 4; /* remove trailing .sct */ + memcpy(prefix, base, len); + prefix[len] = 0; + + if (snprintf(pattern, 499, "./test/schematron/%s_?.xml", prefix) >= 499) + pattern[499] = 0; + + globbuf.gl_offs = 0; + glob(pattern, GLOB_DOOFFS, NULL, &globbuf); + for (i = 0;i < globbuf.gl_pathc;i++) { + testErrorsSize = parseErrorsSize; + testErrors[parseErrorsSize] = 0; + instance = globbuf.gl_pathv[i]; + base2 = baseFilename(instance); + len = strlen(base2); + if ((len > 6) && (base2[len - 6] == '_')) { + count = base2[len - 5]; + res = snprintf(err, 499, "result/schematron/%s_%c.err", + prefix, count); + if (res >= 499) + err[499] = 0; + } else { + fprintf(stderr, "don't know how to process %s\n", instance); + continue; + } + if (schematron != NULL) { + nb_tests++; + res = schematronOneTest(filename, instance, options, schematron); + if (res != 0) + ret = res; + } + if (compareFileMem(err, testErrors, testErrorsSize)) { + fprintf(stderr, "Error for %s on %s failed\n", instance, + filename); + ret = 1; + } + } + globfree(&globbuf); + xmlSchematronFree(schematron); + + return(ret); +} +#endif /* LIBXML_SCHEMATRON_ENABLED */ + #ifdef LIBXML_PATTERN_ENABLED #ifdef LIBXML_READER_ENABLED /************************************************************************ @@ -4869,6 +4998,11 @@ testDesc testDescriptions[] = { XML_PARSE_DTDATTR | XML_PARSE_NOENT }, #endif #endif +#if defined(LIBXML_SCHEMATRON_ENABLED) + { "Schematron regression tests" , + schematronTest, "./test/schematron/*.sct", NULL, NULL, NULL, + 0 }, +#endif #ifdef LIBXML_PATTERN_ENABLED #ifdef LIBXML_READER_ENABLED { "Pattern regression tests" ,