diff options
Diffstat (limited to 'pdf-as-tests/src/test/java/at')
4 files changed, 11 insertions, 17 deletions
diff --git a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/PDFASignatureTest.java b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/PDFASignatureTest.java index 4c3e754b..e661bbc2 100644 --- a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/PDFASignatureTest.java +++ b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/PDFASignatureTest.java @@ -12,6 +12,7 @@ import java.util.Collection; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.preflight.PreflightDocument; import org.apache.pdfbox.preflight.ValidationResult; import org.apache.pdfbox.preflight.exception.SyntaxValidationException; @@ -134,15 +135,12 @@ public class PDFASignatureTest extends SignatureTest { * null) */ private Pair<ValidationResult, Throwable> checkPDFAConformance(File fd) { - PreflightDocument document = null; ValidationResult result = null; try { PreflightParser parser = new PreflightParser(fd); - parser.parse(); - document = parser.getPreflightDocument(); - document.validate(); - document.close(); - result = document.getResult(); + try (PreflightDocument document = (PreflightDocument) parser.parse()){ + result = document.validate(); + } return new ImmutablePair<ValidationResult, Throwable>(result, null); } catch (SyntaxValidationException e) { logger.debug("The file " + fd.getName() @@ -158,10 +156,6 @@ public class PDFASignatureTest extends SignatureTest { + ") occurred, while validating the PDF-A conformance of " + fd.getName(), e); return new ImmutablePair<ValidationResult, Throwable>(result, e); - } finally { - if (document != null) { - IOUtils.closeQuietly((Closeable)document); - } } } diff --git a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java index 84d12cfb..5e40b4dd 100644 --- a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java +++ b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java @@ -19,6 +19,7 @@ import java.util.List; import javax.imageio.ImageIO; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; import org.junit.Assume; @@ -323,10 +324,10 @@ public class SignaturePositionTest extends SignatureTest { */ private BufferedImage captureImage(String fileName, int pageNumber) throws InterruptedException { try { - PDDocument signedPdf = PDDocument.load(new File(fileName)); - PDFRenderer renderer = new PDFRenderer(signedPdf); - return renderer.renderImage(pageNumber - 1, ZOOM); - + try (PDDocument signedPdf = Loader.loadPDF(new File(fileName))) { + PDFRenderer renderer = new PDFRenderer(signedPdf); + return renderer.renderImage(pageNumber - 1, ZOOM); + } } catch (IOException e) { fail(String .format("Not possible to capture page %d of file %s, because of %s.", diff --git a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignatureTest.java b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignatureTest.java index f0e47896..2de7d65e 100644 --- a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignatureTest.java +++ b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignatureTest.java @@ -11,7 +11,7 @@ import java.security.cert.CertificateException; import java.util.Map; import java.util.UUID; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import org.apache.commons.io.IOUtils; import org.junit.Rule; diff --git a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/provider/BaseSignatureDataProvider.java b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/provider/BaseSignatureDataProvider.java index 1ce78e14..629c9d1a 100644 --- a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/provider/BaseSignatureDataProvider.java +++ b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/provider/BaseSignatureDataProvider.java @@ -148,8 +148,7 @@ public abstract class BaseSignatureDataProvider { } else { String[] wildcards = testFilter.split(";"); childFiles = testDirFile - .listFiles((FilenameFilter) new WildcardFileFilter( - wildcards)); + .listFiles((FilenameFilter)WildcardFileFilter.builder().setWildcards(wildcards).get()); } int idx = 0; for (File child : childFiles) { |