diff options
Diffstat (limited to 'test')
5 files changed, 76 insertions, 5 deletions
diff --git a/test/java/org/apache/fop/intermediate/IFParserTestCase.java b/test/java/org/apache/fop/intermediate/IFParserTestCase.java index b61c252d7..76d72c804 100644 --- a/test/java/org/apache/fop/intermediate/IFParserTestCase.java +++ b/test/java/org/apache/fop/intermediate/IFParserTestCase.java @@ -36,6 +36,7 @@ import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.Fop; import org.apache.fop.apps.MimeConstants; import org.apache.fop.fonts.FontInfo; +import org.apache.fop.render.intermediate.IFContext; import org.apache.fop.render.intermediate.IFDocumentHandler; import org.apache.fop.render.intermediate.IFParser; import org.apache.fop.render.intermediate.IFRenderer; @@ -87,7 +88,7 @@ public class IFParserTestCase extends AbstractIntermediateTestCase { //Setup painter IFSerializer serializer = new IFSerializer(); - serializer.setUserAgent(userAgent); + serializer.setContext(new IFContext(userAgent)); serializer.mimicDocumentHandler(targetHandler); serializer.setResult(domResult); @@ -125,7 +126,7 @@ public class IFParserTestCase extends AbstractIntermediateTestCase { FOUserAgent userAgent = createUserAgent(); IFSerializer serializer = new IFSerializer(); - serializer.setUserAgent(userAgent); + serializer.setContext(new IFContext(userAgent)); DOMResult domResult = new DOMResult(); serializer.setResult(domResult); diff --git a/test/java/org/apache/fop/intermediate/IFTester.java b/test/java/org/apache/fop/intermediate/IFTester.java index 7f64ad489..a3291a373 100644 --- a/test/java/org/apache/fop/intermediate/IFTester.java +++ b/test/java/org/apache/fop/intermediate/IFTester.java @@ -51,6 +51,7 @@ import org.apache.fop.area.RenderPagesModel; import org.apache.fop.fonts.FontInfo; import org.apache.fop.layoutengine.EvalCheck; import org.apache.fop.layoutengine.TrueCheck; +import org.apache.fop.render.intermediate.IFContext; import org.apache.fop.render.intermediate.IFRenderer; import org.apache.fop.render.intermediate.IFSerializer; import org.apache.fop.util.DelegatingContentHandler; @@ -113,7 +114,7 @@ public class IFTester { ifRenderer.setUserAgent(ua); IFSerializer serializer = new IFSerializer(); - serializer.setUserAgent(ua); + serializer.setContext(new IFContext(ua)); DOMResult result = new DOMResult(); serializer.setResult(result); ifRenderer.setDocumentHandler(serializer); diff --git a/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java b/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java index 51c4dc301..7f0462a75 100644 --- a/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java +++ b/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java @@ -35,6 +35,7 @@ import org.apache.xmlgraphics.ps.dsc.events.DSCCommentTitle; import org.apache.xmlgraphics.ps.dsc.events.DSCEvent; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.render.intermediate.IFContext; /** * Tests the image handling in PostScript output. @@ -90,7 +91,7 @@ public class ImageHandlingTestCase extends AbstractPostScriptTestCase { private void innerTestJPEGImageWithIF(int level) throws Exception { FOUserAgent ua = fopFactory.newFOUserAgent(); PSDocumentHandler handler = new PSDocumentHandler(); - handler.setUserAgent(ua); + handler.setContext(new IFContext(ua)); PSRenderingUtil psUtil = handler.getPSUtil(); psUtil.setLanguageLevel(level); psUtil.setOptimizeResources(true); diff --git a/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java b/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java index ace96e85d..e5b9a4d27 100644 --- a/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java +++ b/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java @@ -45,6 +45,7 @@ import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPage; import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPages; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.render.intermediate.IFContext; /** * Tests the PostScript resource optimization (selective de-duplication of @@ -77,7 +78,7 @@ public class ResourceOptimizationTestCase extends AbstractPostScriptTestCase { public void testResourceOptimizationWithIF() throws Exception { FOUserAgent ua = fopFactory.newFOUserAgent(); PSDocumentHandler handler = new PSDocumentHandler(); - handler.setUserAgent(ua); + handler.setContext(new IFContext(ua)); // This is the important part: we're enabling resource optimization handler.getPSUtil().setOptimizeResources(true); ua.setDocumentHandlerOverride(handler); diff --git a/test/layoutengine/standard-testcases/pcl-extension_1.xml b/test/layoutengine/standard-testcases/pcl-extension_1.xml new file mode 100644 index 000000000..f75f1f695 --- /dev/null +++ b/test/layoutengine/standard-testcases/pcl-extension_1.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> +<testcase> + <info> + <p> + This test checks the PostScript extension for custom setup code. The extension attachments need to show + up in the area tree XML so the AreaTreeParser can fully restore the area tree. + </p> + </info> + <fo> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:pcl="http://xmlgraphics.apache.org/fop/extensions/pcl"> + <fo:layout-master-set> + <fo:simple-page-master master-name="first" + page-width="148mm" page-height="210mm" margin="20mm" + pcl:paper-source="2" pcl:duplex-mode="1"> + <fo:region-body/> + </fo:simple-page-master> + <fo:simple-page-master master-name="second" + page-width="148mm" page-height="210mm" margin="20mm" + pcl:paper-source="1"> + <fo:region-body/> + </fo:simple-page-master> + <fo:page-sequence-master master-name="complex"> + <fo:repeatable-page-master-reference master-reference="first" maximum-repeats="1"/> + <fo:repeatable-page-master-reference master-reference="second"/> + </fo:page-sequence-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="complex"> + <fo:flow flow-name="xsl-region-body"> + <fo:block>Text on page <fo:page-number/>.</fo:block> + <fo:block break-before="page">Text on page <fo:page-number/>.</fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks xmlns:pcl="http://xmlgraphics.apache.org/fop/extensions/pcl"> + <eval expected="2" xpath="//pageViewport[@nr=1]/@pcl:paper-source"/> + <eval expected="1" xpath="//pageViewport[@nr=1]/@pcl:duplex-mode"/> + + <eval expected="1" xpath="//pageViewport[@nr=2]/@pcl:paper-source"/> + <true xpath="not(boolean(//pageViewport[@nr=2]/@pcl:duplex-mode))"/> + </checks> + <if-checks xmlns:if="http://xmlgraphics.apache.org/fop/intermediate" xmlns:pcl="http://xmlgraphics.apache.org/fop/extensions/pcl"> + <eval expected="2" xpath="//if:page[@index=0]/@pcl:paper-source"/> + <eval expected="1" xpath="//if:page[@index=0]/@pcl:duplex-mode"/> + + <eval expected="1" xpath="//if:page[@index=1]/@pcl:paper-source"/> + <true xpath="not(boolean(//if:page[@index=1]/@pcl:duplex-mode))"/> + </if-checks> +</testcase> |