[Libreoffice-commits] core.git: svgio/qa

[Xisco Fauli]

 svgio/qa/cppunit/SvgImportTest.cxx         |    7 ++++++-
 svgio/qa/cppunit/data/FontsizeRelative.svg |    5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 292e25e66d67b528dfc81665aac2c58897871667
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue May 31 00:44:26 2016 +0200

    SVGIO: Modify a unittest to check "inherit" in font-family
    
    Change-Id: I4a339b419a5abd1ad02f7aef2abd016a1c2260b8
    Reviewed-on: https://gerrit.libreoffice.org/25695
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <anistenis at gmail.com>

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx
index 3fd6c41..645ad1b 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -296,7 +296,12 @@ void Test::testFontsizeRelative()
     assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "fontcolor", "#000000");
     assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "text", "Sample");
     assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "height", "50");
-    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "Times New Roman");
+    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "serif");
+
+    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "fontcolor", "#000000");
+    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "text", "Sample");
+    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "height", "50");
+    assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "familyname", "serif");
 }
 
 void Test::testTdf45771()
diff --git a/svgio/qa/cppunit/data/FontsizeRelative.svg b/svgio/qa/cppunit/data/FontsizeRelative.svg
index 339e663..b957b90 100644
--- a/svgio/qa/cppunit/data/FontsizeRelative.svg
+++ b/svgio/qa/cppunit/data/FontsizeRelative.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?> <svg height="600" width="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g font-size="5px">
-	<text x="150" y="150" font-size="10em">Sample</text>
+<g font-size="5px" font-family="serif">
+	<text x="10" y="150" font-size="10em" font-family="inherit">Sample</text>
+	<text x="200" y="150" font-size="10em" font-family="serif">Sample</text>
 </g> 
 </svg>