diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-12 15:19:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-15 12:18:44 +0100 |
commit | db5a5ffa82f835c81cf9a411d24f4cb0b1bb8fa5 (patch) | |
tree | 0e320d48ea2ce24a87f33095d2959919333c0b5c /lotuswordpro | |
parent | 528a225ddb1d429eeb048626d5e9e045118bad2e (diff) |
split bootstrapfixture and move test-filters class for sot test
sot is below vcl, but is a filters test, we can split bootstrapfixture
into a vcl needing bit and and non-vcl bit and filters test api
can be standalone and combined with whichever bit in order to form
pre and post vcl filters test
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 3 | ||||
-rw-r--r-- | lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 66aee3400ffe..0541ed888894 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -37,11 +37,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpr )) $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \ - test \ comphelper \ cppu \ cppuhelper \ sal \ + test \ + unotest \ vcl \ $(gb_STDLIBS) \ )) diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx index 7500e25317b7..1f1f4e032aa1 100644 --- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx +++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx @@ -26,7 +26,8 @@ * instead of those above. */ -#include <test/filters-test.hxx> +#include <unotest/filters-test.hxx> +#include <test/bootstrapfixture.hxx> #include <com/sun/star/document/XFilter.hpp> #include <osl/file.hxx> @@ -36,10 +37,12 @@ using namespace ::com::sun::star; namespace { - class LotusWordProTest : public test::FiltersTest + class LotusWordProTest + : public test::FiltersTest + , public test::BootstrapFixture { public: - LotusWordProTest() : FiltersTest(true, false) {} + LotusWordProTest() : BootstrapFixture(true, false) {} virtual void setUp(); @@ -57,7 +60,7 @@ namespace void LotusWordProTest::setUp() { - test::FiltersTest::setUp(); + test::BootstrapFixture::setUp(); m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( |