You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/04/16 17:55:51 UTC
svn commit: r1876620 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
Author: tilman
Date: Thu Apr 16 17:55:51 2020
New Revision: 1876620
URL: http://svn.apache.org/viewvc?rev=1876620&view=rev
Log:
PDFBOX-4814: include asserts in test; have PD object return actual type
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java?rev=1876620&r1=1876619&r2=1876620&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java Thu Apr 16 17:55:51 2020
@@ -107,7 +107,7 @@ public class PDOptionalContentProperties
/** {@inheritDoc} */
@Override
- public COSBase getCOSObject()
+ public COSDictionary getCOSObject()
{
return this.dict;
}
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java?rev=1876620&r1=1876619&r2=1876620&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java Thu Apr 16 17:55:51 2020
@@ -20,6 +20,11 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import junit.framework.TestCase;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -116,7 +121,11 @@ public class PDFCloneUtilityTest extends
doc1.save(baos);
PDDocument doc2 = PDDocument.load(baos.toByteArray());
PDFMergerUtility merger = new PDFMergerUtility();
+ // The OCProperties is a direct object here, but gets saved as an indirect object.
+ assertTrue(doc1.getDocumentCatalog().getCOSObject().getItem(COSName.OCPROPERTIES) instanceof COSDictionary);
+ assertTrue(doc2.getDocumentCatalog().getCOSObject().getItem(COSName.OCPROPERTIES) instanceof COSObject);
merger.appendDocument(doc2, doc1);
+ assertEquals(2, doc2.getNumberOfPages());
doc2.close();
doc1.close();
}