Extend iTextCore test classes

DEVSIX-3360

Author: Kate Ivanova

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

@@ -42,13 +42,14 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.barcodes;
 
+import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.UnitTest;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 @Category(UnitTest.class)
-public class BarcodeMultiThreadingTest {
+public class BarcodeMultiThreadingTest extends ExtendedITextTest {
 
     private static class DataMatrixThread extends Thread {
         @Override

forms/src/main/java/com/itextpdf/forms/xfdf/XfdfConstants.java

@@ -169,5 +169,10 @@ private XfdfConstants() {
     public static final String DEFAULT_STYLE = "defaultstyle";
     public static final String ATTRIBUTE_NAME_OR_VALUE_MISSING = "Attribute name or value are missing";
     public static final String PAGE_IS_MISSING = "Required Page attribute is missing.";
+    /**
+     * @deprecated Use {@link LogMessageConstant#UNSUPPORTED_ANNOTATION_ATTRIBUTE} instead.
+     * The constant will be removed in 7.2.
+     */
+    @Deprecated
     public static final String UNSUPPORTED_ANNOTATION_ATTRIBUTE = "Unsupported attribute type";
-}
+}

forms/src/main/java/com/itextpdf/forms/xfdf/XfdfObjectFactory.java

@@ -43,6 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.forms.xfdf;
 
 import com.itextpdf.forms.PdfAcroForm;
+import com.itextpdf.io.LogMessageConstant;
 import com.itextpdf.kernel.pdf.PdfArray;
 import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfDocument;
@@ -340,7 +341,7 @@ private void addAnnotObjectAttribute(AnnotObject annotObject, Node attributeNode
                 case XfdfConstants.FRINGE:
                     annotObject.addAttribute(new AttributeObject(attributeName, attributeNode.getNodeValue()));
                     break;
-                default: logger.warn(XfdfConstants.UNSUPPORTED_ANNOTATION_ATTRIBUTE);
+                default: logger.warn(LogMessageConstant.XFDF_UNSUPPORTED_ANNOTATION_ATTRIBUTE);
                     break;
             }
         }

forms/src/main/java/com/itextpdf/forms/xfdf/XfdfReader.java

@@ -44,6 +44,8 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.forms.PdfAcroForm;
 import com.itextpdf.forms.fields.PdfFormField;
+import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.util.MessageFormatUtil;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfName;
@@ -79,10 +81,10 @@ void mergeXfdfIntoPdf(XfdfObject xfdfObject, PdfDocument pdfDocument, String pdf
             if (pdfDocumentName.equalsIgnoreCase(xfdfObject.getF().getHref())) {
                 logger.info("Xfdf href and pdf name are equal. Continue merge");
             } else {
-                logger.warn("Xfdf href attribute and pdfDocument name are different!");
+                logger.warn(LogMessageConstant.XFDF_HREF_ATTRIBUTE_AND_PDF_DOCUMENT_NAME_ARE_DIFFERENT);
             }
         } else {
-            logger.warn("No f object to compare.");
+            logger.warn(LogMessageConstant.XFDF_NO_F_OBJECT_TO_COMPARE);
         }
         //TODO check for ids original/modified compatability with those in pdf document
 
@@ -105,7 +107,7 @@ private void mergeFields(FieldsObject fieldsObject, PdfAcroForm form) {
                 if (formFields.get(name) != null && xfdfField.getValue() != null) {
                     formFields.get(name).setValue(xfdfField.getValue());
                 } else {
-                    logger.error("No such field in pdf document!");
+                    logger.error(LogMessageConstant.XFDF_NO_SUCH_FIELD_IN_PDF_DOCUMENT);
                 }
             }
         }
@@ -262,10 +264,10 @@ private void addAnnotationToPdf(AnnotObject annotObject, PdfDocument pdfDocument
                 //XfdfConstants.LINK
                 //XfdfConstants.REDACT
                 //XfdfConstants.PROJECTION
-                default: logger.warn("Annotation " + annotName + " is not supported.");
+                default: logger.warn(MessageFormatUtil.format(LogMessageConstant.XFDF_ANNOTATION_IS_NOT_SUPPORTED, annotName));
                     break;
             }
 
         }
     }
-}
+}

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

@@ -53,6 +53,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfString;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.UnitTest;
 import org.junit.Assert;
 import org.junit.Before;
@@ -64,7 +65,7 @@ This file is part of the iText (R) project.
 import static com.itextpdf.test.ITextTest.createDestinationFolder;
 
 @Category(UnitTest.class)
-public class Utf8FormsTest {
+public class Utf8FormsTest extends ExtendedITextTest {
 
     public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/Utf8FormsTest/";
     public static final String destinationFolder = "./target/test/com/itextpdf/forms/Utf8FormsTest/";