Author: jeremias
Date: Tue Aug 12 23:56:32 2008
New Revision: 685466
URL: http://svn.apache.org/viewvc?rev=685466&view=rev
Log:
Removed temporary debug code.
Switched tests to changed namespace URI for document navigation.
Added IF checks for fox:destionation.
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_1.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/fox_destination_1.xml
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java?rev=685466&r1=685465&r2=685466&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java
Tue Aug 12 23:56:32 2008
@@ -62,7 +62,7 @@
if (nd != null) {
this.tolerance = Double.parseDouble(nd.getNodeValue());
}
- this.prefixResolver = new MyPrefixResolver(new
PrefixResolverDefault(node));
+ this.prefixResolver = new PrefixResolverDefault(node);
}
/** [EMAIL PROTECTED] */
@@ -105,40 +105,4 @@
return "XPath: " + xpath;
}
- private static class MyPrefixResolver implements PrefixResolver {
-
- private PrefixResolver delegate;
-
- public MyPrefixResolver(PrefixResolver delegate) {
- this.delegate = delegate;
- }
-
- /** [EMAIL PROTECTED] */
- public String getBaseIdentifier() {
- String s = delegate.getBaseIdentifier();
- System.out.println(s);
- return s;
- }
-
- /** [EMAIL PROTECTED] */
- public String getNamespaceForPrefix(String prefix) {
- String s = delegate.getNamespaceForPrefix(prefix);
- System.out.println(s);
- return s;
- }
-
- /** [EMAIL PROTECTED] */
- public String getNamespaceForPrefix(String prefix, Node context) {
- String s = delegate.getNamespaceForPrefix(prefix, context);
- System.out.println(s);
- return s;
- }
-
- /** [EMAIL PROTECTED] */
- public boolean handlesNullPrefixes() {
- return delegate.handlesNullPrefixes();
- }
-
- }
-
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_1.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_1.xml?rev=685466&r1=685465&r2=685466&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_1.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_1.xml
Tue Aug 12 23:56:32 2008
@@ -82,29 +82,29 @@
<eval expected="(P2,chapter2-sec1)"
xpath="//bookmarkTree/bookmark[2]/bookmark[1]/@internal-link"/>
<eval expected="(P2,chapter2-sec2)"
xpath="//bookmarkTree/bookmark[2]/bookmark[2]/@internal-link"/>
</checks>
- <if-checks
xmlns:bm="http://xmlgraphics.apache.org/fop/intermediate/bookmarks";>
- <eval expected="show"
xpath="//bm:bookmark-tree/bm:bookmark[1]/@starting-state"/>
- <eval expected="Chapter 1"
xpath="//bm:bookmark-tree/bm:bookmark[1]/@title"/>
- <eval expected="0"
xpath="//bm:bookmark-tree/bm:bookmark[1]/bm:goto-xy/@page-index"/>
- <eval expected="20000"
xpath="//bm:bookmark-tree/bm:bookmark[1]/bm:goto-xy/@x"/>
- <eval expected="20000"
xpath="//bm:bookmark-tree/bm:bookmark[1]/bm:goto-xy/@y"/>
+ <if-checks
xmlns:n="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";>
+ <eval expected="show"
xpath="//n:bookmark-tree/n:bookmark[1]/@starting-state"/>
+ <eval expected="Chapter 1" xpath="//n:bookmark-tree/n:bookmark[1]/@title"/>
+ <eval expected="0"
xpath="//n:bookmark-tree/n:bookmark[1]/n:goto-xy/@page-index"/>
+ <eval expected="20000"
xpath="//n:bookmark-tree/n:bookmark[1]/n:goto-xy/@x"/>
+ <eval expected="20000"
xpath="//n:bookmark-tree/n:bookmark[1]/n:goto-xy/@y"/>
- <eval expected="hide"
xpath="//bm:bookmark-tree/bm:bookmark[2]/@starting-state"/>
- <eval expected="Chapter 2"
xpath="//bm:bookmark-tree/bm:bookmark[2]/@title"/>
- <eval expected="1"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:goto-xy/@page-index"/>
- <eval expected="20000"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:goto-xy/@x"/>
- <eval expected="20000"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:goto-xy/@y"/>
+ <eval expected="hide"
xpath="//n:bookmark-tree/n:bookmark[2]/@starting-state"/>
+ <eval expected="Chapter 2" xpath="//n:bookmark-tree/n:bookmark[2]/@title"/>
+ <eval expected="1"
xpath="//n:bookmark-tree/n:bookmark[2]/n:goto-xy/@page-index"/>
+ <eval expected="20000"
xpath="//n:bookmark-tree/n:bookmark[2]/n:goto-xy/@x"/>
+ <eval expected="20000"
xpath="//n:bookmark-tree/n:bookmark[2]/n:goto-xy/@y"/>
- <eval expected="show"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:bookmark[1]/@starting-state"/>
- <eval expected="Section 1"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:bookmark[1]/@title"/>
- <eval expected="1"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:bookmark[1]/bm:goto-xy/@page-index"/>
- <eval expected="20000"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:bookmark[1]/bm:goto-xy/@x"/>
- <eval expected="51680"
xpath="//bm:bookmark-tree/bm:bookmark[2]/bm:bookmark[1]/bm:goto-xy/@y"/>
+ <eval expected="show"
xpath="//n:bookmark-tree/n:bookmark[2]/n:bookmark[1]/@starting-state"/>
+ <eval expected="Section 1"
xpath="//n:bookmark-tree/n:bookmark[2]/n:bookmark[1]/@title"/>
+ <eval expected="1"
xpath="//n:bookmark-tree/n:bookmark[2]/n:bookmark[1]/n:goto-xy/@page-index"/>
+ <eval expected="20000"
xpath="//n:bookmark-tree/n:bookmark[2]/n:bookmark[1]/n:goto-xy/@x"/>
+ <eval expected="51680"
xpath="//n:bookmark-tree/n:bookmark[2]/n:bookmark[1]/n:goto-xy/@y"/>
- <eval expected="show"
xpath="//bm:bookmark-tree/bm:bookmark[3]/@starting-state"/>
- <eval expected="Fixed Block Container"
xpath="//bm:bookmark-tree/bm:bookmark[3]/@title"/>
- <eval expected="1"
xpath="//bm:bookmark-tree/bm:bookmark[3]/bm:goto-xy/@page-index"/>
- <eval expected="216000"
xpath="//bm:bookmark-tree/bm:bookmark[3]/bm:goto-xy/@x"/>
- <eval expected="216000"
xpath="//bm:bookmark-tree/bm:bookmark[3]/bm:goto-xy/@y"/>
+ <eval expected="show"
xpath="//n:bookmark-tree/n:bookmark[3]/@starting-state"/>
+ <eval expected="Fixed Block Container"
xpath="//n:bookmark-tree/n:bookmark[3]/@title"/>
+ <eval expected="1"
xpath="//n:bookmark-tree/n:bookmark[3]/n:goto-xy/@page-index"/>
+ <eval expected="216000"
xpath="//n:bookmark-tree/n:bookmark[3]/n:goto-xy/@x"/>
+ <eval expected="216000"
xpath="//n:bookmark-tree/n:bookmark[3]/n:goto-xy/@y"/>
</if-checks>
</testcase>
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/fox_destination_1.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/fox_destination_1.xml?rev=685466&r1=685465&r2=685466&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/fox_destination_1.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/fox_destination_1.xml
Tue Aug 12 23:56:32 2008
@@ -58,4 +58,21 @@
<eval expected="(P2,chapter2-sec1)"
xpath="//destination[3]/@internal-link"/>
<eval expected="(P2,chapter2-sec2)"
xpath="//destination[4]/@internal-link"/>
</checks>
+ <if-checks
xmlns:n="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";>
+ <eval expected="0" xpath="//n:[EMAIL
PROTECTED]'chapter1']/n:goto-xy/@page-index"/>
+ <eval expected="0" xpath="//n:[EMAIL PROTECTED]'chapter1']/n:goto-xy/@x"/>
+ <eval expected="0" xpath="//n:[EMAIL PROTECTED]'chapter1']/n:goto-xy/@y"/>
+
+ <eval expected="1" xpath="//n:[EMAIL
PROTECTED]'chapter2']/n:goto-xy/@page-index"/>
+ <eval expected="0" xpath="//n:[EMAIL PROTECTED]'chapter2']/n:goto-xy/@x"/>
+ <eval expected="0" xpath="//n:[EMAIL PROTECTED]'chapter2']/n:goto-xy/@y"/>
+
+ <eval expected="1" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec1']/n:goto-xy/@page-index"/>
+ <eval expected="0" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec1']/n:goto-xy/@x"/>
+ <eval expected="31680" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec1']/n:goto-xy/@y"/>
+
+ <eval expected="1" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec2']/n:goto-xy/@page-index"/>
+ <eval expected="0" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec2']/n:goto-xy/@x"/>
+ <eval expected="60480" xpath="//n:[EMAIL
PROTECTED]'chapter2-sec2']/n:goto-xy/@y"/>
+ </if-checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
