You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2023/06/08 12:20:35 UTC
[xmlgraphics-fop-pdf-images] branch main updated: Move tests to correct package
This is an automated email from the ASF dual-hosted git repository.
ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop-pdf-images.git
The following commit(s) were added to refs/heads/main by this push:
new 559c53d Move tests to correct package
559c53d is described below
commit 559c53d412f261f48cb545d4d8c85a843091c173
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Thu Jun 8 13:15:46 2023 +0100
Move tests to correct package
---
.../apache/fop/render/pdf/StructureTreeMergerTestCase.java | 3 +--
.../apache/fop/render/pdf/TaggedPDFConductorTestCase.java | 5 ++---
.../pdf/{ => pdfbox}/DocumentRootModifierTestCase.java | 7 +------
.../pdf/{ => pdfbox}/FOPPDFSingleMultiByteFontTestCase.java | 8 ++------
.../pdf/{ => pdfbox}/ImageConverterPDF2AFPTestCase.java | 5 +----
.../pdf/{ => pdfbox}/ImageConverterPDF2G2DTestCase.java | 5 +----
.../fop/render/pdf/{ => pdfbox}/PDFBoxAdapterTestCase.java | 12 ++++--------
.../fop/render/pdf/{ => pdfbox}/PDFRotateTestCase.java | 8 +-------
.../fop/render/pdf/{ => pdfbox}/PDFWriterTestCase.java | 5 +----
.../render/pdf/{ => pdfbox}/PSPDFGraphics2DTestCase.java | 3 +--
.../pdf/{ => pdfbox}/PageParentTreeFinderTestCase.java | 4 +---
.../fop/render/pdf/{ => pdfbox}/PreloaderPDFTestCase.java | 7 +------
.../pdf/{ => pdfbox}/StructureTreeMergerUtilTestCase.java | 4 +---
.../org/apache/fop/render/pdf/{ => pdfbox}/2fonts.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/2fonts2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/NoParentTree.pdf | 0
.../fop/render/pdf/{ => pdfbox}/accessibleradiobuttons.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/annot.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/brokenLink.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffcid1.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffcid2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffsubrs.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffsubrs2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffsubrs3.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/cffsubrs4.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/classMap.pdf | Bin
.../apache/fop/render/pdf/{ => pdfbox}/emptyRowTable.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/error.pdf | Bin
.../apache/fop/render/pdf/{ => pdfbox}/fontsnotembedded.pdf | Bin
.../fop/render/pdf/{ => pdfbox}/fontsnotembeddedcid.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/formrotated.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/hello2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/helloWorld.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/image.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/libreoffice.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/link.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/linkTagged.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/loop.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/missingOBJR.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/otf.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/pattern.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/rotate.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/shading.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/simpleh.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/smask.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/t1subset.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/t1subset2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/t1subset3.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/t1subset4.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/taggedWorld.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttcid1.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttcid2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset2.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset3.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset5.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset6.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset7.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset8.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/ttsubset9.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/type0cff.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/type0tt.pdf | Bin
.../org/apache/fop/render/pdf/{ => pdfbox}/xform.pdf | Bin
63 files changed, 18 insertions(+), 58 deletions(-)
diff --git a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
index 7f2ab49..cc82ce9 100644
--- a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
@@ -46,11 +46,10 @@ import org.apache.fop.pdf.PDFResources;
import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
+import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapterTestCase;
import org.apache.fop.render.pdf.pdfbox.PageParentTreeFinder;
import org.apache.fop.render.pdf.pdfbox.StructureTreeMerger;
-
-
public class StructureTreeMergerTestCase {
private static final String LINK = "linkTagged.pdf";
private static final String BrokenLink = "brokenLink.pdf";
diff --git a/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java b/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
index 3344486..493739e 100644
--- a/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
@@ -38,10 +38,9 @@ import org.apache.fop.pdf.PDFPage;
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
+import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapterTestCase;
import org.apache.fop.render.pdf.pdfbox.TaggedPDFConductor;
-
-
public class TaggedPDFConductorTestCase {
private static final String LINK = "linkTagged.pdf";
private static final String HELLO = "helloWorld.pdf";
@@ -75,7 +74,7 @@ public class TaggedPDFConductorTestCase {
Assert.assertNull(elem.get("Alt"));
}
- private String print(PDFStructElem x) throws IOException {
+ private String print(PDFStructElem x) {
StringBuilder sb = new StringBuilder(x.get("S").toString());
if (x.getKids() != null) {
for (PDFObject k : x.getKids()) {
diff --git a/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/DocumentRootModifierTestCase.java
similarity index 96%
rename from test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/DocumentRootModifierTestCase.java
index c0eacea..bda146a 100644
--- a/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/DocumentRootModifierTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -35,11 +35,6 @@ import org.apache.fop.pdf.PDFPage;
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.pdf.PDFStructTreeRoot;
-import org.apache.fop.render.pdf.pdfbox.DocumentRootModifier;
-import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
-
-
-
public class DocumentRootModifierTestCase {
private static final String CLASSMAP = "classMap.pdf";
diff --git a/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleMultiByteFontTestCase.java
similarity index 97%
rename from test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleMultiByteFontTestCase.java
index 13877c7..a75cbf5 100644
--- a/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleMultiByteFontTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -45,12 +45,8 @@ import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
import org.apache.pdfbox.pdmodel.font.PDType0Font;
-import org.apache.fop.render.pdf.pdfbox.FOPPDFMultiByteFont;
-import org.apache.fop.render.pdf.pdfbox.FOPPDFSingleByteFont;
-import org.apache.fop.render.pdf.pdfbox.FontContainer;
-
public class FOPPDFSingleMultiByteFontTestCase {
- private COSDictionary getFont(PDDocument doc, String internalname) throws IOException {
+ private COSDictionary getFont(PDDocument doc, String internalname) {
PDPage page = doc.getPage(0);
PDResources sourcePageResources = page.getResources();
COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSObject().getDictionaryObject(COSName.FONT);
diff --git a/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFPTestCase.java
similarity index 93%
rename from test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFPTestCase.java
index 0ea3c65..8e13955 100644
--- a/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFPTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import org.junit.Assert;
import org.junit.Test;
@@ -27,9 +27,6 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
-import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP;
-import org.apache.fop.render.pdf.pdfbox.ImagePDF;
-
public class ImageConverterPDF2AFPTestCase {
@Test
public void testConverter() throws Exception {
diff --git a/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2DTestCase.java
similarity index 97%
rename from test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2DTestCase.java
index 4732935..efa957e 100644
--- a/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2DTestCase.java
@@ -16,7 +16,7 @@
*/
/* $Id: ImageConverterPDF2G2D.java 1808727 2017-09-18 15:02:56Z ssteiner $ */
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.Graphics2D;
import java.awt.Rectangle;
@@ -51,9 +51,6 @@ import org.apache.fop.fonts.FontUris;
import org.apache.fop.fonts.LazyFont;
import org.apache.fop.fonts.MultiByteFont;
import org.apache.fop.fonts.Typeface;
-import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D;
-import org.apache.fop.render.pdf.pdfbox.ImagePDF;
-import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
public class ImageConverterPDF2G2DTestCase {
private static final String FONTSNOTEMBEDDED = "fontsnotembedded.pdf";
diff --git a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterTestCase.java
similarity index 98%
rename from test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterTestCase.java
index 5e6d9a5..92f924b 100644
--- a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
@@ -89,12 +89,8 @@ import org.apache.fop.pdf.PDFResources;
import org.apache.fop.pdf.PDFStream;
import org.apache.fop.render.pcl.PCLGenerator;
import org.apache.fop.render.pcl.PCLGraphics2D;
-import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D;
-import org.apache.fop.render.pdf.pdfbox.ImagePDF;
-import org.apache.fop.render.pdf.pdfbox.MergeTTFonts;
-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.PDFContentGenerator;
+import org.apache.fop.render.pdf.PDFRenderingContext;
import org.apache.fop.render.ps.PSDocumentHandler;
import org.apache.fop.render.ps.PSImageFormResource;
import org.apache.fop.render.ps.PSRenderingUtil;
@@ -156,7 +152,7 @@ public class PDFBoxAdapterTestCase {
return new PDFBoxAdapter(pdfpage, new HashMap<>(), new HashMap<Integer, PDFArray>());
}
- protected static PDDocument load(String pdf) throws IOException {
+ public static PDDocument load(String pdf) throws IOException {
return PDDocument.load(PDFBoxAdapterTestCase.class.getResourceAsStream(pdf));
}
diff --git a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PDFRotateTestCase.java
similarity index 92%
rename from test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PDFRotateTestCase.java
index fc243c1..1b1b29c 100644
--- a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PDFRotateTestCase.java
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
@@ -37,12 +37,6 @@ import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
import org.apache.fop.pdf.PDFArray;
-import org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D;
-import org.apache.fop.render.pdf.pdfbox.ImagePDF;
-import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
-import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
-
-
public class PDFRotateTestCase {
diff --git a/test/java/org/apache/fop/render/pdf/PDFWriterTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PDFWriterTestCase.java
similarity index 96%
rename from test/java/org/apache/fop/render/pdf/PDFWriterTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PDFWriterTestCase.java
index bf0f08b..a88d594 100644
--- a/test/java/org/apache/fop/render/pdf/PDFWriterTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PDFWriterTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.Rectangle;
import java.io.ByteArrayInputStream;
@@ -27,9 +27,6 @@ import org.junit.Test;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.fop.render.pdf.pdfbox.PDFWriter;
-import org.apache.fop.render.pdf.pdfbox.UniqueName;
-
public class PDFWriterTestCase {
@Test
public void testFloat() throws IOException {
diff --git a/test/java/org/apache/fop/render/pdf/PSPDFGraphics2DTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2DTestCase.java
similarity index 96%
rename from test/java/org/apache/fop/render/pdf/PSPDFGraphics2DTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2DTestCase.java
index b3eadca..b7a785d 100644
--- a/test/java/org/apache/fop/render/pdf/PSPDFGraphics2DTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PSPDFGraphics2DTestCase.java
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.io.IOException;
import java.io.OutputStream;
@@ -32,7 +32,6 @@ import org.apache.pdfbox.pdmodel.common.function.PDFunction;
import org.apache.pdfbox.pdmodel.common.function.PDFunctionType0;
import org.apache.fop.render.gradient.Function;
-import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
public class PSPDFGraphics2DTestCase {
diff --git a/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PageParentTreeFinderTestCase.java
similarity index 97%
rename from test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PageParentTreeFinderTestCase.java
index 953592f..53570bd 100644
--- a/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PageParentTreeFinderTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.io.IOException;
@@ -34,8 +34,6 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.common.PDNumberTreeNode;
-import org.apache.fop.render.pdf.pdfbox.PageParentTreeFinder;
-
public class PageParentTreeFinderTestCase {
private static final String LINK = "linkTagged.pdf";
diff --git a/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDFTestCase.java
similarity index 94%
rename from test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDFTestCase.java
index 9936406..1fc5406 100644
--- a/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDFTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.awt.image.DataBufferInt;
import java.io.ByteArrayInputStream;
@@ -39,11 +39,6 @@ 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.ImagePDF;
-import org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF;
-import org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData;
-import org.apache.fop.render.pdf.pdfbox.PreloaderPDF;
-
public class PreloaderPDFTestCase {
@Test
diff --git a/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java b/test/java/org/apache/fop/render/pdf/pdfbox/StructureTreeMergerUtilTestCase.java
similarity index 95%
rename from test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
rename to test/java/org/apache/fop/render/pdf/pdfbox/StructureTreeMergerUtilTestCase.java
index 7b0c4dd..35448b7 100644
--- a/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/pdfbox/StructureTreeMergerUtilTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.fop.render.pdf;
+package org.apache.fop.render.pdf.pdfbox;
import java.util.List;
@@ -26,8 +26,6 @@ import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNull;
-import org.apache.fop.render.pdf.pdfbox.StructureTreeMergerUtil;
-
public class StructureTreeMergerUtilTestCase {
@Test
diff --git a/test/resources/org/apache/fop/render/pdf/2fonts.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/2fonts.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/2fonts.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/2fonts.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/2fonts2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/2fonts2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/2fonts2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/2fonts2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/NoParentTree.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/NoParentTree.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/NoParentTree.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/NoParentTree.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/accessibleradiobuttons.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/accessibleradiobuttons.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/accessibleradiobuttons.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/accessibleradiobuttons.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/annot.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/annot.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/annot.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/annot.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/brokenLink.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/brokenLink.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/brokenLink.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/brokenLink.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffcid1.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffcid1.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffcid1.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffcid1.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffcid2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffcid2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffcid2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffcid2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffsubrs.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffsubrs.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffsubrs2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffsubrs2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffsubrs3.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs3.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffsubrs3.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs3.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/cffsubrs4.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs4.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/cffsubrs4.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/cffsubrs4.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/classMap.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/classMap.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/classMap.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/classMap.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/emptyRowTable.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/emptyRowTable.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/emptyRowTable.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/emptyRowTable.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/error.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/error.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/error.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/error.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/fontsnotembedded.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/fontsnotembedded.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/fontsnotembedded.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/fontsnotembedded.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/fontsnotembeddedcid.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/fontsnotembeddedcid.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/fontsnotembeddedcid.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/fontsnotembeddedcid.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/formrotated.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/formrotated.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/formrotated.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/formrotated.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/hello2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/hello2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/hello2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/hello2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/helloWorld.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/helloWorld.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/helloWorld.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/helloWorld.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/image.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/image.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/image.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/image.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/libreoffice.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/libreoffice.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/libreoffice.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/libreoffice.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/link.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/link.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/link.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/link.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/linkTagged.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/linkTagged.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/linkTagged.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/linkTagged.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/loop.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/loop.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/loop.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/loop.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/missingOBJR.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/missingOBJR.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/missingOBJR.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/missingOBJR.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/otf.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/otf.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/otf.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/otf.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/pattern.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/pattern.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/pattern.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/pattern.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/rotate.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/rotate.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/rotate.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/rotate.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/shading.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/shading.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/shading.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/shading.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/simpleh.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/simpleh.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/simpleh.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/simpleh.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/smask.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/smask.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/smask.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/smask.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/t1subset.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/t1subset.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/t1subset.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/t1subset.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/t1subset2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/t1subset2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/t1subset2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/t1subset2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/t1subset3.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/t1subset3.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/t1subset3.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/t1subset3.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/t1subset4.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/t1subset4.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/t1subset4.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/t1subset4.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/taggedWorld.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/taggedWorld.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/taggedWorld.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/taggedWorld.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttcid1.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttcid1.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttcid1.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttcid1.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttcid2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttcid2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttcid2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttcid2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset2.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset2.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset2.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset2.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset3.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset3.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset3.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset3.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset5.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset5.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset5.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset5.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset6.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset6.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset6.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset6.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset7.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset7.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset7.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset7.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset8.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset8.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset8.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset8.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/ttsubset9.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset9.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/ttsubset9.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/ttsubset9.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/type0cff.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/type0cff.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/type0cff.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/type0cff.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/type0tt.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/type0tt.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/type0tt.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/type0tt.pdf
diff --git a/test/resources/org/apache/fop/render/pdf/xform.pdf b/test/resources/org/apache/fop/render/pdf/pdfbox/xform.pdf
similarity index 100%
rename from test/resources/org/apache/fop/render/pdf/xform.pdf
rename to test/resources/org/apache/fop/render/pdf/pdfbox/xform.pdf
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org