PDFBOX-5660: Sonar fix

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1935335 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java

@@ -18,8 +18,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -95,11 +95,9 @@ public static Collection<Integer> keyLengths()
     @BeforeAll
     static void init() throws NoSuchAlgorithmException
     {
-        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(Integer.MAX_VALUE, Cipher.getMaxAllowedKeyLength("AES"),
+                "JCE unlimited strength jurisdiction policy files are not installed");
         TESTRESULTSDIR.mkdirs();
     }
 
@@ -169,16 +167,11 @@ void testProtectionError(int keyLength) throws IOException
         document.protect(policy);
 
         File file = save("testProtectionError");
-        try (PDDocument encryptedDoc = reload(file, password2, getKeyStore(keyStore2)))
-        {
-            assertTrue(encryptedDoc.isEncrypted());
-            fail("No exception when using an incorrect decryption key");
-        }
-        catch (IOException ex)
-        {
-            String msg = ex.getMessage();
-            assertTrue(msg.contains("serial-#: rid 2 vs. cert 3"), "not the expected exception: " + msg);
-        }
+        IOException ex = assertThrows(IOException.class,
+                () -> reload(file, password2, getKeyStore(keyStore2)),
+                "No exception when using an incorrect decryption key");
+        String msg = ex.getMessage();
+        assertTrue(msg.contains("serial-#: rid 2 vs. cert 3"), "not the expected exception: " + msg);
     }
 
 

pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestBaseParser.java

@@ -18,7 +18,6 @@
 package org.apache.pdfbox.pdfparser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,10 +41,6 @@ void testBaseParserStackOverflow()
         {
             assertEquals("Missing root object specification in trailer.", exception.getMessage());
         }
-        catch (Exception exception)
-        {
-            fail("Unexpected Exception");
-        }
     }
 
 }

pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestEmbeddedFiles.java

@@ -20,7 +20,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -69,10 +68,6 @@ void testNullEmbeddedFile() throws IOException
             assertNull(spec.getFile());
             assertNull(spec.getEmbeddedFile());
         }
-        catch (NullPointerException e)
-        {
-            fail("null pointer exception");
-        }
         assertTrue(ok, "Was able to get file without exception");
         assertNull(embeddedFile, "EmbeddedFile was correctly null");
     }

pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java

@@ -52,7 +52,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -851,16 +850,11 @@ void testSurrogatePairCharacterExceptionIsValidCodePoint() throws IOException
                 contents.beginText();
                 contents.setFont(font, 64);
                 contents.newLineAtOffset(100, 700);
-                contents.showText(message);
+                IllegalStateException ex =
+                        assertThrows(IllegalStateException.class, () -> contents.showText(message));
+                assertEquals("could not find the glyphId for the character: 𩸽, codePoint: 171581 (0x29E3D)" ,ex.getMessage());
                 contents.endText();
             }
-            catch (IllegalStateException e)
-            {
-                assertEquals("could not find the glyphId for the character: 𩸽, codePoint: 171581 (0x29E3D)", e.getMessage());
-                return;
-            }
-
-            fail();
         }
     }