svn commit: r1935290 - pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/encryption

[tilman]

Author: tilman
Date: Sun Jun 14 12:00:58 2026
New Revision: 1935290

Log:
PDFBOX-5660: refactor

Modified:
   
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
       Sun Jun 14 11:57:54 2026        (r1935289)
+++ 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
       Sun Jun 14 12:00:58 2026        (r1935290)
@@ -41,6 +41,7 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import 
org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
+import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
 import org.apache.pdfbox.pdmodel.encryption.StandardSecurityHandler;
@@ -84,11 +85,9 @@ public class TestSymmetricKeyEncryption
     {
         testResultsDir.mkdirs();
 
-        if (Cipher.getMaxAllowedKeyLength("AES") != Integer.MAX_VALUE)
-        {
-            // we need strong encryption for these tests
-            fail("JCE unlimited strength jurisdiction policy files are not 
installed");
-        }
+        // we need strong encryption for these tests
+        assertEquals("JCE unlimited strength jurisdiction policy files are not 
installed",
+                Integer.MAX_VALUE, Cipher.getMaxAllowedKeyLength("AES"));
 
         permission = new AccessPermission();
         permission.setCanAssembleDocument(false);
@@ -119,37 +118,18 @@ public class TestSymmetricKeyEncryption
         restrAP.setCanExtractContent(false);
         restrAP.setCanModify(false);
 
-        byte[] inputFileAsByteArray = 
getFileResourceAsByteArray("PasswordSample-40bit.pdf");
-        checkPerms(inputFileAsByteArray, "owner", fullAP);
-        checkPerms(inputFileAsByteArray, "user", restrAP);
-        try
-        {
-            checkPerms(inputFileAsByteArray, "", null);
-            fail("wrong password not detected");
-        }
-        catch (IOException ex)
-        {
-            assertEquals("Cannot decrypt PDF, the password is incorrect", 
ex.getMessage());
-        }
+        
checkSeveralPerms(getFileResourceAsByteArray("PasswordSample-40bit.pdf"), 
fullAP, restrAP);
 
         restrAP.setCanAssembleDocument(false);
         restrAP.setCanExtractForAccessibility(false);
         restrAP.setCanPrintFaithful(false);
 
-        inputFileAsByteArray = 
getFileResourceAsByteArray("PasswordSample-128bit.pdf");
-        checkPerms(inputFileAsByteArray, "owner", fullAP);
-        checkPerms(inputFileAsByteArray, "user", restrAP);
-        try
-        {
-            checkPerms(inputFileAsByteArray, "", null);
-            fail("wrong password not detected");
-        }
-        catch (IOException ex)
-        {
-            assertEquals("Cannot decrypt PDF, the password is incorrect", 
ex.getMessage());
-        }
+        
checkSeveralPerms(getFileResourceAsByteArray("PasswordSample-128bit.pdf"), 
fullAP, restrAP);
+        
checkSeveralPerms(getFileResourceAsByteArray("PasswordSample-256bit.pdf"), 
fullAP, restrAP);
+    }
 
-        inputFileAsByteArray = 
getFileResourceAsByteArray("PasswordSample-256bit.pdf");
+    private void checkSeveralPerms(byte[] inputFileAsByteArray, 
AccessPermission fullAP, AccessPermission restrAP) throws IOException
+    {
         checkPerms(inputFileAsByteArray, "owner", fullAP);
         checkPerms(inputFileAsByteArray, "user", restrAP);
         try
@@ -157,7 +137,7 @@ public class TestSymmetricKeyEncryption
             checkPerms(inputFileAsByteArray, "", null);
             fail("wrong password not detected");
         }
-        catch (IOException ex)
+        catch (InvalidPasswordException ex)
         {
             assertEquals("Cannot decrypt PDF, the password is incorrect", 
ex.getMessage());
         }