Replace ExpectedException.none to Assert.assertThrows

DEVSIX-5287

Author: Artyom Yanchevsky

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeDataMatrixTest.java

@@ -52,23 +52,19 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.IntegrationTest;
+
 import java.io.IOException;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 @Category(IntegrationTest.class)
 public class BarcodeDataMatrixTest extends ExtendedITextTest {
 
     public static final String destinationFolder = "./target/test/com/itextpdf/barcodes/BarcodeDataMatrix/";
     public static final String sourceFolder = "./src/test/resources/com/itextpdf/barcodes/";
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
     @BeforeClass
     public static void beforeClass() {
         createOrClearDestinationFolder(destinationFolder);
@@ -191,6 +187,7 @@ public void barcode07Test() {
         String aCode = "aBCdeFG12";
 
         int result = bc.setCode(aCode);
+
         Assert.assertEquals(result, BarcodeDataMatrix.DM_ERROR_TEXT_TOO_BIG);
     }
 
@@ -200,6 +197,7 @@ public void barcode08Test() {
         barcodeDataMatrix.setWidth(18);
         barcodeDataMatrix.setHeight(18);
         int result = barcodeDataMatrix.setCode("AbcdFFghijklmnopqrstuWXSQ");
+
         Assert.assertEquals(BarcodeDataMatrix.DM_ERROR_TEXT_TOO_BIG, result);
     }
 
@@ -209,6 +207,7 @@ public void barcode09Test() {
         barcodeDataMatrix.setWidth(17);
         barcodeDataMatrix.setHeight(17);
         int result = barcodeDataMatrix.setCode("AbcdFFghijklmnopqrstuWXSQ");
+
         Assert.assertEquals(BarcodeDataMatrix.DM_ERROR_INVALID_SQUARE, result);
     }
 
@@ -218,6 +217,7 @@ public void barcode10Test() {
         barcodeDataMatrix.setWidth(26);
         barcodeDataMatrix.setHeight(12);
         int result = barcodeDataMatrix.setCode("AbcdFFghijklmnopqrstuWXSQ");
+
         Assert.assertEquals(BarcodeDataMatrix.DM_ERROR_TEXT_TOO_BIG, result);
     }
 
@@ -228,37 +228,38 @@ public void barcode11Test() {
         barcodeDataMatrix.setHeight(18);
         byte[] str = "AbcdFFghijklmnop".getBytes();
         int result = barcodeDataMatrix.setCode(str, 0, str.length);
+
         Assert.assertEquals(BarcodeDataMatrix.DM_NO_ERROR, result);
     }
 
     @Test
     public void barcode12Test() {
-        junitExpectedException.expect(IndexOutOfBoundsException.class);
         BarcodeDataMatrix barcodeDataMatrix = new BarcodeDataMatrix();
         barcodeDataMatrix.setWidth(18);
         barcodeDataMatrix.setHeight(18);
         byte[] str = "AbcdFFghijklmnop".getBytes();
-        barcodeDataMatrix.setCode(str, -1, str.length);
+
+        Exception e = Assert.assertThrows(IndexOutOfBoundsException.class, () -> barcodeDataMatrix.setCode(str, -1, str.length));
     }
 
     @Test
     public void barcode13Test() {
-        junitExpectedException.expect(IndexOutOfBoundsException.class);
         BarcodeDataMatrix barcodeDataMatrix = new BarcodeDataMatrix();
         barcodeDataMatrix.setWidth(18);
         barcodeDataMatrix.setHeight(18);
         byte[] str = "AbcdFFghijklmnop".getBytes();
-        barcodeDataMatrix.setCode(str, 0, str.length + 1);
+
+        Assert.assertThrows(IndexOutOfBoundsException.class, () -> barcodeDataMatrix.setCode(str, 0, str.length + 1));
     }
 
     @Test
     public void barcode14Test() {
-        junitExpectedException.expect(IndexOutOfBoundsException.class);
         BarcodeDataMatrix barcodeDataMatrix = new BarcodeDataMatrix();
         barcodeDataMatrix.setWidth(18);
         barcodeDataMatrix.setHeight(18);
         byte[] str = "AbcdFFghijklmnop".getBytes();
-        barcodeDataMatrix.setCode(str, 0, -1);
+
+        Assert.assertThrows(IndexOutOfBoundsException.class, () -> barcodeDataMatrix.setCode(str, 0, -1));
     }
 
     @Test
@@ -268,6 +269,7 @@ public void barcode15Test() {
         barcodeDataMatrix.setHeight(18);
         byte[] str = "AbcdFFghijklmnop".getBytes();
         int result = barcodeDataMatrix.setCode(str, str.length, 0);
+
         Assert.assertEquals(BarcodeDataMatrix.DM_NO_ERROR, result);
     }
 

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeEANUnitTest.java

@@ -51,19 +51,14 @@ This file is part of the iText (R) project.
 
 import java.io.ByteArrayOutputStream;
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 @Category(UnitTest.class)
 public class BarcodeEANUnitTest extends ExtendedITextTest {
 
     public static final float EPS = 0.0001f;
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
     @Test
     public void calculateEANParityTest() throws PdfException {
         int expectedParity = BarcodeEAN.calculateEANParity("1234567890");
@@ -227,9 +222,6 @@ public void getBarcodeSizeSUPP2Test() throws PdfException {
 
     @Test
     public void getBarcodeSizeIncorrectTypeTest() throws PdfException {
-        junitExpectedException.expect(PdfException.class);
-        junitExpectedException.expectMessage("Invalid code type");
-
         PdfDocument document = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
 
         Barcode1D barcode = new BarcodeEAN(document);
@@ -239,6 +231,7 @@ public void getBarcodeSizeIncorrectTypeTest() throws PdfException {
         barcode.setCodeType(1234);
 
         // We do expect an exception here
-        barcode.getBarcodeSize();
+        Exception e = Assert.assertThrows(PdfException.class, () -> barcode.getBarcodeSize());
+        Assert.assertEquals("Invalid code type", e.getMessage());
     }
 }

barcodes/src/test/java/com/itextpdf/barcodes/BarcodePDF417Test.java

@@ -62,10 +62,8 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 @Category(IntegrationTest.class)
 public class BarcodePDF417Test extends ExtendedITextTest {
@@ -77,9 +75,6 @@ public static void beforeClass() {
         createDestinationFolder(destinationFolder);
     }
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
     @Test
     public void barcode01Test() throws IOException, PdfException, InterruptedException {
         String filename = "barcode417_01.pdf";
@@ -440,9 +435,6 @@ public void barcode417OptionsWithBarcodeGenerationTest() {
 
     @Test
     public void barcode417OptionsWithBarcodeGenerationInvalidSizeTest() {
-        junitExpectedException.expect(PdfException.class);
-        junitExpectedException.expectMessage("Invalid codeword size.");
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PdfWriter writer = new PdfWriter(baos);
         PdfDocument document = new PdfDocument(writer);
@@ -452,8 +444,11 @@ public void barcode417OptionsWithBarcodeGenerationInvalidSizeTest() {
 
         BarcodePDF417 barcode = new BarcodePDF417();
         barcode.setOptions(64);
-        barcode.placeBarcode(canvas, null);
 
+        Exception e = Assert.assertThrows(PdfException.class,
+                () -> barcode.placeBarcode(canvas, null)
+        );
+        Assert.assertEquals("Invalid codeword size.", e.getMessage());
         Assert.assertEquals(64, barcode.getOptions());
     }
 

forms/src/test/java/com/itextpdf/forms/XfdfUnitTest.java

@@ -28,25 +28,17 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.type.UnitTest;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 @Category(UnitTest.class)
 public class XfdfUnitTest extends ExtendedITextTest {
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
     @Test
     public void fitObjectWithEmptyPageTest(){
-        junitExpectedException.expect(XfdfException.class);
-        junitExpectedException.expectMessage(XfdfException.PAGE_IS_MISSING);
-
-        FitObject fitObject = new FitObject(null);
-
-        Assert.fail();
+        Exception e = Assert.assertThrows(XfdfException.class,
+                () -> new FitObject(null)
+        );
+        Assert.assertEquals(XfdfException.PAGE_IS_MISSING, e.getMessage());
     }
-
 }

forms/src/test/java/com/itextpdf/forms/XfdfWriterTest.java

@@ -58,12 +58,9 @@ This file is part of the iText (R) project.
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 import org.xml.sax.SAXException;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import java.io.FileInputStream;
@@ -75,10 +72,6 @@ public class XfdfWriterTest extends ExtendedITextTest {
     public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/XfdfWriterTest/";
     public static final String destinationFolder = "./target/test/com/itextpdf/forms/XfdfWriterTest/";
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
-
     @BeforeClass
     public static void beforeClass() {
         createDestinationFolder(destinationFolder);
@@ -1047,10 +1040,6 @@ public void xfdfDropDown() throws IOException, ParserConfigurationException, SAX
 
     @Test
     public void xfdfEmptyAttributeTest() {
-
-        junitExpectedException.expect(XfdfException.class);
-        junitExpectedException.expectMessage(XfdfException.ATTRIBUTE_NAME_OR_VALUE_MISSING);
-
         XfdfObject xfdfObject = new XfdfObject();
 
         AnnotsObject annots = new AnnotsObject();
@@ -1064,8 +1053,13 @@ public void xfdfEmptyAttributeTest() {
         String valuePresent = "value";
         String valueAbsent = null;
 
-        annot.addAttribute(new AttributeObject(nameAbsent, valuePresent));
-        annot.addAttribute(new AttributeObject(namePresent, valueAbsent));
-
+        Exception e = Assert.assertThrows(XfdfException.class,
+                () -> annot.addAttribute(new AttributeObject(nameAbsent, valuePresent))
+        );
+        Assert.assertEquals(XfdfException.ATTRIBUTE_NAME_OR_VALUE_MISSING, e.getMessage());
+        Exception e2 = Assert.assertThrows(XfdfException.class,
+                () -> annot.addAttribute(new AttributeObject(namePresent, valueAbsent))
+        );
+        Assert.assertEquals(XfdfException.ATTRIBUTE_NAME_OR_VALUE_MISSING, e2.getMessage());
     }
 }

forms/src/test/java/com/itextpdf/forms/xfa/XfaSecurityTest.java

@@ -58,11 +58,10 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 @Category(IntegrationTest.class)
 public class XfaSecurityTest extends ExtendedITextTest {
@@ -78,9 +77,6 @@ public class XfaSecurityTest extends ExtendedITextTest {
             + "         uuid=\"36ac5111-55c5-4172-b0c1-0cbd783e2fcf\">\n"
             + "</xdp:xdp>\n";
 
-    @Rule
-    public ExpectedException junitExpectedException = ExpectedException.none();
-
     @Before
     public void resetXmlParserFactoryToDefault() {
         XmlProcessorCreator.setXmlParserFactory(new DefaultSafeXmlParserFactory());
@@ -107,47 +103,46 @@ public void xfaExternalFileCustomFactoryTest() throws IOException {
         XmlProcessorCreator.setXmlParserFactory(new SecurityTestXmlParserFactory());
         try (PdfDocument pdfDoc = new PdfDocument(new PdfReader(inFileName),
                 new PdfWriter(new ByteArrayOutputStream()))) {
-            junitExpectedException.expect(PdfException.class);
-            junitExpectedException.expectMessage(ExceptionTestUtil.getXxeTestMessage());
-            PdfAcroForm.getAcroForm(pdfDoc, true);
+            Exception e = Assert.assertThrows(PdfException.class,
+                    () -> PdfAcroForm.getAcroForm(pdfDoc, true)
+            );
+            Assert.assertEquals(ExceptionTestUtil.getXxeTestMessage(), e.getMessage());
         }
     }
 
     @Test
     public void xfaExternalFileXfaFormTest() throws IOException {
         String inFileName = SOURCE_FOLDER + "xfaExternalFile.pdf";
         try (PdfDocument pdfDoc = new PdfDocument(new PdfReader(inFileName))) {
-            junitExpectedException.expect(PdfException.class);
-            junitExpectedException.expectMessage(DTD_EXCEPTION_MESSAGE);
-            new XfaForm(pdfDoc);
+            Exception e = Assert.assertThrows(PdfException.class, () -> new XfaForm(pdfDoc));
+            Assert.assertEquals(DTD_EXCEPTION_MESSAGE, e.getMessage());
         }
     }
 
     @Test
     public void xfaWithDtdXfaFormTest() throws IOException {
         try (InputStream inputStream = new ByteArrayInputStream(XFA_WITH_DTD_XML.getBytes(StandardCharsets.UTF_8))) {
-            junitExpectedException.expect(PdfException.class);
-            junitExpectedException.expectMessage(DTD_EXCEPTION_MESSAGE);
-            new XfaForm(inputStream);
+            Exception e = Assert.assertThrows(PdfException.class, () -> new XfaForm(inputStream));
+            Assert.assertEquals(DTD_EXCEPTION_MESSAGE, e.getMessage());
         }
     }
 
     @Test
     public void fillXfaFormTest() throws IOException {
         try (InputStream inputStream = new ByteArrayInputStream(XFA_WITH_DTD_XML.getBytes(StandardCharsets.UTF_8))) {
             XfaForm form = new XfaForm();
-            junitExpectedException.expect(PdfException.class);
-            junitExpectedException.expectMessage(DTD_EXCEPTION_MESSAGE);
-            form.fillXfaForm(inputStream, true);
+            Exception e = Assert.assertThrows(PdfException.class, () -> form.fillXfaForm(inputStream, true));
+            Assert.assertEquals(DTD_EXCEPTION_MESSAGE, e.getMessage());
         }
     }
 
     private void xfaSecurityExceptionTest(String inputFileName) throws IOException {
         try (PdfDocument pdfDoc = new PdfDocument(new PdfReader(inputFileName),
                 new PdfWriter(new ByteArrayOutputStream()))) {
-            junitExpectedException.expect(PdfException.class);
-            junitExpectedException.expectMessage(DTD_EXCEPTION_MESSAGE);
-            PdfAcroForm.getAcroForm(pdfDoc, true);
+            Exception e = Assert.assertThrows(PdfException.class,
+                    () -> PdfAcroForm.getAcroForm(pdfDoc, true)
+            );
+            Assert.assertEquals(DTD_EXCEPTION_MESSAGE, e.getMessage());
         }
     }
 }