From db5a5ffa82f835c81cf9a411d24f4cb0b1bb8fa5 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 12 Oct 2011 15:19:21 +0100
Subject: 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
---
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 3 ++-
 hwpfilter/qa/cppunit/test_hwpfilter.cxx           | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'hwpfilter')

diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 01edac8988ba..a6c841cb9992 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -37,12 +37,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,hwpfilter_test_hwpfilter, \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,hwpfilter_test_hwpfilter, \
-    test \
     ucbhelper \
     comphelper \
     cppu \
     cppuhelper \
     sal \
+    test \
+    unotest \
     $(gb_STDLIBS) \
 ))
 
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index 2e96284da31f..cbd3aa0bdb20 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.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>
@@ -37,7 +38,9 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    class HwpFilterTest : public test::FiltersTest
+    class HwpFilterTest
+        : public test::FiltersTest
+        , public test::BootstrapFixture
     {
     public:
         virtual void setUp();
@@ -53,7 +56,7 @@ namespace
 
     void HwpFilterTest::setUp()
     {
-        test::FiltersTest::setUp();
+        test::BootstrapFixture::setUp();
 
         m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance(
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-- 
cgit