From 8a0d0457a79836fa9d8ea8d4c48ecbf7bac2e95b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 5 Oct 2011 16:00:44 +0100 Subject: test fix: use setUp and tearDown not constructors to init LibreOffice It turns out the constructors are all run back-to-back one per filter, and we need to init and de-init in a sensible order to make multiple tests that otherwise share the ContentBroker work properly. --- lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lotuswordpro/qa') diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx index b68c86df5cbf..7500e25317b7 100644 --- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx +++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx @@ -39,7 +39,9 @@ namespace class LotusWordProTest : public test::FiltersTest { public: - LotusWordProTest(); + LotusWordProTest() : FiltersTest(true, false) {} + + virtual void setUp(); virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &); @@ -53,9 +55,10 @@ namespace uno::Reference m_xFilter; }; - LotusWordProTest::LotusWordProTest() - : FiltersTest(true, false) + void LotusWordProTest::setUp() { + test::FiltersTest::setUp(); + m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.LotusWordProImportFilter"))), -- cgit