Fix CssFontFaceRule#toString() to produce valid CSS

DEVSIX-3321

Author: Snipx

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/CssFontFaceRule.java

@@ -42,8 +42,6 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.styledxmlparser.css;
 
-import com.itextpdf.io.util.MessageFormatUtil;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -89,13 +87,11 @@ public void addBodyCssDeclarations(List<CssDeclaration> cssDeclarations) {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(MessageFormatUtil.format("@{0} ", ruleName));
-        sb.append("{");
-        sb.append("\n");
+        sb.append("@").append(getRuleName()).append(" {").append("\n");
         for (CssDeclaration declaration : properties) {
             sb.append("    ");
             sb.append(declaration);
-            sb.append("\n");
+            sb.append(";\n");
         }
         sb.append("}");
         return sb.toString();

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/css/CssFontFaceRuleTest.java

@@ -0,0 +1,30 @@
+package com.itextpdf.styledxmlparser.css;
+
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Category(UnitTest.class)
+public class CssFontFaceRuleTest extends ExtendedITextTest {
+
+    @Test
+    public void verifyThatToStringProducesValidCss() {
+        CssFontFaceRule fontFaceRule = new CssFontFaceRule("");
+        List<CssDeclaration> declarations = new ArrayList<>();
+        declarations.add(new CssDeclaration(CommonCssConstants.FONT_FAMILY, "test-font-family"));
+        declarations.add(new CssDeclaration(CommonCssConstants.FONT_WEIGHT, CommonCssConstants.BOLD));
+        fontFaceRule.addBodyCssDeclarations(declarations);
+
+        String expectedCss = "@font-face {\n" +
+                             "    font-family: test-font-family;\n" +
+                             "    font-weight: bold;\n" +
+                             "}";
+        Assert.assertEquals(expectedCss, fontFaceRule.toString());
+    }
+
+}

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/css/CssNestedAtRuleFactoryTest.java

@@ -0,0 +1,30 @@
+package com.itextpdf.styledxmlparser.css;
+
+import com.itextpdf.styledxmlparser.css.page.CssMarginRule;
+import com.itextpdf.styledxmlparser.css.page.CssPageRule;
+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 CssNestedAtRuleFactoryTest extends ExtendedITextTest {
+
+    @Test
+    public void testCreatingNestedRule() {
+        CssNestedAtRule pageRule = CssNestedAtRuleFactory.createNestedRule("page:first");
+        Assert.assertTrue(pageRule instanceof CssPageRule);
+        Assert.assertEquals(CssRuleName.PAGE, pageRule.getRuleName());
+        Assert.assertEquals(":first", pageRule.getRuleParameters());
+
+        CssNestedAtRule rightBottomMarginRule = CssNestedAtRuleFactory.createNestedRule("bottom-right");
+        Assert.assertTrue(rightBottomMarginRule instanceof CssMarginRule);
+        Assert.assertEquals(CssRuleName.BOTTOM_RIGHT, rightBottomMarginRule.getRuleName());
+
+        CssNestedAtRule fontFaceRule = CssNestedAtRuleFactory.createNestedRule("font-face");
+        Assert.assertTrue(fontFaceRule instanceof CssFontFaceRule);
+        Assert.assertEquals(CssRuleName.FONT_FACE, fontFaceRule.getRuleName());
+    }
+
+}