summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-12-01 16:18:37 +0100
committerDavid Tardon <dtardon@redhat.com>2016-12-05 10:41:52 +0100
commit675a74d5e57af8f6f3a30b69122cbd5faf392a86 (patch)
treec3ff57c961a6a9614d405dce49ca0ec456221e27 /writerperfect
parent7a4a6533e0313d6b8af448e2cc0de7b3fd5a493b (diff)
rename to better match the purpose
Change-Id: I7cd8e551c284045fbe782cc9756e283d466fd1bc
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/CppunitTest_writerperfect_calc.mk2
-rw-r--r--writerperfect/CppunitTest_writerperfect_draw.mk2
-rw-r--r--writerperfect/CppunitTest_writerperfect_impress.mk2
-rw-r--r--writerperfect/CppunitTest_writerperfect_writer.mk2
-rw-r--r--writerperfect/Module_writerperfect.mk2
-rw-r--r--writerperfect/StaticLibrary_writerperfect_filtertestbase.mk (renamed from writerperfect/StaticLibrary_writerperfect_importtestbase.mk)14
-rw-r--r--writerperfect/qa/unit/WpftCalcFilterTest.cxx6
-rw-r--r--writerperfect/qa/unit/WpftDrawFilterTest.cxx6
-rw-r--r--writerperfect/qa/unit/WpftFilterTestBase.cxx (renamed from writerperfect/qa/unit/WpftImportTestBase.cxx)16
-rw-r--r--writerperfect/qa/unit/WpftFilterTestBase.hxx (renamed from writerperfect/qa/unit/WpftImportTestBase.hxx)10
-rw-r--r--writerperfect/qa/unit/WpftImpressFilterTest.cxx6
-rw-r--r--writerperfect/qa/unit/WpftWriterFilterTest.cxx6
12 files changed, 37 insertions, 37 deletions
diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk
index 04c8a2e54087..c7a8327c397a 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_calc,\
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_calc,\
- writerperfect_importtestbase \
+ writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_calc))
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index 24f7ce40b88b..bd7a582d0d15 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_draw,\
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_draw,\
- writerperfect_importtestbase \
+ writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_draw))
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index 9e8574790d1e..352da2bee3f6 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_impress,\
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_impress,\
- writerperfect_importtestbase \
+ writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_impress))
diff --git a/writerperfect/CppunitTest_writerperfect_writer.mk b/writerperfect/CppunitTest_writerperfect_writer.mk
index e9337009111f..3d20725fa344 100644
--- a/writerperfect/CppunitTest_writerperfect_writer.mk
+++ b/writerperfect/CppunitTest_writerperfect_writer.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_writer,\
))
$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_writer,\
- writerperfect_importtestbase \
+ writerperfect_filtertestbase \
))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_writer))
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 860a213f9536..c6a3b042ec4d 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
CppunitTest_writerperfect_draw \
CppunitTest_writerperfect_impress \
CppunitTest_writerperfect_writer \
- StaticLibrary_writerperfect_importtestbase \
+ StaticLibrary_writerperfect_filtertestbase \
))
# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/StaticLibrary_writerperfect_importtestbase.mk b/writerperfect/StaticLibrary_writerperfect_filtertestbase.mk
index bdd79708076a..379964caad8f 100644
--- a/writerperfect/StaticLibrary_writerperfect_importtestbase.mk
+++ b/writerperfect/StaticLibrary_writerperfect_filtertestbase.mk
@@ -7,29 +7,29 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect_importtestbase))
+$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect_filtertestbase))
-$(eval $(call gb_StaticLibrary_set_include,writerperfect_importtestbase,\
+$(eval $(call gb_StaticLibrary_set_include,writerperfect_filtertestbase,\
-I$(SRCDIR)/writerperfect/qa/unit \
$$(INCLUDE) \
))
-$(eval $(call gb_StaticLibrary_use_externals,writerperfect_importtestbase,\
+$(eval $(call gb_StaticLibrary_use_externals,writerperfect_filtertestbase,\
boost_headers \
cppunit \
))
-$(eval $(call gb_StaticLibrary_use_sdk_api,writerperfect_importtestbase))
+$(eval $(call gb_StaticLibrary_use_sdk_api,writerperfect_filtertestbase))
-$(eval $(call gb_StaticLibrary_use_libraries,writerperfect_importtestbase,\
+$(eval $(call gb_StaticLibrary_use_libraries,writerperfect_filtertestbase,\
cppu \
sal \
test \
unotest \
))
-$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect_importtestbase,\
- writerperfect/qa/unit/WpftImportTestBase \
+$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect_filtertestbase,\
+ writerperfect/qa/unit/WpftFilterTestBase \
))
# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 98c43024a821..ce799956b3d0 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "WpftImportTestBase.hxx"
+#include "WpftFilterTestBase.hxx"
namespace
{
-class WpftCalcFilterTest : public writerperfect::test::WpftImportTestBase
+class WpftCalcFilterTest : public writerperfect::test::WpftFilterTestBase
{
public:
WpftCalcFilterTest();
@@ -25,7 +25,7 @@ public:
};
WpftCalcFilterTest::WpftCalcFilterTest()
- : writerperfect::test::WpftImportTestBase("private:factory/scalc")
+ : writerperfect::test::WpftFilterTestBase("private:factory/scalc")
{
}
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index b2c9bb823b6d..95a85c4ef52b 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "WpftImportTestBase.hxx"
+#include "WpftFilterTestBase.hxx"
namespace
{
-class WpftDrawFilterTest : public writerperfect::test::WpftImportTestBase
+class WpftDrawFilterTest : public writerperfect::test::WpftFilterTestBase
{
public:
WpftDrawFilterTest();
@@ -25,7 +25,7 @@ public:
};
WpftDrawFilterTest::WpftDrawFilterTest()
- : writerperfect::test::WpftImportTestBase("private:factory/sdraw")
+ : writerperfect::test::WpftFilterTestBase("private:factory/sdraw")
{
}
diff --git a/writerperfect/qa/unit/WpftImportTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index 66bc021d992d..c5b0eb698136 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -28,7 +28,7 @@
#include <ucbhelper/content.hxx>
-#include "WpftImportTestBase.hxx"
+#include "WpftFilterTestBase.hxx"
namespace beans = com::sun::star::beans;
namespace container = com::sun::star::container;
@@ -45,7 +45,7 @@ namespace writerperfect
namespace test
{
-WpftImportTestBase::WpftImportTestBase(const rtl::OUString &rFactoryURL)
+WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString &rFactoryURL)
: ::test::FiltersTest()
, ::test::BootstrapFixture()
, m_aFactoryURL(rFactoryURL)
@@ -56,7 +56,7 @@ WpftImportTestBase::WpftImportTestBase(const rtl::OUString &rFactoryURL)
{
}
-void WpftImportTestBase::setUp()
+void WpftFilterTestBase::setUp()
{
::test::BootstrapFixture::setUp();
@@ -68,14 +68,14 @@ void WpftImportTestBase::setUp()
m_xTypeMap.set(xTypeDetection, uno::UNO_QUERY_THROW);
}
-void WpftImportTestBase::tearDown()
+void WpftFilterTestBase::tearDown()
{
m_xDesktop->terminate();
::test::BootstrapFixture::tearDown();
}
-bool WpftImportTestBase::load(const OUString &, const OUString &rURL, const OUString &,
+bool WpftFilterTestBase::load(const OUString &, const OUString &rURL, const OUString &,
SfxFilterFlags, SotClipboardFormatId, unsigned int)
{
if (m_pOptionalMap)
@@ -169,13 +169,13 @@ bool WpftImportTestBase::load(const OUString &, const OUString &rURL, const OUSt
return result;
}
-void WpftImportTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath)
+void WpftFilterTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
testDir(OUString(), m_directories.getURLFromSrc(rPath));
}
-void WpftImportTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath, const WpftOptionalMap_t &rOptionalMap)
+void WpftFilterTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUString &rPath, const WpftOptionalMap_t &rOptionalMap)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
m_pOptionalMap = &rOptionalMap;
@@ -183,7 +183,7 @@ void WpftImportTestBase::doTest(const rtl::OUString &rFilter, const rtl::OUStrin
m_pOptionalMap = nullptr;
}
-void WpftImportTestBase::impl_detectFilterName(uno::Sequence<beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName)
+void WpftFilterTestBase::impl_detectFilterName(uno::Sequence<beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName)
{
const sal_Int32 nDescriptorLen = rDescriptor.getLength();
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx
index a3baec93a3e7..c6eb9c315c77 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTIMPORTTESTBASE_HXX
-#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTIMPORTTESTBASE_HXX
+#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
+#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
#include "config_writerperfect.h"
@@ -81,12 +81,12 @@ namespace test
typedef std::unordered_map<rtl::OUString, bool, rtl::OUStringHash> WpftOptionalMap_t;
-class WpftImportTestBase
+class WpftFilterTestBase
: public ::test::FiltersTest
, public ::test::BootstrapFixture
{
public:
- explicit WpftImportTestBase(const rtl::OUString &rFactoryURL);
+ explicit WpftFilterTestBase(const rtl::OUString &rFactoryURL);
virtual void setUp() override;
virtual void tearDown() override;
@@ -112,6 +112,6 @@ private:
}
}
-#endif // INCLUDED_WRITERPERFECT_QA_UNIT_WPFTIMPORTTESTBASE_HXX
+#endif // INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index ce69dcdc6a2f..5738c97de5a2 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "WpftImportTestBase.hxx"
+#include "WpftFilterTestBase.hxx"
namespace
{
-class WpftImpressFilterTest : public writerperfect::test::WpftImportTestBase
+class WpftImpressFilterTest : public writerperfect::test::WpftFilterTestBase
{
public:
WpftImpressFilterTest();
@@ -25,7 +25,7 @@ public:
};
WpftImpressFilterTest::WpftImpressFilterTest()
- : writerperfect::test::WpftImportTestBase("private:factory/simpress")
+ : writerperfect::test::WpftFilterTestBase("private:factory/simpress")
{
}
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 3e9c6bad9105..515a2b8a7e92 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "WpftImportTestBase.hxx"
+#include "WpftFilterTestBase.hxx"
namespace
{
-class WpftWriterFilterTest : public writerperfect::test::WpftImportTestBase
+class WpftWriterFilterTest : public writerperfect::test::WpftFilterTestBase
{
public:
WpftWriterFilterTest();
@@ -25,7 +25,7 @@ public:
};
WpftWriterFilterTest::WpftWriterFilterTest()
- : writerperfect::test::WpftImportTestBase("private:factory/swriter")
+ : writerperfect::test::WpftFilterTestBase("private:factory/swriter")
{
}