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

Szymon Kłos szymon.klos at collabora.com
Sat Feb 17 06:02:29 UTC 2018


 sd/qa/unit/export-tests-ooxml2.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7a510effa4566d405d2033b6635b42c08d34dec8
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Fri Feb 16 22:13:49 2018 +0100

    Fix fontScale test
    
    Change-Id: Idd16270cc6af0108442ba26db62ed933bbb0a63a
    Reviewed-on: https://gerrit.libreoffice.org/49881
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 51e13eb80a5e..9fc5302f0325 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1415,7 +1415,10 @@ void SdOOXMLExportTest2::testFontScale()
     xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
     xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 
-    assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:normAutofit", "fontScale", "73000");
+    // Rounding errors possible, approximate value
+    OUString sScale = getXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:normAutofit", "fontScale");
+    if (sScale != "73000" && sScale != "72000" && sScale != "74000")
+        CPPUNIT_ASSERT_EQUAL(OUString("73000"), sScale);
 
     xDocShRef->DoClose();
 }


More information about the Libreoffice-commits mailing list