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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 3 | ||||
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index a8639941b26c..a104cfe756ff 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -35,12 +35,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ )) $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_rtftok, \ - test \ comphelper \ cppu \ cppuhelper \ sal \ + test \ ucbhelper \ + unotest \ vcl \ writerfilter \ $(gb_STDLIBS) \ diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index 9a012d3eec90..986c67fd8356 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.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> @@ -34,7 +35,9 @@ using namespace ::com::sun::star; -class RtfTest : public test::FiltersTest +class RtfTest + : public test::FiltersTest + , public test::BootstrapFixture { public: @@ -52,7 +55,7 @@ private: void RtfTest::setUp() { - test::FiltersTest::setUp(); + test::BootstrapFixture::setUp(); m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.RtfFilter"))), |