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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 5 | ||||
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index d6ea1b8b1eb7..38f013b31fef 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_filters_test, \ )) $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \ - test \ avmedia \ basegfx \ comphelper \ @@ -60,9 +59,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \ svt \ svx \ svxcore \ - tk \ + test \ tl \ + tk \ ucbhelper \ + unotest \ utl \ vbahelper \ vcl \ diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 38eb9401a63d..1faba35c5758 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -28,7 +28,8 @@ */ #include <sal/config.h> -#include <test/filters-test.hxx> +#include <unotest/filters-test.hxx> +#include <test/bootstrapfixture.hxx> #include <rtl/strbuf.hxx> #include <osl/file.hxx> @@ -137,7 +138,9 @@ void testCondFile(rtl::OUString& aFileName, ScDocument* pDoc, SCTAB nTab) /* Implementation of Filters test */ -class ScFiltersTest : public test::FiltersTest +class ScFiltersTest + : public test::FiltersTest + , public test::BootstrapFixture { public: ScFiltersTest(); @@ -648,7 +651,7 @@ ScFiltersTest::ScFiltersTest() void ScFiltersTest::setUp() { - test::FiltersTest::setUp(); + test::BootstrapFixture::setUp(); // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called @@ -661,7 +664,7 @@ void ScFiltersTest::setUp() void ScFiltersTest::tearDown() { uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW )->dispose(); - test::FiltersTest::tearDown(); + test::BootstrapFixture::tearDown(); } CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest); |