jeremias 2005/06/09 02:56:24
Modified: test/layoutengine/testcases markers3.xml
Log:
I don't know what change actually did this during the last few days but it
seems that the pageSequence starts now come in the right order to the Area Tree
Renderer so I have to change the checks now. I didn't bother to track down the
oddity back then.
Revision Changes Path
1.2 +17 -17 xml-fop/test/layoutengine/testcases/markers3.xml
Index: markers3.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markers3.xml 27 Jan 2005 20:32:54 -0000 1.1
+++ markers3.xml 9 Jun 2005 09:56:24 -0000 1.2
@@ -112,27 +112,27 @@
</fo>
<checks>
<!-- First check that the page breaking is correct -->
- <eval expected="7"
xpath="count(//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="1"
xpath="count(//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="7"
xpath="count(//pageViewport[3]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="2"
xpath="count(//pageViewport[4]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="7"
xpath="count(//pageSequence[1]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="1"
xpath="count(//pageSequence[1]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="7"
xpath="count(//pageSequence[2]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="2"
xpath="count(//pageSequence[2]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
<!-- Now we can check the markers -->
- <true
xpath="boolean(//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]'])"/>
- <true
xpath="boolean(//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]'])"/>
- <true
xpath="boolean(//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
+ <true
xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]'])"/>
+ <true
xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]'])"/>
+ <true
xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
- <true
xpath="not(boolean(//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
- <true
xpath="boolean(//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]'])"/>
- <true
xpath="boolean(//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
+ <true
xpath="not(boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
+ <true
xpath="boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]'])"/>
+ <true
xpath="boolean(//pageSequence[1]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
- <true
xpath="not(boolean(//pageViewport[3]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
- <true
xpath="not(boolean(//pageViewport[3]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]']))"/>
- <true
xpath="boolean(//pageViewport[3]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
+ <true
xpath="not(boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
+ <true
xpath="not(boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]']))"/>
+ <true
xpath="boolean(//pageSequence[2]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
<!-- checking a second page in the second page-sequence due to the
algorithm used -->
- <true
xpath="not(boolean(//pageViewport[4]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
- <true
xpath="not(boolean(//pageViewport[4]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]']))"/>
- <true
xpath="boolean(//pageViewport[4]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
+ <true
xpath="not(boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PAGE]']))"/>
+ <true
xpath="not(boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[PS]']))"/>
+ <true
xpath="boolean(//pageSequence[2]/pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[.
= '[DOC]'])"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
