Cleanup tests
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1740065 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 541a57a..09f359b 100644
--- a/build.xml
+++ b/build.xml
@@ -423,6 +423,7 @@
<taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-build-tools-classpath"/>
<checkstyle config="checkstyle-5.5.xml" failonviolation="true" maxWarnings="0">
<fileset dir="${src.java.dir}" includes="**/*.java"/>
+ <fileset dir="test/java" includes="**/*.java"/>
<formatter type="plain"/>
</checkstyle>
</target>
@@ -437,7 +438,9 @@
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="libs-findbugs"/>
<findbugs home="${findbugs.home.dir}" output="text" reportLevel="low" effort="max" jvmargs="-Xmx1024m" warningsProperty="findbugs.warnings">
<sourcePath path="${src.java.dir}"/>
+ <sourcePath path="test/java"/>
<class location="${build.classes.dir}"/>
+ <class location="${build.unit.tests.dir}"/>
<auxClasspath>
<path refid="libs-build-classpath"/>
<path>
diff --git a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
index 1ecf7a6..37ac612 100644
--- a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
@@ -20,11 +20,8 @@
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
-import java.awt.image.DataBufferInt;
import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -36,9 +33,6 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.MemoryCacheImageInputStream;
-
import org.junit.Test;
import static org.mockito.Matchers.any;
@@ -58,10 +52,7 @@
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageInfo;
-import org.apache.xmlgraphics.image.loader.ImageSource;
-import org.apache.xmlgraphics.image.loader.impl.DefaultImageContext;
import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
-import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.xmlgraphics.image.loader.util.SoftMapCache;
import org.apache.xmlgraphics.java2d.GeneralGraphics2DImagePainter;
import org.apache.xmlgraphics.java2d.GraphicContext;
@@ -87,8 +78,6 @@
import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
import org.apache.fop.render.pdf.pdfbox.PDFBoxImageHandler;
import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
-import org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData;
-import org.apache.fop.render.pdf.pdfbox.PreloaderPDF;
import org.apache.fop.render.ps.PSDocumentHandler;
import org.apache.fop.render.ps.PSImageFormResource;
import org.apache.fop.render.ps.PSRenderingUtil;
@@ -112,7 +101,7 @@
private static final String Type1Subset2 = "test/resources/t1subset2.pdf";
private static final String Type1Subset3 = "test/resources/t1subset3.pdf";
private static final String Type1Subset4 = "test/resources/t1subset4.pdf";
- private static final String ROTATE = "test/resources/rotate.pdf";
+ protected static final String ROTATE = "test/resources/rotate.pdf";
private static final String SHADING = "test/resources/shading.pdf";
private static final String LINK = "test/resources/link.pdf";
private static final String IMAGE = "test/resources/image.pdf";
@@ -385,13 +374,6 @@
}
@Test
- public void testPreloaderPDF() throws Exception {
- ImageSource imageSource = new ImageSource(ImageIO.createImageInputStream(new File(ROTATE)), "", true);
- ImageInfo imageInfo = new PreloaderPDF().preloadImage("", imageSource, new DefaultImageContext());
- Assert.assertEquals(imageInfo.getMimeType(), "application/pdf");
- }
-
- @Test
public void testPSPDFGraphics2D() throws Exception {
ByteArrayOutputStream stream = pdfToPS(IMAGE);
Assert.assertTrue(stream.toString("UTF-8"),
@@ -459,20 +441,6 @@
return stream;
}
- @Test
- public void testPreloaderImageRawData() throws IOException, ImageException {
- PreloaderImageRawData p = new PreloaderImageRawData();
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- dos.writeInt(1);
- dos.writeInt(1);
- dos.writeInt(1);
- InputStream is = new ByteArrayInputStream(bos.toByteArray());
- ImageSource src = new ImageSource(new MemoryCacheImageInputStream(is), "", true);
- ImageInfo img = p.preloadImage(DataBufferInt.class.getName(), src, new DefaultImageContext());
- Assert.assertTrue(img.getOriginalImage() instanceof ImageRendered);
- }
-
static class FOPPSGeneratorImpl extends PSGenerator implements PSDocumentHandler.FOPPSGenerator {
public FOPPSGeneratorImpl(OutputStream out) {
super(out);
@@ -518,8 +486,8 @@
c.setPageNumbers(new HashMap<Integer, PDFArray>());
new PDFBoxImageHandler().handleImage(c, img, new Rectangle());
PDFResources res = c.getPage().getPDFResources();
- OutputStream bos = new ByteArrayOutputStream();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
res.output(bos);
- Assert.assertTrue(bos.toString().contains("/ExtGState << /GS1"));
+ Assert.assertTrue(bos.toString("UTF-8").contains("/ExtGState << /GS1"));
}
}
diff --git a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java b/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
index 5005485..700d1fc 100644
--- a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
@@ -21,24 +21,27 @@
import java.awt.geom.Rectangle2D;
-import junit.framework.Assert;
+import org.junit.Test;
-import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D;
-import org.apache.fop.render.pdf.pdfbox.ImagePDF;
-import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
+
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
-import org.junit.Test;
+
+import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D;
+import org.apache.fop.render.pdf.pdfbox.ImagePDF;
+import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
+
+import junit.framework.Assert;
public class PDFRotateTestCase {
-
+
@Test
- public void test() throws Exception {
+ public void test() throws Exception {
ImageConverterPDF2G2D i = new ImageConverterPDF2G2D();
ImageInfo imgi = new ImageInfo("a", "b");
PDDocument doc = new PDDocument();
@@ -48,7 +51,7 @@
Image img = new ImagePDF(imgi, doc);
ImageGraphics2D ig = (ImageGraphics2D)i.convert(img, null);
Rectangle2D rect = new Rectangle2D.Float(0, 0, 100, 100);
-
+
PSGraphics2D g2d = new PSPDFGraphics2D(true);
GraphicContext gc = new GraphicContext();
g2d.setGraphicContext(gc);
diff --git a/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java b/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
index ec5002c..854ea7d 100644
--- a/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
@@ -19,7 +19,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
import org.junit.Test;
@@ -32,7 +31,6 @@
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.fop.render.pdf.pdfbox.PageParentTreeFinder;
diff --git a/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java b/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
new file mode 100644
index 0000000..636c869
--- /dev/null
+++ b/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
@@ -0,0 +1,66 @@
+/*
+ * 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.awt.image.DataBufferInt;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.MemoryCacheImageInputStream;
+
+import org.junit.Test;
+
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSource;
+import org.apache.xmlgraphics.image.loader.impl.DefaultImageContext;
+import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
+
+import org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData;
+import org.apache.fop.render.pdf.pdfbox.PreloaderPDF;
+
+import junit.framework.Assert;
+
+public class PreloaderPDFTestCase {
+
+ @Test
+ public void testPreloaderImageRawData() throws IOException, ImageException {
+ PreloaderImageRawData p = new PreloaderImageRawData();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ DataOutputStream dos = new DataOutputStream(bos);
+ dos.writeInt(1);
+ dos.writeInt(1);
+ dos.writeInt(1);
+ InputStream is = new ByteArrayInputStream(bos.toByteArray());
+ ImageSource src = new ImageSource(new MemoryCacheImageInputStream(is), "", true);
+ ImageInfo img = p.preloadImage(DataBufferInt.class.getName(), src, new DefaultImageContext());
+ Assert.assertTrue(img.getOriginalImage() instanceof ImageRendered);
+ }
+
+ @Test
+ public void testPreloaderPDF() throws Exception {
+ ImageSource imageSource = new ImageSource(
+ ImageIO.createImageInputStream(new File(PDFBoxAdapterTestCase.ROTATE)), "", true);
+ ImageInfo imageInfo = new PreloaderPDF().preloadImage("", imageSource, new DefaultImageContext());
+ Assert.assertEquals(imageInfo.getMimeType(), "application/pdf");
+ }
+}
diff --git a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
index 6d4c392..2e16941 100644
--- a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
@@ -20,7 +20,6 @@
import java.awt.geom.Rectangle2D;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,7 +27,6 @@
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
