Add tests for setFontProvider+setFontFamily pair and for deprecated Property.FONT as String

yulian-gaponenko · iText-CI · commit 5667e273f246 · 2018-12-26T08:52:27.000+01:00
DEVSIX-2525

Autoported commit.
Original commit hash: [98dae1fa1]
diff --git a/itext.tests/itext.layout.tests/itext/layout/FontProviderTest.cs b/itext.tests/itext.layout.tests/itext/layout/FontProviderTest.cs
@@ -45,6 +45,7 @@ source product.
 using System.IO;
 using iText.IO.Font;
 using iText.IO.Font.Constants;
+using iText.Kernel;
 using iText.Kernel.Font;
 using iText.Kernel.Pdf;
 using iText.Kernel.Utils;
@@ -165,5 +166,21 @@ public virtual void CustomFontProvider2() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
                 , "diff" + fileName));
         }
+
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void FontProviderNotSetExceptionTest() {
+            NUnit.Framework.Assert.That(() =>  {
+                String fileName = "fontProviderNotSetExceptionTest.pdf";
+                String outFileName = destinationFolder + fileName + ".pdf";
+                PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new FileStream(outFileName, FileMode.Create)));
+                Document doc = new Document(pdfDoc);
+                Paragraph paragraph = new Paragraph("Hello world!").SetFontFamily("ABRACADABRA_NO_FONT_PROVIDER_ANYWAY");
+                doc.Add(paragraph);
+                doc.Close();
+            }
+            , NUnit.Framework.Throws.InstanceOf<InvalidOperationException>().With.Message.EqualTo(PdfException.FontProviderNotSetFontFamilyNotResolved))
+;
+        }
     }
 }
diff --git a/itext.tests/itext.layout.tests/itext/layout/FontSelectorTest.cs b/itext.tests/itext.layout.tests/itext/layout/FontSelectorTest.cs
@@ -54,6 +54,7 @@ source product.
 using iText.Layout.Font;
 using iText.Layout.Properties;
 using iText.Test;
