diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-25 19:56:13 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-05 20:05:59 +0200 |
| commit | 3f7e8ddea89f6340cd18b5b34f5a7c5f503962be (patch) | |
| tree | 32b7a033e628e5493fb5e18a8593f442eed23389 /emfio | |
| parent | 368c996b24e09c427a30972b3405493328db6779 (diff) | |
Enable many more unit tests on all archs
This depends on commit "Make font-based unit test depend on instdir
fonts, not that it's sure that this really fixes the problem, as its
origin is really unknown.
It especially enables all the font-based tests I could find on all
archs. Same for many more test where I couldn't see any reason they
don't work generally. To get rid of even more ifdefs, it moves these
from the class to the functions, so there is actually just one needed
for any test. As a result some few tests run but do nothing.
There is still some problem with embedded fonts on MacOS and with
delayed graphics loading on Windows, so these ifdefs are kept.
Change-Id: I63f8424e9debda6cbf3e5777c93245e09f8eb0f2
Reviewed-on: https://gerrit.libreoffice.org/74719
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/qa/cppunit/emf/EmfImportTest.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 30add1aec73f..94b4f6acd11f 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -8,6 +8,7 @@ */ #include <sal/config.h> +#include <config_features.h> #include <test/bootstrapfixture.hxx> #include <test/xmltesttools.hxx> @@ -95,6 +96,7 @@ void Test::testWorking() void Test::TestDrawString() { +#if HAVE_MORE_FONTS // This unit checks for a correct import of an EMF+ file with only one DrawString Record // Since the text is undecorated the optimal choice is a simpletextportion primitive @@ -112,10 +114,12 @@ void Test::TestDrawString() assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "text", "TEST"); assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "fontcolor", "#000000"); assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "familyname", "CALIBRI"); +#endif } void Test::TestDrawStringTransparent() { +#if HAVE_MORE_FONTS // This unit checks for a correct import of an EMF+ file with one DrawString Record with transparency // first, get the sequence of primitives and dump it @@ -133,6 +137,7 @@ void Test::TestDrawStringTransparent() assertXPath(pDocument, "/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion", "text", "Transparent Text"); assertXPath(pDocument, "/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion", "fontcolor", "#0000ff"); assertXPath(pDocument, "/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion", "familyname", "ARIAL"); +#endif } void Test::TestDrawLine() |