diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-08 10:39:57 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-08 16:56:47 +0200 |
| commit | 18c628ae6ef2664db40ef46e21064f3ac4713e5c (patch) | |
| tree | f49e7f914652de42f43332b859ed8e4d2a569fcd /emfio/qa/cppunit | |
| parent | 4a00c79aafc6dde331cf4bb351d98226a9337171 (diff) | |
Fix emfio_wmf_test VCL dependency
This unit test sometimes fails on Windows with the message:
"no suitable windowing system found, exiting."
Currently the test just depends on desktop_detector and manually
sets up VCL duplicating a lot of code and even library symbols.
The original Gerrit change describes a lot of failures in its
comments (change 28322, version 16). Now that Windows and MacOS
were converted to VCL plugins, depending on desktop_detector is
not sufficient anymore.
This reverts a lot of VCL test setup from commit 20f6a6b159c6
("tdf#99402: fix Metafile Font handling"). Seems now a simple
gb_CppunitTest_use_vcl is enough.
Change-Id: Ia941ded91358231021741ff4a5d96e2014ac6c80
Reviewed-on: https://gerrit.libreoffice.org/61497
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'emfio/qa/cppunit')
| -rw-r--r-- | emfio/qa/cppunit/wmf/wmfimporttest.cxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index 3c7520a7a2f2..318f6a70826a 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -20,14 +20,14 @@ #include <test/xmltesttools.hxx> #include <test/mtfxmldump.hxx> #include <test/setupvcl.hxx> -#include <unotest/bootstrapfixturebase.hxx> +#include <test/bootstrapfixture.hxx> #include <vcl/wmf.hxx> #include <vcl/metaact.hxx> #include <mtftools.hxx> using namespace css; -class WmfTest : public test::BootstrapFixtureBase, public XmlTestTools +class WmfTest : public test::BootstrapFixture, public XmlTestTools { OUString maDataUrl; @@ -38,20 +38,10 @@ class WmfTest : public test::BootstrapFixtureBase, public XmlTestTools public: WmfTest() : + BootstrapFixture(true, false), maDataUrl("/emfio/qa/cppunit/wmf/data/") {} - // Hack around missing "once per class" setUp/tearDown in CppUnit; must be - // called before/after all other tests: - void globalSetUp() { test::setUpVcl(); } - // void globalTearDown() { /* DeInitVCL(); */ } - // on e.g. Mac OS X, DeInitVCL() causes more trouble than it's worth, - // calling VclPtr<WorkWindow>::disposeAndClear -> ... -> - // vcl::Window::dispose -> UnoWrapper::WindowDestroy (tk) -> ... -> - // Application::GetSolarMutex in the vcl library (linked from tk) - // instead of the vcl objects linked into the unit test library, which - // isn't initialized - void testNonPlaceableWmf(); void testSine(); void testEmfProblem(); @@ -63,7 +53,6 @@ public: void testETO_PDY(); CPPUNIT_TEST_SUITE(WmfTest); - CPPUNIT_TEST(globalSetUp); CPPUNIT_TEST(testNonPlaceableWmf); CPPUNIT_TEST(testSine); CPPUNIT_TEST(testEmfProblem); |