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/08 18:35:23 UTC
svn commit: r1881563 - in
/pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox:
pdmodel/interactive/form/PDButtonTest.java text/TestTextStripper.java
Author: tilman
Date: Tue Sep 8 18:35:23 2020
New Revision: 1881563
URL: http://svn.apache.org/viewvc?rev=1881563&view=rev
Log:
PDFBOX-4892: SonarQube fix
Modified:
pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
Modified: pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java?rev=1881563&r1=1881562&r2=1881563&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java Tue Sep 8 18:35:23 2020
@@ -30,6 +30,7 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.junit.After;
+import static org.junit.Assert.assertNotEquals;
import org.junit.Before;
import org.junit.Test;
@@ -169,14 +170,12 @@ public class PDButtonTest
radioButton.setValue("c");
// test that the old behavior is now invalid
- assertFalse("This shall no longer be 2", "2".equals(radioButton.getValueAsString()));
- assertFalse("This shall no longer be 2", "2".equals(radioButton.getWidgets().get(2).getCOSObject().getNameAsString(COSName.AS)));
+ assertNotEquals("This shall no longer be 2", "2", radioButton.getValueAsString());
+ assertNotEquals("This shall no longer be 2", "2", radioButton.getWidgets().get(2).getCOSObject().getNameAsString(COSName.AS));
// test for the correct behavior
- assertTrue("This shall be c", "c".equals(radioButton.getValueAsString()));
- assertTrue("This shall be c", "c".equals(radioButton.getWidgets().get(2).getCOSObject().getNameAsString(COSName.AS)));
-
-
+ assertEquals("This shall be c", "c", radioButton.getValueAsString());
+ assertEquals("This shall be c", "c", radioButton.getWidgets().get(2).getCOSObject().getNameAsString(COSName.AS));
}
catch (IOException e)
{
Modified: pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java?rev=1881563&r1=1881562&r2=1881563&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java Tue Sep 8 18:35:23 2020
@@ -55,6 +55,7 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDPageDestination;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.junit.Assert;
/**
@@ -497,7 +498,7 @@ public class TestTextStripper extends Te
stripper.setEndBookmark(oi3);
String textoi23 = stripper.getText(doc);
assertFalse(textoi23.isEmpty());
- assertFalse(textoi23.equals(textFull));
+ Assert.assertNotEquals(textoi23, textFull);
String expectedTextoi23 =
"Second at level 1\n"
@@ -517,18 +518,17 @@ public class TestTextStripper extends Te
stripper.setEndPage(4);
String textp34 = stripper.getText(doc);
assertFalse(textp34.isEmpty());
- assertFalse(textoi23.equals(textFull));
- assertTrue(textoi23.equals(textp34));
-
-
+ Assert.assertNotEquals(textoi23, textFull);
+ Assert.assertEquals(textoi23, textp34);
+
// this should grab 0-based page 2, i.e. 1-based page 3
// by the bookmark
stripper.setStartBookmark(oi2);
stripper.setEndBookmark(oi2);
String textoi2 = stripper.getText(doc);
assertFalse(textoi2.isEmpty());
- assertFalse(textoi2.equals(textoi23));
- assertFalse(textoi23.equals(textFull));
+ Assert.assertNotEquals(textoi2, textoi23);
+ Assert.assertNotEquals(textoi23, textFull);
String expectedTextoi2 =
"Second at level 1\n"
@@ -545,10 +545,10 @@ public class TestTextStripper extends Te
stripper.setEndPage(3);
String textp3 = stripper.getText(doc);
assertFalse(textp3.isEmpty());
- assertFalse(textp3.equals(textp34));
- assertFalse(textoi23.equals(textFull));
- assertTrue(textoi2.equals(textp3));
-
+ Assert.assertNotEquals(textp3, textp34);
+ Assert.assertNotEquals(textoi23, textFull);
+ Assert.assertEquals(textoi2, textp3);
+
// Test with orphan bookmark
PDOutlineItem oiOrphan = new PDOutlineItem();
stripper.setStartBookmark(oiOrphan);