Author: tilman
Date: Sun Apr 6 08:03:28 2025
New Revision: 1924859
URL: http://svn.apache.org/viewvc?rev=1924859&view=rev
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
Modified:
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java?rev=1924859&r1=1924858&r2=1924859&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
(original)
+++
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
Sun Apr 6 08:03:28 2025
@@ -36,7 +36,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.xmpbox.XMPMetadata;
import org.apache.xmpbox.schema.DublinCoreSchema;
import org.apache.xmpbox.xml.DomXmpParser;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.verapdf.gf.foundry.VeraGreenfieldFoundryProvider;
import org.verapdf.pdfa.Foundries;
@@ -51,12 +51,12 @@ import org.verapdf.pdfa.results.Validati
*/
class CreatePDFATest
{
- private final String outDir = "target/test-output";
+ private static final String OUTDIR = "target/test-output";
- @BeforeEach
- void setUp()
+ @BeforeAll
+ static void setUp()
{
- new File(outDir).mkdirs();
+ new File(OUTDIR).mkdirs();
}
/**
@@ -65,9 +65,8 @@ class CreatePDFATest
@Test
void testCreatePDFA() throws Exception
{
- System.out.println("testCreatePDFA");
- String pdfaFilename = outDir + "/PDFA.pdf";
- String signedPdfaFilename = outDir + "/PDFA_signed.pdf";
+ String pdfaFilename = OUTDIR + "/PDFA.pdf";
+ String signedPdfaFilename = OUTDIR + "/PDFA_signed.pdf";
String keystorePath =
"src/test/resources/org/apache/pdfbox/examples/signature/keystore.p12";
String message = "The quick brown fox jumps over the lazy dog
äöüÃÃÃà @°^²³ {[]}";
String dir =
"../pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/";
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java?rev=1924859&r1=1924858&r2=1924859&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
Sun Apr 6 08:03:28 2025
@@ -31,6 +31,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -81,7 +82,7 @@ class TestSymmetricKeyEncryption
*/
private static final Logger LOG =
LogManager.getLogger(TestSymmetricKeyEncryption.class);
- private static final File testResultsDir = new
File("target/test-output/crypto");
+ private static final File TESTRESULTSDIR = new
File("target/test-output/crypto");
private static AccessPermission permission;
@@ -89,9 +90,9 @@ class TestSymmetricKeyEncryption
static final String OWNERPASSWORD =
"abcdefghijk1234567890abcdefghijk1234567890";
@BeforeAll
- static void setUp() throws Exception
+ static void setUp() throws NoSuchAlgorithmException
{
- testResultsDir.mkdirs();
+ TESTRESULTSDIR.mkdirs();
if (Cipher.getMaxAllowedKeyLength("AES") != Integer.MAX_VALUE)
{
@@ -325,7 +326,7 @@ class TestSymmetricKeyEncryption
void testPDFBox4453() throws IOException
{
final int TESTCOUNT = 1000;
- File file = new File(testResultsDir,"PDFBOX-4453.pdf");
+ File file = new File(TESTRESULTSDIR,"PDFBOX-4453.pdf");
try (PDDocument doc = new PDDocument())
{
doc.addPage(new PDPage());
@@ -417,7 +418,7 @@ class TestSymmetricKeyEncryption
}
}
- File pdfFile = new File(testResultsDir, prefix + keyLength +
"-bit-" + (preferAES ? "AES" : "RC4") + "-decrypted.pdf");
+ File pdfFile = new File(TESTRESULTSDIR, prefix + keyLength +
"-bit-" + (preferAES ? "AES" : "RC4") + "-decrypted.pdf");
encryptedDoc.setAllSecurityToBeRemoved(true);
encryptedDoc.save(pdfFile);
}
@@ -439,7 +440,7 @@ class TestSymmetricKeyEncryption
doc.protect(spp);
- File pdfFile = new File(testResultsDir, prefix + keyLength + "-bit-" +
(preferAES ? "AES" : "RC4") + "-encrypted.pdf");
+ File pdfFile = new File(TESTRESULTSDIR, prefix + keyLength + "-bit-" +
(preferAES ? "AES" : "RC4") + "-encrypted.pdf");
doc.save(pdfFile);
doc.close();
@@ -493,7 +494,7 @@ class TestSymmetricKeyEncryption
PDComplexFileSpecification complexFileSpec = entry.getValue();
PDEmbeddedFile embeddedFile = complexFileSpec.getEmbeddedFile();
- File resultFile = new File(testResultsDir, name);
+ File resultFile = new File(TESTRESULTSDIR, name);
try (FileOutputStream fos = new FileOutputStream(resultFile);
InputStream is = embeddedFile.createInputStream())
{
@@ -514,7 +515,7 @@ class TestSymmetricKeyEncryption
PDDocument document =
Loader.loadPDF(inputFileWithEmbeddedFileAsByteArray);
try (PDDocument encryptedDoc = encrypt(keyLength, preferAES,
sizePriorToEncr, document, "ContainsEmbedded-", permission, userpassword,
ownerpassword))
{
- File decryptedFile = new File(testResultsDir,
"DecryptedContainsEmbedded-" + keyLength + "-bit-" + (preferAES ? "AES" :
"RC4") + ".pdf");
+ File decryptedFile = new File(TESTRESULTSDIR,
"DecryptedContainsEmbedded-" + keyLength + "-bit-" + (preferAES ? "AES" :
"RC4") + ".pdf");
encryptedDoc.setAllSecurityToBeRemoved(true);
encryptedDoc.save(decryptedFile);
