Fix multiple issues in Type 3 font tests.

DEVSIX-1468

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/font/PdfType3Font.java

@@ -116,7 +116,6 @@ public class PdfType3Font extends PdfSimpleFont<Type3Font> {
      */
     PdfType3Font(PdfDictionary fontDictionary) {
         super(fontDictionary);
-        ensureObjectIsAddedToDocument(fontDictionary);
         subset = true;
         embedded = true;
         fontProgram = new Type3Font(false);
@@ -324,11 +323,8 @@ public void flush() {
         getPdfObject().put(PdfName.FontBBox, new PdfArray(fontProgram.getFontMetrics().getBbox()));
 
         String fontName = fontProgram.getFontNames().getFontName();
-        if (fontName != null && fontName.length() > 0) {
-            getPdfObject().put(PdfName.BaseFont, new PdfName(fontName));
-        }
         super.flushFontData(fontName, PdfName.Type3);
-        //TODO improve
+        //BaseFont is not listed as key in Type 3 font specification.
         getPdfObject().remove(PdfName.BaseFont);
         super.flush();
     }
@@ -338,13 +334,15 @@ protected PdfDictionary getFontDescriptor(String fontName) {
         if (fontName != null && fontName.length() > 0) {
             PdfDictionary fontDescriptor = new PdfDictionary();
             makeObjectIndirect(fontDescriptor);
-            FontMetrics fontMetrics = fontProgram.getFontMetrics();
-            FontNames fontNames = fontProgram.getFontNames();
             fontDescriptor.put(PdfName.Type, PdfName.FontDescriptor);
-            fontDescriptor.put(PdfName.FontName, new PdfName(fontName));
+
+            FontMetrics fontMetrics = fontProgram.getFontMetrics();
             fontDescriptor.put(PdfName.CapHeight, new PdfNumber(fontMetrics.getCapHeight()));
             fontDescriptor.put(PdfName.ItalicAngle, new PdfNumber(fontMetrics.getItalicAngle()));
+
+            FontNames fontNames = fontProgram.getFontNames();
             fontDescriptor.put(PdfName.FontWeight, new PdfNumber(fontNames.getFontWeight()));
+            fontDescriptor.put(PdfName.FontName, new PdfName(fontName));
             if (fontNames.getFamilyName() != null && fontNames.getFamilyName().length > 0 && fontNames.getFamilyName()[0].length >= 4) {
                 fontDescriptor.put(PdfName.FontFamily, new PdfString(fontNames.getFamilyName()[0][3]));
             }

kernel/src/main/java/com/itextpdf/kernel/utils/CompareTool.java

@@ -1131,7 +1131,7 @@ private boolean compareDictionariesExtended(PdfDictionary outDict, PdfDictionary
             if (outDict.isStream() && cmpDict.isStream() && (key.equals(PdfName.Filter) || key.equals(PdfName.Length))) continue;
             if (key.equals(PdfName.BaseFont) || key.equals(PdfName.FontName)) {
                 PdfObject cmpObj = cmpDict.get(key);
-                if (cmpObj.isName() && cmpObj.toString().indexOf('+') > 0) {
+                if (cmpObj != null && cmpObj.isName() && cmpObj.toString().indexOf('+') > 0) {
                     PdfObject outObj = outDict.get(key);
                     if (!outObj.isName() || outObj.toString().indexOf('+') == -1) {
                         if (compareResult != null && currentPath != null)

kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java

@@ -380,7 +380,8 @@ public void createTaggedDocumentWithType3Font() throws IOException, InterruptedE
                     .setFontAndSize(type3, 12)
                     .moveText(50, 800)
                     .showText(testString)
-                    .endText();
+                    .endText()
+                    .restoreState();
             page.flush();
         }
         pdfDoc.close();
@@ -863,7 +864,7 @@ public void testUpdateType3FontBasedExistingFont() throws IOException, Interrupt
                 setCreator(creator).
                 setTitle(title);
 
-        PdfType3Font pdfType3Font = (PdfType3Font) PdfFontFactory.createFont((PdfDictionary) pdfDoc.getPdfObject(4));
+        PdfType3Font pdfType3Font = (PdfType3Font) PdfFontFactory.createFont((PdfDictionary) pdfDoc.getPdfObject(5));
 
         Type3Glyph newGlyph = pdfType3Font.addGlyph('\u00F6', 600, 0, 0, 600, 700);
         newGlyph.setLineWidth(100);
@@ -877,8 +878,9 @@ public void testUpdateType3FontBasedExistingFont() throws IOException, Interrupt
                 .beginText()
                 .setFontAndSize(pdfType3Font, 12)
                 .moveText(50, 800)
-                .showText("AAAAAA EEEE ~ \u00E9 \u00F6") // é ö
-                .endText();
+                .showText("A A A A A A E E E E ~ \u00E9 \u00F6") // é ö
+                .endText()
+                .restoreState();
         page.flush();
         pdfDoc.close();
 
@@ -905,7 +907,7 @@ public void testNewType3FontBasedExistingFont() throws IOException, InterruptedE
                 setCreator(creator).
                 setTitle(title);
 
-        PdfDictionary pdfType3FontDict = (PdfDictionary) inputPdfDoc.getPdfObject(4);
+        PdfDictionary pdfType3FontDict = (PdfDictionary) inputPdfDoc.getPdfObject(5);
         PdfType3Font pdfType3Font = (PdfType3Font) PdfFontFactory.createFont((PdfDictionary) pdfType3FontDict.copyTo(outputPdfDoc));
 
         Type3Glyph newGlyph = pdfType3Font.addGlyph('\u00F6', 600, 0, 0, 600, 700);