Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proposed changes to unwrap tests #242

Merged
merged 2 commits into from
Jul 25, 2019
Merged

Proposed changes to unwrap tests #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c876564
Proposed changes to unwrap tests
ndw Jul 24, 2019
8b85047
Reworked for p:inline changes
ndw Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test-suite/tests/ab-escape-markup-004.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
<s:pattern>
<s:rule context="/">
<s:assert test="wrapper">Document element is not wrapper.</s:assert>
<s:assert test="count(wrapper/node())=11">Document element should have 11 children.</s:assert>
<s:assert test="wrapper/node()[2] instance of comment()">First child should be comment.</s:assert>
<s:assert test="wrapper/node()[4] instance of processing-instruction()">Second child should be pi.</s:assert>
<s:assert test="wrapper/node()[6] instance of element()">Third child should be element.</s:assert>
<s:assert test="wrapper/node()[8] instance of comment()">Fourth child should be comment.</s:assert>
<s:assert test="wrapper/node()[10] instance of processing-instruction()">Fifth child should be pi.</s:assert>
<s:assert test="count(wrapper/node())=9">Document element should have 11 children.</s:assert>
<s:assert test="wrapper/node()[1] instance of comment()">First child should be comment.</s:assert>
<s:assert test="wrapper/node()[3] instance of processing-instruction()">Second child should be pi.</s:assert>
<s:assert test="wrapper/node()[5] instance of element()">Third child should be element.</s:assert>
<s:assert test="wrapper/node()[7] instance of comment()">Fourth child should be comment.</s:assert>
<s:assert test="wrapper/node()[9] instance of processing-instruction()">Fifth child should be pi.</s:assert>
</s:rule>
</s:pattern>
</s:schema>
</t:schematron>
</t:test>
</t:test>
15 changes: 6 additions & 9 deletions test-suite/tests/ab-unwrap-003.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:unwrap</p>
</t:description>
<t:input port='source'>
<doc><?pi target ?>
<t:input port='source'><doc><?pi target ?>
<para>a</para>
<!-- comment -->
</doc>
</t:input>
</doc></t:input>

<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" name="pipeline" version="3.0">
Expand All @@ -36,15 +34,14 @@
<s:schema xmlns:s="http://purl.oclc.org/dsdl/schematron" xmlns="http://www.w3.org/1999/xhtml">
<s:pattern>
<s:rule context="/">
<s:assert test="count(/node())=3">Document should have five children.</s:assert>
<s:assert test="count(/node())=6">Document should have six children.</s:assert>
<s:assert test="/node()[1] instance of processing-instruction()">First child node should be a processing instruction.</s:assert>
<s:assert test="/node()[2] instance of element()">First child node should be an element.</s:assert>
<s:assert test="/node()[3] instance of comment()">First child node should be a comment.</s:assert>

<s:assert test="/node()[3] instance of element()">First child node should be an element.</s:assert>
<s:assert test="/node()[5] instance of comment()">First child node should be a comment.</s:assert>
<s:assert test="para">Root element should be 'para'.</s:assert>
<s:assert test="para/text()='a'">Element 'para' should have text a.</s:assert>
</s:rule>
</s:pattern>
</s:schema>
</t:schematron>
</t:test>
</t:test>
6 changes: 2 additions & 4 deletions test-suite/tests/ab-unwrap-005.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:unwrap</p>
</t:description>
<t:input port='source'>
<doc>Some <doc>text.</doc></doc>
</t:input>
<t:input port='source'><doc>Some <doc>text.</doc></doc></t:input>

<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" name="pipeline" version="3.0">
Expand All @@ -40,4 +38,4 @@
</s:pattern>
</s:schema>
</t:schematron>
</t:test>
</t:test>