Author: tilman
Date: Sun Jun 14 09:02:55 2026
New Revision: 1935278
Log:
PDFBOX-5660: Sonar fix
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
pdfbox/branches/2.0/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
Sun Jun 14 09:02:49 2026 (r1935277)
+++
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSNumber.java
Sun Jun 14 09:02:55 2026 (r1935278)
@@ -46,57 +46,52 @@ public abstract class TestCOSNumber exte
/**
* Tests get() - tests a static constructor for COSNumber classes.
+ *
+ * @throws IOException
*/
- public void testGet()
+ public void testGet() throws IOException
{
+ // 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"));
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"));
- try
- {
- assertEquals("Null Value...", COSNumber.get(null));
- fail("Failed to throw a NullPointerException");
- }
- catch (NullPointerException e)
- {
- // PASS
- }
- try
- {
- assertEquals(0, COSNumber.get("a"));
- fail("Failed to throw an IOException");
- }
- catch (IOException e)
- {
- // PASS
- }
- // PDFBOX-2569: some numbers start with "+"
- assertEquals(COSNumber.get("1"), COSNumber.get("+1"));
- assertEquals(COSNumber.get("123"), COSNumber.get("+123"));
+ assertEquals("Null Value...", COSNumber.get(null));
+ fail("Failed to throw a NullPointerException");
+ }
+ catch (NullPointerException e)
+ {
+ // PASS
+ }
+ try
+ {
+ assertEquals(0, COSNumber.get("a"));
+ fail("Failed to throw an IOException");
}
catch (IOException e)
{
- fail("Failed to convert a number " + e.getMessage());
+ // PASS
}
+ // PDFBOX-2569: some numbers start with "+"
+ assertEquals(COSNumber.get("1"), COSNumber.get("+1"));
+ assertEquals(COSNumber.get("123"), COSNumber.get("+123"));
}
/**
Modified:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
Sun Jun 14 09:02:49 2026 (r1935277)
+++
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
Sun Jun 14 09:02:55 2026 (r1935278)
@@ -101,22 +101,17 @@ public class TestCOSString extends TestC
/**
* Test parseHex() - tests that the proper String is created from a hex
string input.
+ *
+ * @throws IOException
*/
- public void testFromHex()
+ public 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);
try
{
COSString.parseHex(hexForm + "xx");
@@ -155,29 +150,24 @@ public class TestCOSString extends TestC
/**
* Test testGetString() - ensure getString() are returned in the correct
format.
+ *
+ * @throws IOException
*/
- public void testGetString()
+ public void testGetString() throws IOException
{
- try
- {
- String testStr = "Test subject for getString()";
- COSString test1 = new COSString(testStr);
- Assert.assertEquals(testStr, test1.getString());
-
- COSString hexStr = COSString.parseHex(createHex(testStr));
- Assert.assertEquals(testStr, hexStr.getString());
-
- COSString escapedString = new COSString(ESC_CHAR_STRING);
- Assert.assertEquals(ESC_CHAR_STRING, escapedString.getString());
-
- testStr = "Line1\nLine2\nLine3\n";
- COSString lineFeedString = new COSString(testStr);
- Assert.assertEquals(testStr, lineFeedString.getString());
- }
- catch (IOException e)
- {
- fail("IOException thrown: " + e.getMessage());
- }
+ String testStr = "Test subject for getString()";
+ COSString test1 = new COSString(testStr);
+ Assert.assertEquals(testStr, test1.getString());
+
+ COSString hexStr = COSString.parseHex(createHex(testStr));
+ Assert.assertEquals(testStr, hexStr.getString());
+
+ COSString escapedString = new COSString(ESC_CHAR_STRING);
+ Assert.assertEquals(ESC_CHAR_STRING, escapedString.getString());
+
+ testStr = "Line1\nLine2\nLine3\n";
+ COSString lineFeedString = new COSString(testStr);
+ Assert.assertEquals(testStr, lineFeedString.getString());
}
/**
Modified:
pdfbox/branches/2.0/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
==============================================================================
---
pdfbox/branches/2.0/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
Sun Jun 14 09:02:49 2026 (r1935277)
+++
pdfbox/branches/2.0/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
Sun Jun 14 09:02:55 2026 (r1935278)
@@ -46,135 +46,93 @@ public class TestCOSUtils
{
@Test
- public void testIsInteger()
+ public void testIsInteger() throws IOException
{
- try
- {
- COSObject co = new COSObject(COSInteger.get(10));
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isInteger(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isInteger(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(COSInteger.get(10));
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isInteger(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isInteger(co, doc);
+ doc.close();
}
@Test
- public void testIsFloat()
+ public void testIsFloat() throws IOException
{
- try
- {
- COSObject co = new COSObject(new COSFloat(10.0f));
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isFloat(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isFloat(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(new COSFloat(10.0f));
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isFloat(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isFloat(co, doc);
+ doc.close();
}
@Test
- public void testIsString()
+ public void testIsString() throws IOException
{
- try
- {
- COSObject co = new COSObject(new COSString(""));
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isString(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isString(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(new COSString(""));
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isString(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isString(co, doc);
+ doc.close();
}
@Test
- public void testIsStream()
+ public void testIsStream() throws IOException
{
- try
- {
- COSObject co = new COSObject(new COSStream());
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isStream(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isStream(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(new COSStream());
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isStream(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isStream(co, doc);
+ doc.close();
}
@Test
- public void testIsDictionary()
+ public void testIsDictionary() throws IOException
{
- try
- {
- COSObject co = new COSObject(new COSDictionary());
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isDictionary(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isDictionary(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(new COSDictionary());
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isDictionary(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isDictionary(co, doc);
+ doc.close();
}
@Test
- public void testIsArray()
+ public void testIsArray() throws IOException
{
- try
- {
- COSObject co = new COSObject(new COSArray());
- co.setGenerationNumber(0);
- co.setObjectNumber(10);
-
- assertFalse(COSUtils.isArray(co, new IOCOSDocument()));
-
- COSDocument doc = new COSDocument();
- addToXref(doc, new COSObjectKey(co), 1000);
- COSUtils.isArray(co, doc);
- doc.close();
- }
- catch (IOException e)
- {
- fail(e.getMessage());
- }
+ COSObject co = new COSObject(new COSArray());
+ co.setGenerationNumber(0);
+ co.setObjectNumber(10);
+
+ assertFalse(COSUtils.isArray(co, new IOCOSDocument()));
+
+ COSDocument doc = new COSDocument();
+ addToXref(doc, new COSObjectKey(co), 1000);
+ COSUtils.isArray(co, doc);
+ doc.close();
}
@Test
@@ -217,7 +175,6 @@ public class TestCOSUtils
IOCOSDocument() throws IOException
{
- super();
}
IOCOSDocument(File scratchDir) throws IOException
