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 /sot | |
| parent | get TestResult dtor before osl::Module dtor (diff) | |
| download | core-db5a5ffa82f835c81cf9a411d24f4cb0b1bb8fa5.tar.gz core-db5a5ffa82f835c81cf9a411d24f4cb0b1bb8fa5.zip | |
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 'sot')
| -rw-r--r-- | sot/CppunitTest_sot_test_sot.mk | 3 | ||||
| -rw-r--r-- | sot/prj/build.lst | 2 | ||||
| -rw-r--r-- | sot/qa/cppunit/data/pass/fdo41642-2.compound | bin | 0 -> 35335 bytes | |||
| -rw-r--r-- | sot/qa/cppunit/test_sot.cxx | 16 |
4 files changed, 8 insertions, 13 deletions
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index d3ac12fb251e..05365287c3ee 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -42,9 +42,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \ cppuhelper \ sal \ sot \ - test \ tl \ - vcl \ + unotest \ $(gb_STDLIBS) \ )) diff --git a/sot/prj/build.lst b/sot/prj/build.lst index 302881c0f94b..73434fb4dc71 100644 --- a/sot/prj/build.lst +++ b/sot/prj/build.lst @@ -1,2 +1,2 @@ -to sot : tools ucbhelper unotools test NULL +to sot : tools ucbhelper unotools unotest NULL to sot\prj nmake - all sot_prj NULL diff --git a/sot/qa/cppunit/data/pass/fdo41642-2.compound b/sot/qa/cppunit/data/pass/fdo41642-2.compound Binary files differnew file mode 100644 index 000000000000..b1ae6dd63046 --- /dev/null +++ b/sot/qa/cppunit/data/pass/fdo41642-2.compound diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx index 39d86cb71c9d..b695e8076e65 100644 --- a/sot/qa/cppunit/test_sot.cxx +++ b/sot/qa/cppunit/test_sot.cxx @@ -26,7 +26,8 @@ * instead of those above. */ -#include <test/filters-test.hxx> +#include <unotest/filters-test.hxx> +#include <unotest/bootstrapfixturebase.hxx> #include <osl/file.hxx> #include <osl/process.h> @@ -36,12 +37,12 @@ using namespace ::com::sun::star; namespace { - class SotTest : public test::FiltersTest + class SotTest + : public test::FiltersTest + , public test::BootstrapFixtureBase { public: - SotTest() : FiltersTest(false, false) {} - - virtual void setUp(); + SotTest() {} virtual bool load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &); @@ -53,11 +54,6 @@ namespace CPPUNIT_TEST_SUITE_END(); }; - void SotTest::setUp() - { - test::FiltersTest::setUp(); - } - bool SotTest::load(const rtl::OUString &, const rtl::OUString &rURL, const rtl::OUString &) { |