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 2021/02/21 17:30:27 UTC
svn commit: r1886760 -
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
Author: tilman
Date: Sun Feb 21 17:30:27 2021
New Revision: 1886760
URL: http://svn.apache.org/viewvc?rev=1886760&view=rev
Log:
PDFBOX-4892: use try-with-resources
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.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=1886760&r1=1886759&r2=1886760&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 Sun Feb 21 17:30:27 2021
@@ -49,11 +49,9 @@ class TestPDDocumentCatalog
@Test
void retrievePageLabels() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = Loader.loadPDF(
+ TestPDDocumentCatalog.class.getResourceAsStream("test_pagelabels.pdf")))
{
- doc = Loader
- .loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test_pagelabels.pdf"));
PDDocumentCatalog cat = doc.getDocumentCatalog();
String[] labels = cat.getPageLabels().getLabelsByPageIndices();
assertEquals(12, labels.length);
@@ -70,13 +68,6 @@ class TestPDDocumentCatalog
assertEquals("Appendix I", labels[10]);
assertEquals("Appendix II", labels[11]);
}
- finally
- {
- if(doc != null)
- {
- doc.close();
- }
- }
}
/**
@@ -91,22 +82,13 @@ class TestPDDocumentCatalog
@Test
void retrievePageLabelsOnMalformedPdf() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = Loader
+ .loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("badpagelabels.pdf")))
{
- doc = Loader
- .loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("badpagelabels.pdf"));
PDDocumentCatalog cat = doc.getDocumentCatalog();
// getLabelsByPageIndices() should not throw an exception
cat.getPageLabels().getLabelsByPageIndices();
}
- finally
- {
- if(doc != null)
- {
- doc.close();
- }
- }
}
/**
@@ -122,21 +104,12 @@ class TestPDDocumentCatalog
@Test
void retrieveNumberOfPages() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf")))
{
- doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf"));
assertEquals(4, doc.getNumberOfPages());
}
- finally
- {
- if(doc != null)
- {
- doc.close();
- }
- }
}
-
+
/**
* Test OutputIntents functionality.
*
@@ -149,49 +122,31 @@ class TestPDDocumentCatalog
@Test
void handleOutputIntents() throws IOException
{
- PDDocument doc = null;
- InputStream colorProfile = null;
- try
+ try (InputStream colorProfile = TestPDDocumentCatalog.class.getResourceAsStream("sRGB.icc");
+ PDDocument doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf")))
{
-
- doc = Loader.loadPDF(TestPDDocumentCatalog.class.getResourceAsStream("test.unc.pdf"));
PDDocumentCatalog catalog = doc.getDocumentCatalog();
// retrieve OutputIntents
List<PDOutputIntent> outputIntents = catalog.getOutputIntents();
assertTrue(outputIntents.isEmpty());
-
- // add an OutputIntent
- colorProfile = TestPDDocumentCatalog.class.getResourceAsStream("sRGB.icc");
- // create output intent
+
+ // create and add output intent
PDOutputIntent oi = new PDOutputIntent(doc, colorProfile);
oi.setInfo("sRGB IEC61966-2.1");
oi.setOutputCondition("sRGB IEC61966-2.1");
oi.setOutputConditionIdentifier("sRGB IEC61966-2.1");
oi.setRegistryName("http://www.color.org");
doc.getDocumentCatalog().addOutputIntent(oi);
-
+
// retrieve OutputIntents
outputIntents = catalog.getOutputIntents();
assertEquals(1,outputIntents.size());
-
+
// set OutputIntents
catalog.setOutputIntents(outputIntents);
outputIntents = catalog.getOutputIntents();
- assertEquals(1,outputIntents.size());
-
- }
- finally
- {
- if(doc != null)
- {
- doc.close();
- }
-
- if (colorProfile != null)
- {
- colorProfile.close();
- }
+ assertEquals(1,outputIntents.size());
}
}
@@ -199,9 +154,10 @@ class TestPDDocumentCatalog
void handleBooleanInOpenAction() throws IOException
{
//PDFBOX-3772 -- allow for COSBoolean
- PDDocument doc = new PDDocument();
- doc.getDocumentCatalog().getCOSObject().setBoolean(COSName.OPEN_ACTION, false);
- assertNull(doc.getDocumentCatalog().getOpenAction());
- doc.close();
+ try (PDDocument doc = new PDDocument())
+ {
+ doc.getDocumentCatalog().getCOSObject().setBoolean(COSName.OPEN_ACTION, false);
+ assertNull(doc.getDocumentCatalog().getOpenAction());
+ }
}
}