[Libreoffice-commits] core.git: writerfilter/CppunitTest_writerfilter_filters_test.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Module_writerfilter.mk writerfilter/qa

Thu Dec 5 07:47:24 UTC 2019

writerfilter/CppunitTest_writerfilter_filters_test.mk      |   24 ++++++-------
 writerfilter/Module_writerfilter.mk                        |    2 -
 writerfilter/qa/cppunittests/filters-test/filters-test.cxx |    5 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 304368c7be2c9e408cc3884183e39d90a4b15da7
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 4 21:03:42 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Dec 5 08:46:16 2019 +0100

    writerfilter: name the FiltersTest test CppunitTest_writerfilter_filters_test
    
    To be consistent with CppunitTest_vcl_filters_test. This also allows
    writing actual manual test code for writerfilter/source/rtftok/ (next to
    the tested code) later, where the natural choice for such a test suite
    would be CppunitTest_writerfilter_rtftok.
    
    Change-Id: Iff5be9b95b6c2be3ef441e7a766584b2d008a66a
    Reviewed-on: https://gerrit.libreoffice.org/84460
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_filters_test.mk
similarity index 56%
rename from writerfilter/CppunitTest_writerfilter_rtftok.mk
rename to writerfilter/CppunitTest_writerfilter_filters_test.mk
index 7f23290cc84b..a08c6667511f 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_filters_test.mk
@@ -9,21 +9,21 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_filters_test))
 
-$(eval $(call gb_CppunitTest_use_external,writerfilter_rtftok,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,writerfilter_filters_test,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
-	writerfilter/qa/cppunittests/rtftok/testrtftok \
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_filters_test, \
+	writerfilter/qa/cppunittests/filters-test/filters-test \
 ))
 
 ifeq ($(DISABLE_CVE_TESTS),TRUE)
-$(eval $(call gb_CppunitTest_add_defs,writerfilter_rtftok,\
+$(eval $(call gb_CppunitTest_add_defs,writerfilter_filters_test,\
     -DDISABLE_CVE_TESTS \
 ))
 endif
 
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
+$(eval $(call gb_CppunitTest_use_libraries,writerfilter_filters_test, \
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -34,12 +34,12 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
 	writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_filters_test))
 
-$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
-$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_ure,writerfilter_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,writerfilter_filters_test))
 
-$(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
+$(eval $(call gb_CppunitTest_use_components,writerfilter_filters_test,\
 	configmgr/source/configmgr \
 	framework/util/fwk \
 	i18npool/util/i18npool \
@@ -52,10 +52,10 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 
 
 
-$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_configuration,writerfilter_filters_test))
 
 # we need to explicitly depend on library writerfilter because it is not implied
 # by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
+$(call gb_CppunitTest_get_target,writerfilter_filters_test) : $(call gb_Library_get_target,writerfilter)
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 2fcb9e691078..516a4832f340 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
-    CppunitTest_writerfilter_rtftok \
+    CppunitTest_writerfilter_filters_test \
     CppunitTest_writerfilter_misc \
 ))
 
diff --git a/writerfilter/qa/cppunittests/rtftok/README b/writerfilter/qa/cppunittests/filters-test/README
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/README
rename to writerfilter/qa/cppunittests/filters-test/README
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-3.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-3.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/indeterminate/.gitignore b/writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/indeterminate/.gitignore
rename to writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/i84172.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/i84172.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf
similarity index 100%
rename from writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf
rename to writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/filters-test/filters-test.cxx
similarity index 93%
rename from writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
rename to writerfilter/qa/cppunittests/filters-test/filters-test.cxx
index a7f60d4bbfc0..cd1863259569 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/filters-test/filters-test.cxx
@@ -16,7 +16,7 @@
 using namespace ::com::sun::star;
 
 /**
- * Unit test invoking the Writer RTF import filter.
+ * Unit test invoking writerfilter/ only.
  *
  * This does only minimal testing, checking if the filter crashes and returns
  * the expected bool value for given inputs. More fine-grained tests can be
@@ -69,7 +69,8 @@ bool RtfTest::load(const OUString&, const OUString& rURL, const OUString&, SfxFi
 CPPUNIT_TEST_FIXTURE(RtfTest, testFilter)
 {
 #ifndef DISABLE_CVE_TESTS
-    testDir(OUString(), m_directories.getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"));
+    testDir(OUString(),
+            m_directories.getURLFromSrc("/writerfilter/qa/cppunittests/filters-test/data/"));
 #endif
 }
 
