mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable CppunitTest_sw_odfexport for MACOSX

Browse Source 
The whole boy of sw/qa/extras/odfexport/odfexport.cxx had been disabled for
MACOSX and WNT with effeb7b039 "sw/qa: 1
individual unit test per filter (import/export) test", for no clear reason, then
enabled again for WNT (but left disabled for MACOSX) with
960db7d4a8 "CppunitTest_sw_odfexport: enable on
Windows".

What fails for me on macOS is

> /Users/stephan/Software/lo/core/test/source/xmltesttools.cxx:71: Assertion
> Test name: testEmbeddedFontProps::Import_Export_Import
> equality assertion failed
> - Expected: 1
> - Actual  : 0
> - In <file:///Users/stephan/Software/lo/TMPDIR/libtest_sw_odfexport.dylibf8drfk.tmp>, XPath '//style:font-face[@style:name='Liberation Serif']/svg:font-face-src/svg:font-face-uri[1]' number of nodes is incorrect
>
> /Users/stephan/Software/lo/core/sw/qa/extras/odfexport/odfexport.cxx:1948: Assertion
> Test name: testBulletAsImage::Import
> equality assertion failed
> - Expected: 15
> - Actual  : 17
>
> /Users/stephan/Software/lo/core/sw/qa/extras/odfexport/odfexport.cxx:1948: Assertion
> Test name: testBulletAsImage::Import_Export_Import
> equality assertion failed
> - Expected: 15
> - Actual  : 17
>
> Failures !!!
> Run: 99   Failure total: 3   Failures: 3   Errors: 0

of which the first was already disabled individually for WNT (so disabled it for
MACOSX, too), and the latter two are covered by a new TODO disabling just the
relevant CPPUNIT_ASSERT_EQUAL for MACOSX for now.

Change-Id: I233f71dc9566b1e21d34f4ef65cbddb364bb6f03
Reviewed-on: https://gerrit.libreoffice.org/53961
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-05-08 11:16:16 +02:00
parent fa17a6021f
commit fe192a7b74
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/qa/extras/odfexport/odfexport.cxx
View File

@@ -13,7 +13,6 @@
#include <initializer_list>
#if !defined(MACOSX)
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
@@ -1828,7 +1827,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt")
DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt")
{
#if !defined(WNT)
#if !defined(MACOSX) && !defined(WNT)
// Test that font style/weight of embedded fonts is exposed.
// Test file is a normal ODT, except EmbedFonts is set to true in settings.xml.
if (xmlDocPtr pXmlDoc = parseExport("content.xml"))
@@ -1946,8 +1945,10 @@ DECLARE_ODFEXPORT_TEST(testBulletAsImage, "BulletAsImage.odt")
Graphic aGraphic(uno::Reference<graphic::XGraphic>(xBitmap, uno::UNO_QUERY));
CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType());
CPPUNIT_ASSERT(aGraphic.GetSizeBytes() > sal_uLong(0));
#if !defined(MACOSX) //TODO: 17 vs. 15
CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Width());
CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Height());
#endif
}
DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fodt")
@@ -2007,7 +2008,5 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt"
}
}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */