diff --git a/filter/CppunitTest_filter_utils.mk b/filter/CppunitTest_filter_msfilter.mk similarity index 56% rename from filter/CppunitTest_filter_utils.mk rename to filter/CppunitTest_filter_msfilter.mk index 1d042a980ccb..aa567cd7c25e 100644 --- a/filter/CppunitTest_filter_utils.mk +++ b/filter/CppunitTest_filter_msfilter.mk @@ -7,18 +7,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CppunitTest_CppunitTest,filter_utils)) +$(eval $(call gb_CppunitTest_CppunitTest,filter_msfilter)) -$(eval $(call gb_CppunitTest_use_sdk_api,filter_utils)) -$(eval $(call gb_CppunitTest_use_ure,filter_utils)) +$(eval $(call gb_CppunitTest_use_sdk_api,filter_msfilter)) +$(eval $(call gb_CppunitTest_use_ure,filter_msfilter)) -$(eval $(call gb_CppunitTest_use_configuration,filter_utils)) +$(eval $(call gb_CppunitTest_use_configuration,filter_msfilter)) -$(eval $(call gb_CppunitTest_use_externals,filter_utils, \ +$(eval $(call gb_CppunitTest_use_externals,filter_msfilter, \ boost_headers \ )) -$(eval $(call gb_CppunitTest_use_libraries,filter_utils, \ +$(eval $(call gb_CppunitTest_use_libraries,filter_msfilter, \ tl \ comphelper \ unotest \ @@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_utils, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_use_components,filter_utils,\ +$(eval $(call gb_CppunitTest_use_components,filter_msfilter,\ configmgr/source/configmgr \ filter/source/config/cache/filterconfig1 \ framework/util/fwk \ @@ -39,8 +39,8 @@ $(eval $(call gb_CppunitTest_use_components,filter_utils,\ ucb/source/ucp/file/ucpfile1 \ )) -$(eval $(call gb_CppunitTest_add_exception_objects,filter_utils, \ - filter/qa/cppunit/utils-test \ +$(eval $(call gb_CppunitTest_add_exception_objects,filter_msfilter, \ + filter/qa/cppunit/msfilter-test \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 4cb64628d53f..4af530cd9130 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -81,7 +81,7 @@ endif $(eval $(call gb_Module_add_check_targets,filter,\ CppunitTest_filter_xslt \ CppunitTest_filter_priority \ - CppunitTest_filter_utils \ + CppunitTest_filter_msfilter \ )) ifneq ($(DISABLE_CVE_TESTS),TRUE) diff --git a/filter/qa/cppunit/utils-test.cxx b/filter/qa/cppunit/msfilter-test.cxx similarity index 95% rename from filter/qa/cppunit/utils-test.cxx rename to filter/qa/cppunit/msfilter-test.cxx index 5e306ef99335..b6706f4af7e7 100644 --- a/filter/qa/cppunit/utils-test.cxx +++ b/filter/qa/cppunit/msfilter-test.cxx @@ -20,18 +20,18 @@ namespace { -class UtilsTest +class MSFilterTest : public test::BootstrapFixtureBase { public: void testTransColToIco(); - CPPUNIT_TEST_SUITE(UtilsTest); + CPPUNIT_TEST_SUITE(MSFilterTest); CPPUNIT_TEST(testTransColToIco); CPPUNIT_TEST_SUITE_END(); }; -void UtilsTest::testTransColToIco() +void MSFilterTest::testTransColToIco() { const sal_uInt32 aStdCol[] = { 0xeeeeee, 0xffff99, 0xff6600, 0xff3333, 0xff00cc, 0xff33ff, 0x9900ff, 0x6666ff, 0x00ccff, 0x66ffff, 0x33ff99, 0x99ff66, 0xccff00, @@ -68,7 +68,7 @@ void UtilsTest::testTransColToIco() } -CPPUNIT_TEST_SUITE_REGISTRATION(UtilsTest); +CPPUNIT_TEST_SUITE_REGISTRATION(MSFilterTest); }