You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/09/09 06:19:29 UTC

svn commit: r1881578 - in /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: pdmodel/graphics/image/CCITTFactoryTest.java pdmodel/graphics/image/LosslessFactoryTest.java util/TestNumberFormatUtil.java

Author: tilman
Date: Wed Sep  9 06:19:28 2020
New Revision: 1881578

URL: http://svn.apache.org/viewvc?rev=1881578&view=rev
Log:
PDFBOX-4892: SonarQube fix

Modified:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestNumberFormatUtil.java

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java?rev=1881578&r1=1881577&r2=1881578&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java Wed Sep  9 06:19:28 2020
@@ -36,6 +36,7 @@ import org.apache.pdfbox.pdmodel.graphic
 
 import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.checkIdent;
 import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.validate;
+import org.junit.Assert;
 
 /**
  * Unit tests for CCITTFactory
@@ -171,7 +172,7 @@ public class CCITTFactoryTest extends Te
     {
         PDDocument document = new PDDocument();
         BufferedImage bim = new BufferedImage(343, 287, BufferedImage.TYPE_BYTE_BINARY);
-        assertTrue((bim.getWidth() / 8) * 8 != bim.getWidth()); // not mult of 8
+        Assert.assertNotEquals((bim.getWidth() / 8) * 8, bim.getWidth()); // not mult of 8
         int col = 0;
         for (int x = 0; x < bim.getWidth(); ++x)
         {

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java?rev=1881578&r1=1881577&r2=1881578&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java Wed Sep  9 06:19:28 2020
@@ -50,6 +50,7 @@ import static org.apache.pdfbox.pdmodel.
 import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.doWritePDF;
 import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.validate;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.junit.Assert;
 
 /**
  * Unit tests for LosslessFactory
@@ -95,7 +96,7 @@ public class LosslessFactoryTest extends
         BufferedImage bitonalImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_BINARY);
 
         // avoid multiple of 8 to test padding
-        assertFalse(bitonalImage.getWidth() % 8 == 0);
+        Assert.assertNotEquals(0, bitonalImage.getWidth() % 8);
         
         g = bitonalImage.getGraphics();
         g.drawImage(image, 0, 0, null);
@@ -492,8 +493,8 @@ public class LosslessFactoryTest extends
         BufferedImage maskImage = ximage.getSoftMask().getImage();
         
         // avoid multiple of 8 to test padding
-        assertFalse(maskImage.getWidth() % 8 == 0);
-        
+        Assert.assertNotEquals(0, maskImage.getWidth() % 8);
+
         assertEquals(Transparency.OPAQUE, maskImage.getTransparency());
         for (int x = 0; x < width; ++x)
         {

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestNumberFormatUtil.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestNumberFormatUtil.java?rev=1881578&r1=1881577&r2=1881578&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestNumberFormatUtil.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestNumberFormatUtil.java Wed Sep  9 06:19:28 2020
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.junit.Assert;
 
 /**
  *
@@ -140,7 +141,7 @@ public class TestNumberFormatUtil extend
             {
                 //format with the formatFloatFast method and parse back
                 int byteCount = NumberFormatUtil.formatFloatFast(value.floatValue(), maxFractionDigits, formatBuffer);
-                assertFalse(byteCount == -1);
+                Assert.assertNotEquals(-1, byteCount);
                 String newStringResult = new String(formatBuffer, 0, byteCount, StandardCharsets.US_ASCII);
                 BigDecimal formattedDecimal = new BigDecimal(newStringResult);