You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2022/08/02 05:23:32 UTC

svn commit: r1903181 - in /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel: TestPDDocumentCatalog.java TestPDDocumentInformation.java TestPDPageTree.java

Author: lehmi
Date: Tue Aug  2 05:23:32 2022
New Revision: 1903181

URL: http://svn.apache.org/viewvc?rev=1903181&view=rev
Log:
PDFBOX-5483: replace InputStream with RandomAccessRead

Modified:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java?rev=1903181&r1=1903180&r2=1903181&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java Tue Aug  2 05:23:32 2022
@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -49,8 +50,8 @@ class TestPDDocumentCatalog
     @Test
     void retrievePageLabels() throws IOException
     {
-        try (PDDocument doc = Loader.loadPDF(
-                TestPDDocumentCatalog.class.getResourceAsStream("test_pagelabels.pdf")))
+        try (PDDocument doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDDocumentCatalog.class.getResourceAsStream("test_pagelabels.pdf"))))
         {
             PDDocumentCatalog cat = doc.getDocumentCatalog();
             String[] labels = cat.getPageLabels().getLabelsByPageIndices();
@@ -83,7 +84,8 @@ class TestPDDocumentCatalog
     void retrievePageLabelsOnMalformedPdf() throws IOException
     {
         try (PDDocument doc = Loader
-                .loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("badpagelabels.pdf")))
+                .loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                        TestPDDocumentCatalog.class.getResourceAsStream("badpagelabels.pdf"))))
         {
             PDDocumentCatalog cat = doc.getDocumentCatalog();
             // getLabelsByPageIndices() should not throw an exception
@@ -104,7 +106,8 @@ class TestPDDocumentCatalog
     @Test
     void retrieveNumberOfPages() throws IOException
     {
-        try (PDDocument doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf")))
+        try (PDDocument doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf"))))
         {
             assertEquals(4, doc.getNumberOfPages());
         }
@@ -123,7 +126,8 @@ class TestPDDocumentCatalog
     void handleOutputIntents() throws IOException
     {
         try (InputStream colorProfile = TestPDDocumentCatalog.class.getResourceAsStream("sRGB.icc");
-             PDDocument doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf")))
+                PDDocument doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                        TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf"))))
         {
             PDDocumentCatalog catalog = doc.getDocumentCatalog();
 

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java?rev=1903181&r1=1903180&r2=1903181&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java Tue Aug  2 05:23:32 2022
@@ -26,6 +26,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -77,8 +78,8 @@ class TestPDDocumentInformation
     @Test
     void testPDFBox3068() throws Exception
     {
-        try (PDDocument doc = Loader
-                .loadPDF(TestPDDocumentInformation.class.getResourceAsStream("PDFBOX-3068.pdf")))
+        try (PDDocument doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                        TestPDDocumentInformation.class.getResourceAsStream("PDFBOX-3068.pdf"))))
         {
             PDDocumentInformation documentInformation = doc.getDocumentInformation();
             assertEquals("Title", documentInformation.getTitle());

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java?rev=1903181&r1=1903180&r2=1903181&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java Tue Aug  2 05:23:32 2022
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Asse
 import java.io.IOException;
 
 import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 
@@ -47,7 +48,8 @@ class TestPDPageTree
     @Test
     void indexOfPageFromOutlineDestination() throws IOException
     {
-        doc = Loader.loadPDF(TestPDPageTree.class.getResourceAsStream("with_outline.pdf"));
+        doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDPageTree.class.getResourceAsStream("with_outline.pdf")));
         PDDocumentOutline outline = doc.getDocumentCatalog().getDocumentOutline();
         for (PDOutlineItem current : outline.children())
         {
@@ -61,7 +63,8 @@ class TestPDPageTree
     @Test
     void positiveSingleLevel() throws IOException
     {
-        doc = Loader.loadPDF(TestPDPageTree.class.getResourceAsStream("with_outline.pdf"));
+        doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDPageTree.class.getResourceAsStream("with_outline.pdf")));
         for (int i = 0; i < doc.getNumberOfPages(); i++)
         {
             assertEquals(i, doc.getPages().indexOf(doc.getPage(i)));
@@ -71,8 +74,8 @@ class TestPDPageTree
     @Test
     void positiveMultipleLevel() throws IOException
     {
-        doc = Loader
-                .loadPDF(TestPDPageTree.class.getResourceAsStream("page_tree_multiple_levels.pdf"));
+        doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDPageTree.class.getResourceAsStream("page_tree_multiple_levels.pdf")));
         for (int i = 0; i < doc.getNumberOfPages(); i++)
         {
             assertEquals(i, doc.getPages().indexOf(doc.getPage(i)));
@@ -82,7 +85,8 @@ class TestPDPageTree
     @Test
     void negative() throws IOException
     {
-        doc = Loader.loadPDF(TestPDPageTree.class.getResourceAsStream("with_outline.pdf"));
+        doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(
+                TestPDPageTree.class.getResourceAsStream("with_outline.pdf")));
         assertEquals(-1, doc.getPages().indexOf(new PDPage()));
     }