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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 5 | ||||
| -rw-r--r-- | sw/qa/core/filters-test.cxx | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 720adae32a90..7726115a3624 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -43,15 +43,16 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \ $(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw $(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \ - test \ sw \ sfx \ svl \ svt \ - vcl \ + test \ tl \ ucbhelper \ + unotest \ utl \ + vcl \ i18nisolang1 \ comphelper \ cppu \ diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index 84bb4be3f8fd..cd63ebec9909 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -27,7 +27,8 @@ * instead of those above. */ -#include <test/filters-test.hxx> +#include <unotest/filters-test.hxx> +#include <test/bootstrapfixture.hxx> #include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> @@ -48,7 +49,9 @@ using namespace ::com::sun::star; /* Implementation of Filters test */ -class SwFiltersTest : public test::FiltersTest +class SwFiltersTest + : public test::FiltersTest + , public test::BootstrapFixture { public: bool load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData); @@ -92,7 +95,7 @@ void SwFiltersTest::testCVEs() void SwFiltersTest::setUp() { - test::FiltersTest::setUp(); + test::BootstrapFixture::setUp(); //This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, //which is a private symbol to us, gets called |