diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-06-09 09:56:24 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-06-09 09:56:24 +0000 |
| commit | 4e4153060ce86a7da28df0ccce8431c2e16a7620 (patch) | |
| tree | 120bf23071d06aa05f335f5e57261499f50fdf14 | |
| parent | 4aa0eca9779c3baf8ed3a21d6fd9e06fa2d71af9 (diff) | |
| download | xmlgraphics-fop-4e4153060ce86a7da28df0ccce8431c2e16a7620.tar.gz xmlgraphics-fop-4e4153060ce86a7da28df0ccce8431c2e16a7620.zip | |
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.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198726 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/layoutengine/testcases/markers3.xml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/layoutengine/testcases/markers3.xml b/test/layoutengine/testcases/markers3.xml index 694df2cd4..3c16f1eee 100644 --- a/test/layoutengine/testcases/markers3.xml +++ b/test/layoutengine/testcases/markers3.xml @@ -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> |