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 2014/11/05 22:59:14 UTC
svn commit: r1636974 -
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
Author: tilman
Date: Wed Nov 5 21:59:13 2014
New Revision: 1636974
URL: http://svn.apache.org/r1636974
Log:
PDFBOX-2456: DRY refactoring
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
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=1636974&r1=1636973&r2=1636974&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 Wed Nov 5 21:59:13 2014
@@ -177,10 +177,6 @@ public class TestSymmetricKeyEncryption
try
{
- Assert.assertTrue(encryptedDoc.isEncrypted());
- DecryptionMaterial decryptionMaterial = new StandardDecryptionMaterial(PASSWORD);
- encryptedDoc.openProtection(decryptionMaterial);
-
AccessPermission newPermission = encryptedDoc.getCurrentAccessPermission();
Assert.assertEquals(numSrcPages, encryptedDoc.getNumberOfPages());
@@ -230,7 +226,9 @@ public class TestSymmetricKeyEncryption
}
}
- public PDDocument encrypt(int keyLength, int sizePriorToEncr,
+ // encrypt with keylength and permission, save, check sizes before and after encryption
+ // reopen, decrypt and return document
+ private PDDocument encrypt(int keyLength, int sizePriorToEncr,
PDDocument doc, String prefix, AccessPermission permission) throws IOException
{
AccessPermission ap = new AccessPermission();
@@ -244,10 +242,16 @@ public class TestSymmetricKeyEncryption
doc.save(pdfFile);
doc.close();
long sizeEncrypted = pdfFile.length();
- PDDocument encryptedDoc = PDDocument.load(pdfFile);
Assert.assertTrue(keyLength
+ "-bit encrypted pdf should not have same size as plain one",
sizeEncrypted != sizePriorToEncr);
+
+ //TODO try replacing this block with loadNonSeq()
+ PDDocument encryptedDoc = PDDocument.load(pdfFile);
+ Assert.assertTrue(encryptedDoc.isEncrypted());
+ DecryptionMaterial decryptionMaterial = new StandardDecryptionMaterial(PASSWORD);
+ encryptedDoc.openProtection(decryptionMaterial);
+
return encryptedDoc;
}
@@ -287,10 +291,6 @@ public class TestSymmetricKeyEncryption
try
{
- Assert.assertTrue(encryptedDoc.isEncrypted());
- DecryptionMaterial decryptionMaterial = new StandardDecryptionMaterial(PASSWORD);
- encryptedDoc.openProtection(decryptionMaterial);
-
AccessPermission permission = encryptedDoc.getCurrentAccessPermission();
File decryptedFile = new File(testResultsDir, "DecryptedContainsEmbedded-" + keyLength + "-bit.pdf");