Kaydet (Commit) 675a74d5 authored tarafından David Tardon's avatar David Tardon

rename to better match the purpose

Change-Id: I7cd8e551c284045fbe782cc9756e283d466fd1bc
üst 7a4a6533
......@@ -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))
......
......@@ -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))
......
......@@ -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))
......
......@@ -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))
......
......@@ -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:
......@@ -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:
......@@ -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")
{
}
......
......@@ -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")
{
}
......
......@@ -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();
......
......@@ -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: */
......@@ -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")
{
}
......
......@@ -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")
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment