Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46D1A1736A for ; Wed, 29 Oct 2014 17:28:39 +0000 (UTC) Received: (qmail 99755 invoked by uid 500); 29 Oct 2014 17:28:39 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 99733 invoked by uid 500); 29 Oct 2014 17:28:39 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 99724 invoked by uid 99); 29 Oct 2014 17:28:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2014 17:28:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2014 17:28:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EC8B223889ED; Wed, 29 Oct 2014 17:27:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1635212 - /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Date: Wed, 29 Oct 2014 17:27:14 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141029172714.EC8B223889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tilman Date: Wed Oct 29 17:27:14 2014 New Revision: 1635212 URL: http://svn.apache.org/r1635212 Log: PDFBOX-2460: improved test to check for correct exception message as suggested by Ralf Hauser; code cleanup Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java?rev=1635212&r1=1635211&r2=1635212&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Wed Oct 29 17:27:14 2014 @@ -31,6 +31,7 @@ import org.apache.pdfbox.pdmodel.encrypt import org.apache.pdfbox.pdmodel.encryption.PublicKeyProtectionPolicy; import org.apache.pdfbox.pdmodel.encryption.PublicKeyRecipient; import junit.framework.TestCase; +import org.apache.pdfbox.pdmodel.encryption.PublicKeySecurityHandler; import org.junit.Assert; /** @@ -128,20 +129,25 @@ public class TestPublicKeyEncryption ext policy.addRecipient(recipient1); document.protect(policy); - PDDocument encrypted = reload(document); + PDDocument encryptedDoc = reload(document); try { - Assert.assertTrue(encrypted.isEncrypted()); - encrypted.openProtection(decryption2); + Assert.assertTrue(encryptedDoc.isEncrypted()); + PublicKeySecurityHandler securityHandler + = (PublicKeySecurityHandler) encryptedDoc.getEncryption().getSecurityHandler(); + securityHandler.setVerbose(true); + encryptedDoc.openProtection(decryption2); fail("No exception when using an incorrect decryption key"); } catch (IOException ex) { - // do nothing + String msg = ex.getMessage(); + Assert.assertTrue("not the expected exception: " + msg, + msg.contains("serial-#: rid 2 vs. cert 3")); } finally { - encrypted.close(); + encryptedDoc.close(); } } @@ -158,14 +164,14 @@ public class TestPublicKeyEncryption ext policy.addRecipient(recipient1); document.protect(policy); - PDDocument encrypted = reload(document); + PDDocument encryptedDoc = reload(document); try { - Assert.assertTrue(encrypted.isEncrypted()); - encrypted.openProtection(decryption1); + Assert.assertTrue(encryptedDoc.isEncrypted()); + encryptedDoc.openProtection(decryption1); AccessPermission permission = - encrypted.getCurrentAccessPermission(); + encryptedDoc.getCurrentAccessPermission(); Assert.assertFalse(permission.canAssembleDocument()); Assert.assertFalse(permission.canExtractContent()); Assert.assertTrue(permission.canExtractForAccessibility()); @@ -177,7 +183,7 @@ public class TestPublicKeyEncryption ext } finally { - encrypted.close(); + encryptedDoc.close(); } } @@ -195,13 +201,13 @@ public class TestPublicKeyEncryption ext document.protect(policy); // open first time - PDDocument encrypted1 = reload(document); + PDDocument encryptedDoc1 = reload(document); try { - encrypted1.openProtection(decryption1); + encryptedDoc1.openProtection(decryption1); AccessPermission permission = - encrypted1.getCurrentAccessPermission(); + encryptedDoc1.getCurrentAccessPermission(); Assert.assertFalse(permission.canAssembleDocument()); Assert.assertFalse(permission.canExtractContent()); Assert.assertTrue(permission.canExtractForAccessibility()); @@ -213,17 +219,17 @@ public class TestPublicKeyEncryption ext } finally { - encrypted1.close(); + encryptedDoc1.close(); } // open second time - PDDocument encrypted2 = reload(document); + PDDocument encryptedDoc2 = reload(document); try { - encrypted2.openProtection(decryption2); + encryptedDoc2.openProtection(decryption2); AccessPermission permission = - encrypted2.getCurrentAccessPermission(); + encryptedDoc2.getCurrentAccessPermission(); Assert.assertFalse(permission.canAssembleDocument()); Assert.assertFalse(permission.canExtractContent()); Assert.assertTrue(permission.canExtractForAccessibility()); @@ -235,7 +241,7 @@ public class TestPublicKeyEncryption ext } finally { - encrypted2.close(); + encryptedDoc2.close(); } }