Author: tilman
Date: Sun Jun 14 09:03:08 2026
New Revision: 1935279
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
Modified:
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
Sun Jun 14 09:02:55 2026 (r1935278)
+++
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
Sun Jun 14 09:03:08 2026 (r1935279)
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNotNull;
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.IOException;
@@ -52,39 +51,31 @@ abstract class TestCOSNumber extends Tes
* Tests get() - tests a static constructor for COSNumber classes.
*/
@Test
- void testGet()
+ void testGet() throws IOException
{
- try
- {
-
- // Ensure the basic static numbers are recognized
- assertEquals(COSInteger.ZERO, COSNumber.get("0"));
- assertEquals(COSInteger.ZERO, COSNumber.get("-"));
- assertEquals(COSInteger.ZERO, COSNumber.get("."));
- assertEquals(COSInteger.ONE, COSNumber.get("1"));
- assertEquals(COSInteger.TWO, COSNumber.get("2"));
- assertEquals(COSInteger.THREE, COSNumber.get("3"));
- // Test some arbitrary ints
- assertEquals(COSInteger.get(100), COSNumber.get("100"));
- assertEquals(COSInteger.get(256), COSNumber.get("256"));
- assertEquals(COSInteger.get(-1000), COSNumber.get("-1000"));
- assertEquals(COSInteger.get(2000), COSNumber.get("+2000"));
- // Some arbitrary floats
- assertEquals(new COSFloat(1.1f), COSNumber.get("1.1"));
- assertEquals(new COSFloat(100f), COSNumber.get("100.0"));
- assertEquals(new COSFloat(-100.001f), COSNumber.get("-100.001"));
- // according to the specs the exponential shall not be used
- // but obviously there some
- assertNotNull(COSNumber.get("-2e-006"));
- assertNotNull(COSNumber.get("-8e+05"));
-
- assertThrows(NullPointerException.class, () ->
COSNumber.get(null));
- assertThrows(IOException.class, () -> COSNumber.get("a"));
- }
- catch (IOException e)
- {
- fail("Failed to convert a number " + e.getMessage());
- }
+ // Ensure the basic static numbers are recognized
+ assertEquals(COSInteger.ZERO, COSNumber.get("0"));
+ assertEquals(COSInteger.ZERO, COSNumber.get("-"));
+ assertEquals(COSInteger.ZERO, COSNumber.get("."));
+ assertEquals(COSInteger.ONE, COSNumber.get("1"));
+ assertEquals(COSInteger.TWO, COSNumber.get("2"));
+ assertEquals(COSInteger.THREE, COSNumber.get("3"));
+ // Test some arbitrary ints
+ assertEquals(COSInteger.get(100), COSNumber.get("100"));
+ assertEquals(COSInteger.get(256), COSNumber.get("256"));
+ assertEquals(COSInteger.get(-1000), COSNumber.get("-1000"));
+ assertEquals(COSInteger.get(2000), COSNumber.get("+2000"));
+ // Some arbitrary floats
+ assertEquals(new COSFloat(1.1f), COSNumber.get("1.1"));
+ assertEquals(new COSFloat(100f), COSNumber.get("100.0"));
+ assertEquals(new COSFloat(-100.001f), COSNumber.get("-100.001"));
+ // according to the specs the exponential shall not be used
+ // but obviously there some
+ assertNotNull(COSNumber.get("-2e-006"));
+ assertNotNull(COSNumber.get("-8e+05"));
+
+ assertThrows(NullPointerException.class, () -> COSNumber.get(null));
+ assertThrows(IOException.class, () -> COSNumber.get("a"));
}
/**
@@ -121,14 +112,7 @@ abstract class TestCOSNumber extends Tes
@Test
void testInvalidNumber()
{
- try
- {
- COSNumber.get("18446744073307F448448");
- fail("Was expecting an IOException");
- }
- catch (IOException e)
- {
- }
+ assertThrows(IOException.class, () ->
COSNumber.get("18446744073307F448448"));
}
}
Modified:
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
Sun Jun 14 09:02:55 2026 (r1935278)
+++
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
Sun Jun 14 09:03:08 2026 (r1935279)
@@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNotEquals;
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.ByteArrayOutputStream;
import java.io.IOException;
@@ -89,23 +88,18 @@ class TestCOSString extends TestCOSBase
/**
* Test parseHex() - tests that the proper String is created from a hex
string input.
+ *
+ * @throws IOException
*/
@Test
- void testFromHex()
+ void testFromHex() throws IOException
{
String expected = "Quick and simple test";
String hexForm = createHex(expected);
- try
- {
- COSString test1 = COSString.parseHex(hexForm);
- writePDFTests("(" + expected + ")", test1);
- COSString test2 = COSString.parseHex(createHex(ESC_CHAR_STRING));
- writePDFTests("(" + ESC_CHAR_STRING_PDF_FORMAT + ")", test2);
- }
- catch (IOException e)
- {
- fail("IOException thrown: " + e.getMessage());
- }
+ COSString test1 = COSString.parseHex(hexForm);
+ writePDFTests("(" + expected + ")", test1);
+ COSString test2 = COSString.parseHex(createHex(ESC_CHAR_STRING));
+ writePDFTests("(" + ESC_CHAR_STRING_PDF_FORMAT + ")", test2);
assertThrows(IOException.class, () -> COSString.parseHex(hexForm +
"xx"),
"Should have thrown an IOException here");
}
@@ -138,30 +132,25 @@ class TestCOSString extends TestCOSBase
/**
* Test testGetString() - ensure getString() are returned in the correct
format.
+ *
+ * @throws IOException
*/
@Test
- void testGetString()
+ void testGetString() throws IOException
{
- try
- {
- String testStr = "Test subject for getString()";
- COSString test1 = new COSString(testStr);
- assertEquals(testStr, test1.getString());
-
- COSString hexStr = COSString.parseHex(createHex(testStr));
- assertEquals(testStr, hexStr.getString());
-
- COSString escapedString = new COSString(ESC_CHAR_STRING);
- assertEquals(ESC_CHAR_STRING, escapedString.getString());
-
- testStr = "Line1\nLine2\nLine3\n";
- COSString lineFeedString = new COSString(testStr);
- assertEquals(testStr, lineFeedString.getString());
- }
- catch (IOException e)
- {
- fail("IOException thrown: " + e.getMessage());
- }
+ String testStr = "Test subject for getString()";
+ COSString test1 = new COSString(testStr);
+ assertEquals(testStr, test1.getString());
+
+ COSString hexStr = COSString.parseHex(createHex(testStr));
+ assertEquals(testStr, hexStr.getString());
+
+ COSString escapedString = new COSString(ESC_CHAR_STRING);
+ assertEquals(ESC_CHAR_STRING, escapedString.getString());
+
+ testStr = "Line1\nLine2\nLine3\n";
+ COSString lineFeedString = new COSString(testStr);
+ assertEquals(testStr, lineFeedString.getString());
}
/**
