Change PdfFormField regeneration methods

Separate widget annotation and field dictionaries' entries
Change PdfPageFormCopier field value retrieval

DEVSIX-2622

Author: BlackEgoist

forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java

@@ -250,7 +250,7 @@ private PdfFormField mergeFieldsWithTheSameName(PdfFormField newField) {
         }
 
         mergedField.addKid(existingField).addKid(newField);
-        PdfObject value = existingField.getValue();
+        PdfObject value = existingField.getPdfObject().get(PdfName.V);
         if (value != null) {
             mergedField.put(PdfName.V, existingField.getPdfObject().get(PdfName.V));
         }

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -42,8 +42,8 @@ This file is part of the iText (R) project.
 @Category(IntegrationTest.class)
 public class PdfChoiceFieldTest {
 
-    public static final String destinationFolder = "./target/test/com/itextpdf/forms/PdfCheckBoxFieldTest/";
-    public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/PdfCheckBoxFieldTest/";
+    public static final String destinationFolder = "./target/test/com/itextpdf/forms/PdfChoiceFieldTest/";
+    public static final String sourceFolder = "./src/test/resources/com/itextpdf/forms/PdfChoiceFieldTest/";
 
     @BeforeClass
     public static void beforeClass() {

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

@@ -831,7 +831,7 @@ public void dashedBorderAppearanceTest() throws IOException, InterruptedExceptio
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.COMB_FLAG_MAY_BE_SET_ONLY_IF_MAXLEN_IS_PRESENT, count = 2)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.COMB_FLAG_MAY_BE_SET_ONLY_IF_MAXLEN_IS_PRESENT)})
     public void noMaxLenWithSetCombFlagTest() throws IOException, InterruptedException {
         String outPdf = destinationFolder + "noMaxLenWithSetCombFlagTest.pdf";
         String cmpPdf = sourceFolder + "cmp_noMaxLenWithSetCombFlagTest.pdf";
@@ -1266,15 +1266,15 @@ public void appendModeAppearance() throws IOException, InterruptedException {
     // TODO update cmp-file after DEVSIX-2622 fixed
     public void fillUnmergedTextFormField() throws IOException, InterruptedException {
         String file = sourceFolder + "fillUnmergedTextFormField.pdf";
-        String outfile = destinationFolder + "outfile.pdf";
+        String outfile = destinationFolder + "fillUnmergedTextFormField.pdf";
         String text = "John";
 
         PdfDocument pdfDocument = new PdfDocument(new PdfReader(file), new PdfWriter(outfile));
         fillAcroForm(pdfDocument, text);
 
         pdfDocument.close();
 
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "outfile.pdf",
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "fillUnmergedTextFormField.pdf",
                 sourceFolder + "cmp_" + "fillUnmergedTextFormField.pdf", destinationFolder, "diff_"));
     }