Author: tilman
Date: Sun Apr  6 08:03:33 2025
New Revision: 1924860

URL: http://svn.apache.org/viewvc?rev=1924860&view=rev
Log:
PDFBOX-5660: Sonar fix

Modified:
    
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
    
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
    
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java

Modified: 
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java?rev=1924860&r1=1924859&r2=1924860&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
 (original)
+++ 
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdfa/CreatePDFATest.java
 Sun Apr  6 08:03:33 2025
@@ -39,7 +39,7 @@ import org.apache.pdfbox.preflight.parse
 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;
@@ -53,12 +53,12 @@ import org.verapdf.pdfa.flavours.PDFAFla
  */
 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();
     }
 
     /**
@@ -67,9 +67,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/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java?rev=1924860&r1=1924859&r2=1924860&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
 (original)
+++ 
pdfbox/branches/3.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
 Sun Apr  6 08:03:33 2025
@@ -162,7 +162,7 @@ class TestCreateSignature
     }
 
     @BeforeAll
-    static void init() throws Exception
+    static void init() throws IOException, GeneralSecurityException
     {
         Security.addProvider(SecurityProvider.getProvider());
         certificateFactory = CertificateFactory.getInstance("X.509");

Modified: 
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java?rev=1924860&r1=1924859&r2=1924860&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
 (original)
+++ 
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
 Sun Apr  6 08:03:33 2025
@@ -30,6 +30,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;
@@ -82,7 +83,7 @@ class TestSymmetricKeyEncryption
      */
     private static final Log LOG = 
LogFactory.getLog(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;
 
@@ -90,9 +91,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)
         {
@@ -326,7 +327,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());
@@ -418,7 +419,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);
         }
@@ -440,7 +441,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();
@@ -494,7 +495,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())
         {
@@ -515,7 +516,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);
             


Reply via email to