diff options
Diffstat (limited to 'test/java/org/apache/fop/pdf/xref')
4 files changed, 11 insertions, 7 deletions
diff --git a/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java b/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java index b7a326c64..b58d2f93e 100644 --- a/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java +++ b/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java @@ -27,6 +27,8 @@ import org.junit.Test; import static org.junit.Assert.assertArrayEquals; +import org.apache.fop.pdf.PDFObjectNumber; + public class CompressedObjectReferenceTestCase extends ObjectReferenceTest { @Test @@ -41,7 +43,7 @@ public class CompressedObjectReferenceTestCase extends ObjectReferenceTest { private void runTest(List<Integer> expectedObjectStreamBytes, int index) throws IOException { int objectStreamNumber = (int) computeNumberFromBytes(expectedObjectStreamBytes); - sut = new CompressedObjectReference(0, objectStreamNumber, index); + sut = new CompressedObjectReference(new PDFObjectNumber(0), new PDFObjectNumber(objectStreamNumber), index); byte[] expected = createExpectedOutput((byte) 2, expectedObjectStreamBytes, index); byte[] actual = getActualOutput(); assertArrayEquals(expected, actual); diff --git a/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java b/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java index cd55577cd..513f0d754 100644 --- a/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java +++ b/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java @@ -52,7 +52,7 @@ public abstract class CrossReferenceObjectTest { pdfDocument = new PDFDocument("Apache FOP"); Map<String, List<String>> filterMap = pdfDocument.getFilterMap(); filterMap.put("default", Arrays.asList("null")); - PDFRoot root = new PDFRoot(1, new PDFPages(10)); + PDFRoot root = new PDFRoot(pdfDocument, new PDFPages(pdfDocument)); PDFInfo info = new PDFInfo(); info.setObjectNumber(2); byte[] fileID = diff --git a/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java b/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java index 3e609635d..e0e8aef78 100644 --- a/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java +++ b/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java @@ -29,6 +29,8 @@ import java.util.List; import org.junit.Test; +import org.apache.fop.pdf.PDFObjectNumber; + public class CrossReferenceStreamTestCase extends CrossReferenceObjectTest { private List<Long> uncompressedObjectOffsets; @@ -54,7 +56,7 @@ public class CrossReferenceStreamTestCase extends CrossReferenceObjectTest { @Test public void testWithObjectStreams1() throws IOException { List<CompressedObjectReference> compressedObjectReferences = - Arrays.asList(new CompressedObjectReference(2, 1, 0)); + Arrays.asList(new CompressedObjectReference(new PDFObjectNumber(2), new PDFObjectNumber(1), 0)); test(Arrays.asList(0L, null), compressedObjectReferences); } @@ -72,8 +74,8 @@ public class CrossReferenceStreamTestCase extends CrossReferenceObjectTest { for (int index = 0; index < numCompressedObjects; index++) { indirectObjectOffsets.add(null); int obNum = numIndirectObjects + index + 1; - compressedObjectReferences.add(new CompressedObjectReference(obNum, - numIndirectObjects, index)); + compressedObjectReferences.add(new CompressedObjectReference(new PDFObjectNumber(obNum), + new PDFObjectNumber(numIndirectObjects), index)); } test(indirectObjectOffsets, compressedObjectReferences); } @@ -108,7 +110,7 @@ public class CrossReferenceStreamTestCase extends CrossReferenceObjectTest { objectReferences.add(offset == null ? null : new UncompressedObjectReference(offset)); } for (CompressedObjectReference ref : compressedObjectReferences) { - objectReferences.set(ref.getObjectNumber() - 1, ref); + objectReferences.set(ref.getObjectNumber().getNumber() - 1, ref); } int maxObjectNumber = objectReferences.size() + 1; ByteArrayOutputStream stream = new ByteArrayOutputStream(); diff --git a/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java b/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java index 12f6e3c1b..1c609e30f 100644 --- a/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java +++ b/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java @@ -53,7 +53,7 @@ public class CrossReferenceTableTestCase extends CrossReferenceObjectTest { @Override protected CrossReferenceObject createCrossReferenceObject() { - return new CrossReferenceTable(trailerDictionary, STARTXREF, offsets); + return new CrossReferenceTable(trailerDictionary, STARTXREF, offsets, 0, offsets.size(), offsets.size()); } @Override |