+using iText.Test.Attributes;
 
 namespace iText.Layout {
     public class FontSelectorTest : ExtendedITextTest {
@@ -98,7 +99,6 @@ public virtual void CyrillicAndLatinGroup() {
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
         public virtual void CyrillicAndLatinGroup2() {
-            // TODO DEVSIX-2120 The font-family name of Puritan2.otf is 'Puritan 2.0' but this name doesn't match font-family name pattern
             String fileName = "cyrillicAndLatinGroup2";
             String outFileName = destinationFolder + fileName + ".pdf";
             String cmpFileName = sourceFolder + "cmp_" + fileName + ".pdf";
@@ -119,6 +119,54 @@ public virtual void CyrillicAndLatinGroup2() {
                 , "diff" + fileName));
         }
 
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CyrillicAndLatinGroup3() {
+            String fileName = "cyrillicAndLatinGroup3";
+            String outFileName = destinationFolder + fileName + ".pdf";
+            String cmpFileName = sourceFolder + "cmp_" + fileName + ".pdf";
+            FontProvider sel = new FontProvider();
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "FreeSans.ttf"));
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "NotoSans-Regular.ttf"));
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "Puritan2.otf"));
+            String s = "Hello world! Здравствуй мир! Hello world! Здравствуй мир!";
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new FileStream(outFileName, FileMode.Create)));
+            Document doc = new Document(pdfDoc);
+            doc.SetFontProvider(sel);
+            doc.SetFontFamily(JavaUtil.ArraysAsList("Puritan 2.0", "Noto Sans"));
+            Text text = new Text(s).SetBackgroundColor(ColorConstants.LIGHT_GRAY);
+            Paragraph paragraph = new Paragraph(text);
+            doc.Add(paragraph);
+            doc.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff" + fileName));
+        }
+
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.FONT_PROPERTY_OF_STRING_TYPE_IS_DEPRECATED_USE_STRINGS_ARRAY_INSTEAD
+            )]
+        public virtual void CyrillicAndLatinGroupDeprecatedFontAsStringValue() {
+            String fileName = "cyrillicAndLatinGroupDeprecatedFontAsStringValue";
+            String outFileName = destinationFolder + fileName + ".pdf";
+            String cmpFileName = sourceFolder + "cmp_" + fileName + ".pdf";
+            FontProvider sel = new FontProvider();
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "FreeSans.ttf"));
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "NotoSans-Regular.ttf"));
+            NUnit.Framework.Assert.IsTrue(sel.AddFont(fontsFolder + "Puritan2.otf"));
+            String s = "Hello world! Здравствуй мир! Hello world! Здравствуй мир!";
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new FileStream(outFileName, FileMode.Create)));
+            Document doc = new Document(pdfDoc);
+            doc.SetFontProvider(sel);
+            doc.SetProperty(Property.FONT, "'Puritan', \"FreeSans\"");
+            Text text = new Text(s).SetBackgroundColor(ColorConstants.LIGHT_GRAY);
+            Paragraph paragraph = new Paragraph(text);
+            doc.Add(paragraph);
+            doc.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff" + fileName));
+        }
+
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
         public virtual void LatinAndNotdefGroup() {
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/FontSelectorTest/cmp_cyrillicAndLatinGroup3.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/FontSelectorTest/cmp_cyrillicAndLatinGroup3.pdf
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/FontSelectorTest/cmp_cyrillicAndLatinGroupDeprecatedFontAsStringValue.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/FontSelectorTest/cmp_cyrillicAndLatinGroupDeprecatedFontAsStringValue.pdf
diff --git a/itext/itext.kernel/itext/kernel/PdfException.cs b/itext/itext.kernel/itext/kernel/PdfException.cs
@@ -261,6 +261,8 @@ public class PdfException : Exception {
 
         public const String FontEmbeddingIssue = "Font embedding issue.";
 
+        public const String FontProviderNotSetFontFamilyNotResolved = "FontProvider and FontSet are empty. Cannot resolve font family name (see ElementPropertyContainer#setFontFamily) without initialized FontProvider (see RootElement#setFontProvider).";
+
         [Obsolete]
         public const String FontSizeIsTooSmall = "Font size is too small.";
 
diff --git a/itext/itext.layout/itext/layout/renderer/AbstractRenderer.cs b/itext/itext.layout/itext/layout/renderer/AbstractRenderer.cs
@@ -46,6 +46,7 @@ source product.
 using System.Text;
 using Common.Logging;
 using iText.IO.Util;
+using iText.Kernel;
 using iText.Kernel.Colors;
 using iText.Kernel.Font;
 using iText.Kernel.Geom;
@@ -2200,8 +2201,7 @@ internal virtual PdfFont ResolveFirstPdfFont() {
                     }
                     FontProvider provider = this.GetProperty<FontProvider>(Property.FONT_PROVIDER);
                     if (provider == null) {
-                        throw new InvalidOperationException("Invalid font type. FontProvider expected. Cannot resolve font with string value"
-                            );
+                        throw new InvalidOperationException(PdfException.FontProviderNotSetFontFamilyNotResolved);
                     }
                     FontCharacteristics fc = CreateFontCharacteristics();
                     return ResolveFirstPdfFont((String[])font, provider, fc);
diff --git a/itext/itext.layout/itext/layout/renderer/TextRenderer.cs b/itext/itext.layout/itext/layout/renderer/TextRenderer.cs
@@ -48,6 +48,7 @@ source product.
 using iText.IO.Font;
 using iText.IO.Font.Otf;
 using iText.IO.Util;
+using iText.Kernel;
 using iText.Kernel.Colors;
 using iText.Kernel.Font;
 using iText.Kernel.Geom;
@@ -742,7 +743,7 @@ public override void Draw(DrawContext drawContext) {
                 if (horizontalScaling != null && horizontalScaling != 1) {
                     canvas.SetHorizontalScaling((float)horizontalScaling * 100);
                 }
-                GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_779();
+                GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_780();
                 bool appearanceStreamLayout = true.Equals(GetPropertyAsBoolean(Property.APPEARANCE_STREAM_LAYOUT));
                 if (GetReversedRanges() != null) {
                     bool writeReversedChars = !appearanceStreamLayout;
@@ -807,8 +808,8 @@ public override void Draw(DrawContext drawContext) {
             }
         }
 
-        private sealed class _IGlyphLineFilter_779 : GlyphLine.IGlyphLineFilter {
-            public _IGlyphLineFilter_779() {
+        private sealed class _IGlyphLineFilter_780 : GlyphLine.IGlyphLineFilter {
+            public _IGlyphLineFilter_780() {
             }
 
             public bool Accept(Glyph glyph) {
@@ -1184,8 +1185,7 @@ protected internal virtual bool ResolveFonts(IList<IRenderer> addTo) {
                     FontProvider provider = this.GetProperty<FontProvider>(Property.FONT_PROVIDER);
                     FontSet fontSet = this.GetProperty<FontSet>(Property.FONT_SET);
                     if (provider.GetFontSet().IsEmpty() && (fontSet == null || fontSet.IsEmpty())) {
-                        throw new InvalidOperationException("Invalid font type. FontProvider and FontSet are empty. Cannot resolve font with string value."
-                            );
+                        throw new InvalidOperationException(PdfException.FontProviderNotSetFontFamilyNotResolved);
                     }
                     FontCharacteristics fc = CreateFontCharacteristics();
                     FontSelectorStrategy strategy = provider.GetStrategy(strToBeConverted, JavaUtil.ArraysAsList((String[])font
@@ -1206,7 +1206,7 @@ protected internal virtual bool ResolveFonts(IList<IRenderer> addTo) {
                     return true;
                 }
                 else {
-                    throw new InvalidOperationException("Invalid font type.");
+                    throw new InvalidOperationException("Invalid FONT property value type.");
                 }
             }
         }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-7c42087a0e89171aa3226cad1eb31e6a1a037937
+98dae1fa142770319f13920146038d43e3724c49

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ source product.`
`48`	`48`	`using iText.IO.Font;`
`49`	`49`	`using iText.IO.Font.Otf;`
`50`	`50`	`using iText.IO.Util;`
	`51`	`+using iText.Kernel;`
`51`	`52`	`using iText.Kernel.Colors;`
`52`	`53`	`using iText.Kernel.Font;`
`53`	`54`	`using iText.Kernel.Geom;`
`@@ -742,7 +743,7 @@ public override void Draw(DrawContext drawContext) {`
`742`	`743`	`if (horizontalScaling != null && horizontalScaling != 1) {`
`743`	`744`	`canvas.SetHorizontalScaling((float)horizontalScaling * 100);`
`744`	`745`	`}`
`745`		`- GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_779();`
	`746`	`+ GlyphLine.IGlyphLineFilter filter = new _IGlyphLineFilter_780();`
`746`	`747`	`bool appearanceStreamLayout = true.Equals(GetPropertyAsBoolean(Property.APPEARANCE_STREAM_LAYOUT));`
`747`	`748`	`if (GetReversedRanges() != null) {`
`748`	`749`	`bool writeReversedChars = !appearanceStreamLayout;`
`@@ -807,8 +808,8 @@ public override void Draw(DrawContext drawContext) {`
`807`	`808`	`}`
`808`	`809`	`}`
`809`	`810`
`810`		`- private sealed class _IGlyphLineFilter_779 : GlyphLine.IGlyphLineFilter {`
`811`		`- public _IGlyphLineFilter_779() {`
	`811`	`+ private sealed class _IGlyphLineFilter_780 : GlyphLine.IGlyphLineFilter {`
	`812`	`+ public _IGlyphLineFilter_780() {`
`812`	`813`	`}`
`813`	`814`
`814`	`815`	`public bool Accept(Glyph glyph) {`
`@@ -1184,8 +1185,7 @@ protected internal virtual bool ResolveFonts(IList<IRenderer> addTo) {`
`1184`	`1185`	`FontProvider provider = this.GetProperty<FontProvider>(Property.FONT_PROVIDER);`
`1185`	`1186`	`FontSet fontSet = this.GetProperty<FontSet>(Property.FONT_SET);`
`1186`	`1187`	`if (provider.GetFontSet().IsEmpty() && (fontSet == null \|\| fontSet.IsEmpty())) {`
`1187`		`- throw new InvalidOperationException("Invalid font type. FontProvider and FontSet are empty. Cannot resolve font with string value."`
`1188`		`- );`
	`1188`	`+ throw new InvalidOperationException(PdfException.FontProviderNotSetFontFamilyNotResolved);`
`1189`	`1189`	`}`
`1190`	`1190`	`FontCharacteristics fc = CreateFontCharacteristics();`
`1191`	`1191`	`FontSelectorStrategy strategy = provider.GetStrategy(strToBeConverted, JavaUtil.ArraysAsList((String[])font`
`@@ -1206,7 +1206,7 @@ protected internal virtual bool ResolveFonts(IList<IRenderer> addTo) {`
`1206`	`1206`	`return true;`
`1207`	`1207`	`}`
`1208`	`1208`	`else {`
`1209`		`- throw new InvalidOperationException("Invalid font type.");`
	`1209`	`+ throw new InvalidOperationException("Invalid FONT property value type.");`
`1210`	`1210`	`}`
`1211`	`1211`	`}`
`1212`	`1212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-7c42087a0e89171aa3226cad1eb31e6a1a037937`
	`1`	`+98dae1fa142770319f13920146038d43e3724c49`