Upgrade PDFBox API to v2.0.6 (TomRoush#327)

Author: TomRoush

library/src/androidTest/java/com/tom_roush/fontbox/ttf/TTFSubsetterInstrumentationTest.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.tom_roush.fontbox.ttf;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.tom_roush.pdfbox.android.PDFBoxResourceLoader;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ *
+ * @author Tilman Hausherr
+ */
+public class TTFSubsetterInstrumentationTest
+{
+
+    private Context testContext;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        testContext = InstrumentationRegistry.getInstrumentation().getContext();
+        PDFBoxResourceLoader.init(testContext);
+    }
+
+    /**
+     * Test of PDFBOX-3757: check that postcript names that are not part of WGL4Names don't get
+     * shuffled in buildPostTable().
+     *
+     * @throws java.io.IOException
+     */
+    @Test
+    public void testPDFBox3757() throws IOException
+    {
+        InputStream testFile = testContext.getAssets().open("fontbox/ttf/LiberationSans-Regular.ttf");
+
+        TrueTypeFont ttf = new TTFParser().parse(testFile);
+        TTFSubsetter ttfSubsetter = new TTFSubsetter(ttf);
+        ttfSubsetter.add('Ö');
+        ttfSubsetter.add('\u200A');
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ttfSubsetter.writeToStream(baos);
+        TrueTypeFont subset = new TTFParser(true).parse(new ByteArrayInputStream(baos.toByteArray()));
+
+        assertEquals(5, subset.getNumberOfGlyphs());
+
+        assertEquals(0, subset.nameToGID(".notdef"));
+        assertEquals(1, subset.nameToGID("O"));
+        assertEquals(2, subset.nameToGID("Odieresis"));
+        assertEquals(3, subset.nameToGID("uni200A"));
+        assertEquals(4, subset.nameToGID("dieresis.uc"));
+
+        PostScriptTable pst = subset.getPostScript();
+        assertEquals(pst.getName(0), ".notdef");
+        assertEquals(pst.getName(1), "O");
+        assertEquals(pst.getName(2), "Odieresis");
+        assertEquals(pst.getName(3), "uni200A");
+        assertEquals(pst.getName(4), "dieresis.uc");
+
+        assertTrue("Hair space path should be empty", subset.getPath("uni200A").isEmpty());
+        assertFalse("UC dieresis path should not be empty", subset.getPath("dieresis.uc").isEmpty());
+
+        subset.close();
+    }
+}

library/src/androidTest/java/com/tom_roush/pdfbox/encryption/TestPublicKeyEncryption.java

@@ -20,7 +20,6 @@
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,26 +29,23 @@
 
 import javax.crypto.Cipher;
 
+import com.tom_roush.pdfbox.android.PDFBoxResourceLoader;
 import com.tom_roush.pdfbox.io.MemoryUsageSetting;
 import com.tom_roush.pdfbox.pdmodel.PDDocument;
 import com.tom_roush.pdfbox.pdmodel.encryption.AccessPermission;
 import com.tom_roush.pdfbox.pdmodel.encryption.PublicKeyProtectionPolicy;
 import com.tom_roush.pdfbox.pdmodel.encryption.PublicKeyRecipient;
-import com.tom_roush.pdfbox.android.PDFBoxResourceLoader;
 
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.fail;
+import junit.framework.TestCase;
 
 /**
  * Tests for public key encryption.
  *
  * @author Ben Litchfield
  */
