You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by bd...@apache.org on 2006/09/15 14:05:26 UTC

svn commit: r446585 - in /xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf: BasePDFTestCase.java PDFAConformanceTestCase.java

Author: bdelacretaz
Date: Fri Sep 15 05:05:25 2006
New Revision: 446585

URL: http://svn.apache.org/viewvc?view=rev&rev=446585
Log:
BasePDFTestCase extracted from PDFAConformanceTestCase, will be used to create more PDF renderer tests

Added:
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java   (with props)
Modified:
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java

Added: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java?view=auto&rev=446585
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java (added)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java Fri Sep 15 05:05:25 2006
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package org.apache.fop.render.pdf;
+
+import java.io.File;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.MimeConstants;
+
+import junit.framework.TestCase;
+
+/** Base class for automated tests that create PDF files
+ *  $Id$ 
+ */
+
+public class BasePDFTestCase extends TestCase {
+  protected final FopFactory fopFactory = FopFactory.newInstance();
+  protected final TransformerFactory tFactory = TransformerFactory.newInstance();
+
+  protected BasePDFTestCase(String name) {
+    super(name);
+  }
+  
+  /**
+   * Convert a test FO file to PDF
+   * @param foFile the FO file
+   * @param ua the preconfigured user agent
+   * @param dumpPdfFile if true, dumps the generated PDF file to a file name (foFile).pdf and returns it as a File
+   * @throws Exception if the conversion fails
+   */
+  protected File convertFO(File foFile, FOUserAgent ua, boolean dumpPdfFile) throws Exception {
+      File outFile = null;
+      ByteArrayOutputStream baout = new ByteArrayOutputStream();
+      Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, ua, baout);
+      Transformer transformer = tFactory.newTransformer();
+      Source src = new StreamSource(foFile);
+      SAXResult res = new SAXResult(fop.getDefaultHandler());
+      transformer.transform(src, res);
+      if (dumpPdfFile) {
+          outFile = new File(foFile.getParentFile(), foFile.getName() + ".pdf");
+          FileUtils.writeByteArrayToFile(outFile, baout.toByteArray());
+      }
+      return outFile;
+  }
+}

Propchange: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java?view=diff&rev=446585&r1=446584&r2=446585
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java Fri Sep 15 05:05:25 2006
@@ -21,30 +21,16 @@
 
 import java.io.File;
 
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FopFactory;
-import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.pdf.PDFConformanceException;
 
-import junit.framework.TestCase;
-
 /**
  * Tests PDF/A-1 functionality.
  */
-public class PDFAConformanceTestCase extends TestCase {
+public class PDFAConformanceTestCase extends BasePDFTestCase {
 
-    private TransformerFactory tFactory = TransformerFactory.newInstance();
-    private FopFactory fopFactory = FopFactory.newInstance();
     private File foBaseDir = new File("test/xml/pdf-a");
+    private boolean dumpPDF = Boolean.getBoolean("PDFAConformanceTestCase.dumpPDF");
     
     /**
      * Main constructor
@@ -58,27 +44,12 @@
             throw new RuntimeException("Configuring the FopFactory failed: " + e.getMessage());
         }
     }
-    
-    /**
-     * Convert the test file
-     * @param foFile the FO file
-     * @param ua the preconfigured user agent
-     * @throws Exception if the conversion fails
-     */
-    protected void convertFO(File foFile, FOUserAgent ua) throws Exception {
-        ua.getRendererOptions().put("pdf-a-mode", "PDF/A-1b");
-        File outFile = null;
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, ua, baout);
-        Transformer transformer = tFactory.newTransformer();
-        Source src = new StreamSource(foFile);
-        SAXResult res = new SAXResult(fop.getDefaultHandler());
-        transformer.transform(src, res);
-        if (false) {
-            //Write to file for debugging
-            outFile = new File(foFile.getParentFile(), foFile.getName() + ".pdf");
-            FileUtils.writeByteArrayToFile(outFile, baout.toByteArray());
-        }
+
+    /** create an FOUserAgent for our tests */
+    protected FOUserAgent getUserAgent() {
+      final FOUserAgent a = fopFactory.newFOUserAgent();
+      a.getRendererOptions().put("pdf-a-mode", "PDF/A-1b");
+      return a;
     }
     
     /**
@@ -86,9 +57,8 @@
      * @throws Exception if the test fails
      */
     public void testAllOk() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
         File foFile = new File(foBaseDir, "minimal-pdf-a.fo");
-        convertFO(foFile, ua);
+        convertFO(foFile, getUserAgent(), dumpPDF);
     }
     
     /**
@@ -96,11 +66,11 @@
      * @throws Exception if the test fails
      */
     public void testNoEncryption() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
+        final FOUserAgent ua = getUserAgent();
         ua.getRendererOptions().put("owner-password", "mypassword"); //To enabled encryption
         File foFile = new File(foBaseDir, "minimal-pdf-a.fo");
         try {
-            convertFO(foFile, ua);
+            convertFO(foFile, ua, dumpPDF);
             fail("Expected PDFConformanceException. PDF/A-1 and PDF encryption don't go together.");
         } catch (PDFConformanceException e) {
             //Good!
@@ -112,10 +82,9 @@
      * @throws Exception if the test fails
      */
     public void testFontNotEmbedded() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
         File foFile = new File(foBaseDir, "base14-font.fo");
         try {
-            convertFO(foFile, ua);
+            convertFO(foFile, getUserAgent(), dumpPDF);
             fail("Expected PDFConformanceException. PDF/A-1 wants all fonts embedded.");
         } catch (PDFConformanceException e) {
             //Good!
@@ -127,10 +96,9 @@
      * @throws Exception if the test fails
      */
     public void testEPSUsage() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
         File foFile = new File(foBaseDir, "with-eps.fo");
         try {
-            convertFO(foFile, ua);
+            convertFO(foFile, getUserAgent(), dumpPDF);
             fail("Expected PDFConformanceException. PDF/A-1 does not allow PostScript XObjects.");
         } catch (PDFConformanceException e) {
             //Good!
@@ -142,13 +110,12 @@
      * @throws Exception if the test fails
      */
     public void testImages() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
         File foFile = new File(foBaseDir, "with-rgb-images.fo");
-        convertFO(foFile, ua);
+        convertFO(foFile, getUserAgent(), dumpPDF);
 
         foFile = new File(foBaseDir, "with-cmyk-images.fo");
         try {
-            convertFO(foFile, ua);
+            convertFO(foFile, getUserAgent(), dumpPDF);
             fail("Expected PDFConformanceException. PDF/A-1 does not allow PostScript XObjects.");
         } catch (PDFConformanceException e) {
             //Good!



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org