summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-12-04 21:03:42 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-12-05 08:46:16 +0100
commit304368c7be2c9e408cc3884183e39d90a4b15da7 (patch)
tree7ee2ff9585ec481eda691339782f84e73365ba59 /writerfilter
parentf33b6e915fdc29cff25cc93784a04df866ad6bc3 (diff)
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@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/CppunitTest_writerfilter_filters_test.mk (renamed from writerfilter/CppunitTest_writerfilter_rtftok.mk)24
-rw-r--r--writerfilter/Module_writerfilter.mk2
-rw-r--r--writerfilter/qa/cppunittests/filters-test/README (renamed from writerfilter/qa/cppunittests/rtftok/README)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf)bin10867 -> 10867 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf)bin4091 -> 4091 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf)bin3287 -> 3287 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf)bin196 -> 196 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf)bin155 -> 155 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf)bin99 -> 99 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf)bin198 -> 198 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf)bin1560 -> 1560 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf)bin1941 -> 1941 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf)bin2417 -> 2417 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf)bin1333 -> 1333 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-1.rtf)bin458 -> 458 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf)bin1300 -> 1300 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-3.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore (renamed from writerfilter/qa/cppunittests/rtftok/data/indeterminate/.gitignore)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964-1.rtf)bin10869 -> 10869 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf)bin4055 -> 4055 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf)bin4055 -> 4055 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf)bin11167 -> 11167 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf)bin11289 -> 11289 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf)bin27562 -> 27562 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf)bin27564 -> 27564 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf)bin11289 -> 11289 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf)bin93727 -> 93727 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf)bin14334 -> 14334 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/i84172.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf)bin1546 -> 1546 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf)0
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf)bin4055 -> 4055 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf)bin106 -> 106 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf)bin121 -> 121 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf)bin54 -> 54 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf)bin324 -> 324 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf (renamed from writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf)bin1408 -> 1408 bytes
-rw-r--r--writerfilter/qa/cppunittests/filters-test/filters-test.cxx (renamed from writerfilter/qa/cppunittests/rtftok/testrtftok.cxx)5
49 files changed, 16 insertions, 15 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/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
index 2cc9fb3cb58f..2cc9fb3cb58f 100644
--- a/writerfilter/qa/cppunittests/rtftok/README
+++ b/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
index 5cd42052c657..5cd42052c657 100644
--- 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
Binary files differ
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
index 0c639810d34a..0c639810d34a 100644
--- 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
Binary files differ
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
index 18795f5be1d8..18795f5be1d8 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
index 63465b073627..63465b073627 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
index f0152b0fab36..f0152b0fab36 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
index 59c3630a7197..59c3630a7197 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
index 04189171327a..04189171327a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf
index 273bb135c9d0..273bb135c9d0 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf
+++ b/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
index 130ff3f232f1..130ff3f232f1 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf
Binary files differ
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
index 45597c0857e9..45597c0857e9 100644
--- 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
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
index a03be130d1f8..a03be130d1f8 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
index 67a0ea1750f1..67a0ea1750f1 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
index df41b1f88e2a..df41b1f88e2a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
index 7cdb94ab2c79..7cdb94ab2c79 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
index c0bd2691cdde..c0bd2691cdde 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-3.rtf b/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf
index 112162397f43..112162397f43 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-3.rtf
+++ b/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
index e69de29bb2d1..e69de29bb2d1 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/indeterminate/.gitignore
+++ b/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
index da97fba5793c..da97fba5793c 100644
--- 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
Binary files differ
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
index 70321707fe0e..70321707fe0e 100644
--- 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
Binary files differ
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
index c5ea695bc4fd..c5ea695bc4fd 100644
--- 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
Binary files differ
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
index 757cfe62e85a..757cfe62e85a 100644
--- 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
Binary files differ
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
index 4dac58c0c701..4dac58c0c701 100644
--- 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
Binary files differ
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
index da5d0f39bf82..da5d0f39bf82 100644
--- 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
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
index 44d28adcbc57..44d28adcbc57 100644
--- 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
Binary files differ
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
index 64109fbe280f..64109fbe280f 100644
--- 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
Binary files differ
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
index 44ed96982e40..44ed96982e40 100644
--- 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
Binary files differ
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
index f4a7369205f6..f4a7369205f6 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
Binary files differ
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
index 794f325c5bde..794f325c5bde 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
Binary files differ
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
index 7cdb1e15c2f2..7cdb1e15c2f2 100644
--- 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
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf
index a47161a2fb1c..a47161a2fb1c 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
+++ b/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
index 58d88f5fff5b..58d88f5fff5b 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf
+++ b/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
index 5a673ca0461c..5a673ca0461c 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf
+++ b/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
index 1c815c4e7517..1c815c4e7517 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
+++ b/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
index 7e81865adb5f..7e81865adb5f 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf
+++ b/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
index ce6616e5e6a5..ce6616e5e6a5 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/i84172.rtf
+++ b/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
index 3fe4b287640c..3fe4b287640c 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/parser-state-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf
index 869aa339b0f1..869aa339b0f1 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf
+++ b/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
index c3ffebc2b643..c3ffebc2b643 100644
--- 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
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
index 9576906da152..9576906da152 100644
--- 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
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
index 0925203f86ff..0925203f86ff 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf
index 5b34e7f61835..5b34e7f61835 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf
index 58328edc97db..58328edc97db 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-2.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf
index 9fd58921468a..9fd58921468a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf
index 28093f25a6c5..28093f25a6c5 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf b/writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf
index 847e165c5dfa..847e165c5dfa 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf
+++ b/writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/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
}