-public class TestPublicKeyEncryption
+public class TestPublicKeyEncryption extends TestCase
 {
 
     private AccessPermission permission1;
@@ -64,7 +60,7 @@ public class TestPublicKeyEncryption
     private String password1;
     private String password2;
 
-    Context testContext;
+    private Context testContext;
     private final String path = "pdfbox/com/tom_roush/pdfbox/pdmodel/encryption/";
 
     /**
@@ -73,8 +69,11 @@ public class TestPublicKeyEncryption
     private PDDocument document;
 
 
-    @Before
-    public void setUp() throws Exception
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setUp() throws Exception
     {
         if (Cipher.getMaxAllowedKeyLength("AES") != Integer.MAX_VALUE)
         {
@@ -114,19 +113,14 @@ public void setUp() throws Exception
         keyStore1 = "test1.pfx";
         keyStore2 = "test2.pfx";
 
-        InputStream input = testContext.getAssets().open(path + "test.pdf");
-        try
-        {
-            document = PDDocument.load(input);
-        }
-        finally
-        {
-            input.close();
-        }
+        document = PDDocument.load(testContext.getAssets().open(path + "test.pdf"));
     }
 
-    @After
-    public void tearDown() throws Exception
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void tearDown() throws Exception
     {
         document.close();
     }
@@ -137,7 +131,6 @@ public void tearDown() throws Exception
      *
      * @throws Exception If there is an unexpected error during the test.
      */
-    @Test
     public void testProtectionError() throws Exception
     {
         PublicKeyProtectionPolicy policy = new PublicKeyProtectionPolicy();
@@ -155,7 +148,7 @@ public void testProtectionError() throws Exception
         {
             String msg = ex.getMessage();
             Assert.assertTrue("not the expected exception: " + msg,
-                    msg.contains("serial-#: rid 2 vs. cert 3"));
+                msg.contains("serial-#: rid 2 vs. cert 3"));
         }
         finally
         {
@@ -173,7 +166,6 @@ public void testProtectionError() throws Exception
      *
      * @throws Exception If there is an unexpected error during the test.
      */
-    @Test
     public void testProtection() throws Exception
     {
         PublicKeyProtectionPolicy policy = new PublicKeyProtectionPolicy();
@@ -186,7 +178,7 @@ public void testProtection() throws Exception
             Assert.assertTrue(encryptedDoc.isEncrypted());
 
             AccessPermission permission =
-                    encryptedDoc.getCurrentAccessPermission();
+                encryptedDoc.getCurrentAccessPermission();
             Assert.assertFalse(permission.canAssembleDocument());
             Assert.assertFalse(permission.canExtractContent());
             Assert.assertTrue(permission.canExtractForAccessibility());
@@ -208,7 +200,6 @@ public void testProtection() throws Exception
      *
      * @throws Exception If there is an error during the test.
      */
-    @Test
     public void testMultipleRecipients() throws Exception
     {
         PublicKeyProtectionPolicy policy = new PublicKeyProtectionPolicy();
@@ -221,7 +212,7 @@ public void testMultipleRecipients() throws Exception
         try
         {
             AccessPermission permission =
-                    encryptedDoc1.getCurrentAccessPermission();
+                encryptedDoc1.getCurrentAccessPermission();
             Assert.assertFalse(permission.canAssembleDocument());
             Assert.assertFalse(permission.canExtractContent());
             Assert.assertTrue(permission.canExtractForAccessibility());
@@ -241,7 +232,7 @@ public void testMultipleRecipients() throws Exception
         try
         {
             AccessPermission permission =
-                    encryptedDoc2.getCurrentAccessPermission();
+                encryptedDoc2.getCurrentAccessPermission();
             Assert.assertFalse(permission.canAssembleDocument());
             Assert.assertFalse(permission.canExtractContent());
             Assert.assertTrue(permission.canExtractForAccessibility());
@@ -265,14 +256,14 @@ public void testMultipleRecipients() throws Exception
      * @param decryptionPassword password to be used to decrypt the doc
      * @param keyStore password to be used to decrypt the doc
      * @return reloaded document
-     * @throws Exception if
+     * @throws Exception if 
      */
     private PDDocument reload(PDDocument doc, String decryptionPassword, InputStream keyStore)
-            throws IOException, NoSuchAlgorithmException
+        throws IOException, NoSuchAlgorithmException
     {
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        doc.save(buffer);
-        return PDDocument.load(new ByteArrayInputStream(buffer.toByteArray()), decryptionPassword,
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        doc.save(baos);
+        return PDDocument.load(baos.toByteArray(), decryptionPassword,
             keyStore, null, MemoryUsageSetting.setupMainMemoryOnly());
     }
 
@@ -294,7 +285,7 @@ private PublicKeyRecipient getRecipient(String certificate, AccessPermission per
             PublicKeyRecipient recipient = new PublicKeyRecipient();
             recipient.setPermission(permission);
             recipient.setX509(
-                    (X509Certificate) factory.generateCertificate(input));
+                (X509Certificate) factory.generateCertificate(input));
             return recipient;
         }
         finally