include/test/unoapi_test.hxx | 2
sw/CppunitTest_sw_core_accessibilitycheck.mk | 1
sw/CppunitTest_sw_core_attr.mk | 1
sw/CppunitTest_sw_core_crsr.mk | 1
sw/CppunitTest_sw_core_doc.mk | 1
sw/CppunitTest_sw_core_docnode.mk | 1
sw/CppunitTest_sw_core_draw.mk | 1
sw/CppunitTest_sw_core_edit.mk | 1
sw/CppunitTest_sw_core_fields.mk | 1
sw/CppunitTest_sw_core_frmedt.mk | 1
sw/CppunitTest_sw_core_layout.mk | 1
sw/CppunitTest_sw_core_objectpositioning.mk | 1
sw/CppunitTest_sw_core_text.mk | 1
sw/CppunitTest_sw_core_tox.mk | 1
sw/CppunitTest_sw_core_txtnode.mk | 1
sw/CppunitTest_sw_core_undo.mk | 1
sw/CppunitTest_sw_core_unocore.mk | 1
sw/CppunitTest_sw_core_view.mk | 1
sw/CppunitTest_sw_docbookexport.mk | 1
sw/CppunitTest_sw_filter_html.mk | 1
sw/CppunitTest_sw_filter_ww8.mk | 1
sw/CppunitTest_sw_filters_test.mk | 1
sw/CppunitTest_sw_filters_test2.mk | 1
sw/CppunitTest_sw_fodfexport.mk | 1
sw/CppunitTest_sw_globalfilter.mk | 1
sw/CppunitTest_sw_htmlexport.mk | 1
sw/CppunitTest_sw_htmlimport.mk | 1
sw/CppunitTest_sw_indexingexport.mk | 1
sw/CppunitTest_sw_mailmerge.mk | 1
sw/CppunitTest_sw_mailmerge2.mk | 1
sw/CppunitTest_sw_odfexport.mk | 1
sw/CppunitTest_sw_odfexport2.mk | 1
sw/CppunitTest_sw_odfimport.mk | 1
sw/CppunitTest_sw_ooxmlexport8.mk | 1
sw/CppunitTest_sw_ooxmlimport.mk | 1
sw/CppunitTest_sw_ooxmlimport2.mk | 1
sw/CppunitTest_sw_rtfimport.mk | 1
sw/CppunitTest_sw_tiledrendering.mk | 1
sw/CppunitTest_sw_txtencexport.mk | 1
sw/CppunitTest_sw_txtexport.mk | 1
sw/CppunitTest_sw_txtimport.mk | 1
sw/CppunitTest_sw_uibase_dochdl.mk | 1
sw/CppunitTest_sw_uibase_docvw.mk | 1
sw/CppunitTest_sw_uibase_fldui.mk | 1
sw/CppunitTest_sw_uibase_frmdlg.mk | 1
sw/CppunitTest_sw_uibase_shells.mk | 1
sw/CppunitTest_sw_uibase_uiview.mk | 1
sw/CppunitTest_sw_uibase_uno.mk | 1
sw/CppunitTest_sw_uibase_wrtsh.mk | 1
sw/CppunitTest_sw_unowriter.mk | 1
sw/CppunitTest_sw_ww8import.mk | 1
sw/CppunitTest_sw_xhtmlexport.mk | 1
sw/Library_swqahelper.mk | 1
sw/layoutwriter_setup.mk | 1
sw/ooxmlexport_setup.mk | 1
sw/qa/inc/swmodeltestbase.hxx | 34 ---------------
sw/qa/unit/swmodeltestbase.cxx | 60 ++-------------------------
sw/rtfexport_setup.mk | 1
sw/uiwriter_setup.mk | 1
sw/ww8export_setup.mk | 1
test/source/unoapi_test.cxx | 21 +++++++++
61 files changed, 85 insertions(+), 89 deletions(-)
New commits:
commit 4170b94c443b3bd68b4cc75b8c344ecca3c249b0
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Nov 8 18:27:05 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Nov 9 11:34:05 2022 +0100
SwModelTestBase: inherit from UnoApiXmlTest
it seems setUp/tearDown can also go as well.
See the discussion in gerrit.
Change-Id: I5e81dcdcb2e070eb4beb737f3cb25c86cb9d042b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142465
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index 90fc65ef6d08..ede9734776ad 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -36,7 +36,7 @@ public:
css::uno::Any executeMacro(const OUString& rScriptURL,
const css::uno::Sequence<css::uno::Any>&
rParams = {});
- void save(const OUString& rFilter);
+ void save(const OUString& rFilter, const char* pPassword = nullptr);
void saveAndClose(const OUString& rFilter);
void saveAndReload(const OUString& rFilter);
diff --git a/sw/CppunitTest_sw_core_accessibilitycheck.mk
b/sw/CppunitTest_sw_core_accessibilitycheck.mk
index 1780c7c4bfc9..7cfa8b79770b 100644
--- a/sw/CppunitTest_sw_core_accessibilitycheck.mk
+++ b/sw/CppunitTest_sw_core_accessibilitycheck.mk
@@ -24,6 +24,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,sw_core_accessibilitycheck, \
sal \
svx \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_core_attr.mk b/sw/CppunitTest_sw_core_attr.mk
index 7ca0060290e3..b9b63ffd09d6 100644
--- a/sw/CppunitTest_sw_core_attr.mk
+++ b/sw/CppunitTest_sw_core_attr.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_attr, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_core_crsr.mk b/sw/CppunitTest_sw_core_crsr.mk
index 9fa24a4ebc0e..228afc04f637 100644
--- a/sw/CppunitTest_sw_core_crsr.mk
+++ b/sw/CppunitTest_sw_core_crsr.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_crsr, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_doc.mk b/sw/CppunitTest_sw_core_doc.mk
index 934ccf8eee6f..ebd8db9d0781 100644
--- a/sw/CppunitTest_sw_core_doc.mk
+++ b/sw/CppunitTest_sw_core_doc.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_doc, \
editeng \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_docnode.mk
b/sw/CppunitTest_sw_core_docnode.mk
index 8b409f7ac091..320110c791e6 100644
--- a/sw/CppunitTest_sw_core_docnode.mk
+++ b/sw/CppunitTest_sw_core_docnode.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_docnode, \
editeng \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_core_draw.mk b/sw/CppunitTest_sw_core_draw.mk
index acd065c01b4e..63dfd5f828b9 100644
--- a/sw/CppunitTest_sw_core_draw.mk
+++ b/sw/CppunitTest_sw_core_draw.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_draw, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_edit.mk b/sw/CppunitTest_sw_core_edit.mk
index b364e9813e35..0ecc68580bf9 100644
--- a/sw/CppunitTest_sw_core_edit.mk
+++ b/sw/CppunitTest_sw_core_edit.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_edit, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_fields.mk b/sw/CppunitTest_sw_core_fields.mk
index c8c982da4cc8..38a09a675e93 100644
--- a/sw/CppunitTest_sw_core_fields.mk
+++ b/sw/CppunitTest_sw_core_fields.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_fields, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_core_frmedt.mk b/sw/CppunitTest_sw_core_frmedt.mk
index 9138002d97ca..6e2cd5bc9760 100644
--- a/sw/CppunitTest_sw_core_frmedt.mk
+++ b/sw/CppunitTest_sw_core_frmedt.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_frmedt, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 9392d81adc59..3eba80b2ddd7 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_core_objectpositioning.mk
b/sw/CppunitTest_sw_core_objectpositioning.mk
index d66cc9197602..0f1a9dcff0be 100644
--- a/sw/CppunitTest_sw_core_objectpositioning.mk
+++ b/sw/CppunitTest_sw_core_objectpositioning.mk
@@ -23,6 +23,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,sw_core_objectpositioning, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_text.mk b/sw/CppunitTest_sw_core_text.mk
index efaa5c7bc59a..1d8db3e6eeb1 100644
--- a/sw/CppunitTest_sw_core_text.mk
+++ b/sw/CppunitTest_sw_core_text.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_text, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_tox.mk b/sw/CppunitTest_sw_core_tox.mk
index 4a99347239f5..e16e4cb61e95 100644
--- a/sw/CppunitTest_sw_core_tox.mk
+++ b/sw/CppunitTest_sw_core_tox.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_tox, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_core_txtnode.mk
b/sw/CppunitTest_sw_core_txtnode.mk
index 4fb34a695656..49c9b882b076 100644
--- a/sw/CppunitTest_sw_core_txtnode.mk
+++ b/sw/CppunitTest_sw_core_txtnode.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_txtnode, \
editeng \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_undo.mk b/sw/CppunitTest_sw_core_undo.mk
index 11593cd9e604..ea7f0becf02f 100644
--- a/sw/CppunitTest_sw_core_undo.mk
+++ b/sw/CppunitTest_sw_core_undo.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_undo, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_core_unocore.mk
b/sw/CppunitTest_sw_core_unocore.mk
index 568b10babfc4..1269158d3f67 100644
--- a/sw/CppunitTest_sw_core_unocore.mk
+++ b/sw/CppunitTest_sw_core_unocore.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_unocore, \
msword \
sal \
sfx \
+ subsequenttest \
svl \
svt \
svxcore \
diff --git a/sw/CppunitTest_sw_core_view.mk b/sw/CppunitTest_sw_core_view.mk
index 4f8dbabdf3e0..d9f0ab4a89ae 100644
--- a/sw/CppunitTest_sw_core_view.mk
+++ b/sw/CppunitTest_sw_core_view.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_view, \
cppu \
cppuhelper \
sal \
+ subsequenttest \
svl \
svt \
sw \
diff --git a/sw/CppunitTest_sw_docbookexport.mk
b/sw/CppunitTest_sw_docbookexport.mk
index 7c0f208a7993..dfc74ba57984 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_docbookexport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_filter_html.mk b/sw/CppunitTest_sw_filter_html.mk
index 130afe370dc7..3ddfe37a34ad 100644
--- a/sw/CppunitTest_sw_filter_html.mk
+++ b/sw/CppunitTest_sw_filter_html.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filter_html, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_filter_ww8.mk b/sw/CppunitTest_sw_filter_ww8.mk
index 0452776478df..712c5b99f42d 100644
--- a/sw/CppunitTest_sw_filter_ww8.mk
+++ b/sw/CppunitTest_sw_filter_ww8.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filter_ww8, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_filters_test.mk
b/sw/CppunitTest_sw_filters_test.mk
index c429145f595a..5546dc7f2a3e 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -25,6 +25,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sw_filters_test, \
$(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
sw \
sfx \
+ subsequenttest \
svl \
svt \
sot \
diff --git a/sw/CppunitTest_sw_filters_test2.mk
b/sw/CppunitTest_sw_filters_test2.mk
index f8666d071ce2..71f7796ff853 100644
--- a/sw/CppunitTest_sw_filters_test2.mk
+++ b/sw/CppunitTest_sw_filters_test2.mk
@@ -25,6 +25,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sw_filters_test2, \
$(eval $(call gb_CppunitTest_use_libraries,sw_filters_test2, \
sw \
sfx \
+ subsequenttest \
svl \
svt \
sot \
diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk
index 0a07239fe12e..f13191b6df8a 100644
--- a/sw/CppunitTest_sw_fodfexport.mk
+++ b/sw/CppunitTest_sw_fodfexport.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_fodfexport, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_globalfilter.mk
b/sw/CppunitTest_sw_globalfilter.mk
index dc5d00a76d43..410da401b2c5 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_globalfilter, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svt \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 038aae4eebb2..55450c3571db 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
msfilter \
sal \
sfx \
+ subsequenttest \
sot \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk
index 5843f2fae398..bedc43ea45a2 100644
--- a/sw/CppunitTest_sw_htmlimport.mk
+++ b/sw/CppunitTest_sw_htmlimport.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlimport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
svl \
svt \
sw \
diff --git a/sw/CppunitTest_sw_indexingexport.mk
b/sw/CppunitTest_sw_indexingexport.mk
index 7210fbe33042..0b81b23841a9 100644
--- a/sw/CppunitTest_sw_indexingexport.mk
+++ b/sw/CppunitTest_sw_indexingexport.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_indexingexport,
\
sal \
sfx \
sot \
+ subsequenttest \
sw \
swqahelper \
svl \
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index efc7f77aa522..0fc83a21b629 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_mailmerge, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_mailmerge2.mk b/sw/CppunitTest_sw_mailmerge2.mk
index 2fd6e107258a..0dcd55714c5b 100644
--- a/sw/CppunitTest_sw_mailmerge2.mk
+++ b/sw/CppunitTest_sw_mailmerge2.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_mailmerge2, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index edd50c5ff78a..62bc134ab0a4 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfexport, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_odfexport2.mk b/sw/CppunitTest_sw_odfexport2.mk
index 325de15fec65..6ef306d5cd87 100644
--- a/sw/CppunitTest_sw_odfexport2.mk
+++ b/sw/CppunitTest_sw_odfexport2.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfexport2, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 718770f090f5..c57e737ee7f4 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odfimport, \
sal \
svt \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk
b/sw/CppunitTest_sw_ooxmlexport8.mk
index 68d9621b647d..3fa3f70d46a8 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlexport8, \
cppu \
cppuhelper \
sal \
+ subsequenttest \
test \
unotest \
utl \
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index f4273f909e18..93ecf2324477 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
test \
unotest \
utl \
diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk
b/sw/CppunitTest_sw_ooxmlimport2.mk
index 67c4077fcecd..ed8d2a92e514 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport2, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
test \
unotest \
utl \
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 5934885405ef..650abb178408 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfimport, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
i18nlangtag \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_tiledrendering.mk
b/sw/CppunitTest_sw_tiledrendering.mk
index 8697cbf11209..198fc04a0028 100644
--- a/sw/CppunitTest_sw_tiledrendering.mk
+++ b/sw/CppunitTest_sw_tiledrendering.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_tiledrendering,
\
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svt \
svxcore \
diff --git a/sw/CppunitTest_sw_txtencexport.mk
b/sw/CppunitTest_sw_txtencexport.mk
index 1f37a8eba4c8..c9bd136c3ff0 100644
--- a/sw/CppunitTest_sw_txtencexport.mk
+++ b/sw/CppunitTest_sw_txtencexport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_txtencexport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_txtexport.mk b/sw/CppunitTest_sw_txtexport.mk
index 2eae07fd2a35..45b831a67c3d 100644
--- a/sw/CppunitTest_sw_txtexport.mk
+++ b/sw/CppunitTest_sw_txtexport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_txtexport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_txtimport.mk b/sw/CppunitTest_sw_txtimport.mk
index 646a2ea83391..dfd464b11175 100644
--- a/sw/CppunitTest_sw_txtimport.mk
+++ b/sw/CppunitTest_sw_txtimport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_txtimport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/CppunitTest_sw_uibase_dochdl.mk
b/sw/CppunitTest_sw_uibase_dochdl.mk
index f605226206bb..581eb1d68d7b 100644
--- a/sw/CppunitTest_sw_uibase_dochdl.mk
+++ b/sw/CppunitTest_sw_uibase_dochdl.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_dochdl, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_uibase_docvw.mk
b/sw/CppunitTest_sw_uibase_docvw.mk
index 9ce605633c3a..603532ca2a56 100644
--- a/sw/CppunitTest_sw_uibase_docvw.mk
+++ b/sw/CppunitTest_sw_uibase_docvw.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_docvw, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_uibase_fldui.mk
b/sw/CppunitTest_sw_uibase_fldui.mk
index 613161a21be4..689b9c3581c6 100644
--- a/sw/CppunitTest_sw_uibase_fldui.mk
+++ b/sw/CppunitTest_sw_uibase_fldui.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_fldui, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_uibase_frmdlg.mk
b/sw/CppunitTest_sw_uibase_frmdlg.mk
index aea77b87d33d..0f831a46f906 100644
--- a/sw/CppunitTest_sw_uibase_frmdlg.mk
+++ b/sw/CppunitTest_sw_uibase_frmdlg.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_frmdlg, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_uibase_shells.mk
b/sw/CppunitTest_sw_uibase_shells.mk
index a3d880458663..14e961f4725d 100644
--- a/sw/CppunitTest_sw_uibase_shells.mk
+++ b/sw/CppunitTest_sw_uibase_shells.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_shells, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_uibase_uiview.mk
b/sw/CppunitTest_sw_uibase_uiview.mk
index 14fbfd9b4c6f..867ea19219b4 100644
--- a/sw/CppunitTest_sw_uibase_uiview.mk
+++ b/sw/CppunitTest_sw_uibase_uiview.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_uiview, \
cppuhelper \
sal \
sfx \
+ subsequenttest \
svxcore \
sw \
swqahelper \
diff --git a/sw/CppunitTest_sw_uibase_uno.mk b/sw/CppunitTest_sw_uibase_uno.mk
index d6e43918e4a4..be3adc6e71f2 100644
--- a/sw/CppunitTest_sw_uibase_uno.mk
+++ b/sw/CppunitTest_sw_uibase_uno.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_uno, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_uibase_wrtsh.mk
b/sw/CppunitTest_sw_uibase_wrtsh.mk
index 7578be915fcb..02f54617dc22 100644
--- a/sw/CppunitTest_sw_uibase_wrtsh.mk
+++ b/sw/CppunitTest_sw_uibase_wrtsh.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_wrtsh, \
editeng \
sal \
sfx \
+ subsequenttest \
svl \
svx \
svxcore \
diff --git a/sw/CppunitTest_sw_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk
index e71456088a58..9f1c586a0991 100644
--- a/sw/CppunitTest_sw_unowriter.mk
+++ b/sw/CppunitTest_sw_unowriter.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_unowriter, \
msword \
sal \
sfx \
+ subsequenttest \
svl \
svt \
svxcore \
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 3fddcd5cb9c8..1115789e7425 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \
cppuhelper \
editeng \
sal \
+ subsequenttest \
test \
unotest \
vcl \
diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
index 16aa42c71569..44c9018bf706 100644
--- a/sw/CppunitTest_sw_xhtmlexport.mk
+++ b/sw/CppunitTest_sw_xhtmlexport.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_xhtmlexport, \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
sw \
swqahelper \
test \
diff --git a/sw/Library_swqahelper.mk b/sw/Library_swqahelper.mk
index b32fdcafb37b..d1d696ce4e98 100644
--- a/sw/Library_swqahelper.mk
+++ b/sw/Library_swqahelper.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,swqahelper,\
sw \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk
index bcbcee62083b..e151bcf75509 100644
--- a/sw/layoutwriter_setup.mk
+++ b/sw/layoutwriter_setup.mk
@@ -30,6 +30,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,sw_layoutwriter$(1), \
msword \
sal \
sfx \
+ subsequenttest \
svl \
svt \
svxcore \
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index f19e41f28469..8f45d30be7c3 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -16,6 +16,7 @@ define sw_ooxmlexport_libraries
editeng \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index c7875c09c2c8..4ec714a3a9c4 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -23,10 +23,8 @@
#include <com/sun/star/xml/AttributeData.hpp>
#include "swqahelperdllapi.h"
-#include <test/bootstrapfixture.hxx>
-#include <test/xmltesttools.hxx>
+#include <test/unoapixml_test.hxx>
#include <test/testinteractionhandler.hxx>
-#include <unotest/macros_test.hxx>
#include <unotools/tempfile.hxx>
#include <doc.hxx>
@@ -93,27 +91,21 @@ class PDFiumDocument;
}
/// Base class for filter tests loading or roundtripping a document, then
asserting the document model.
-class SWQAHELPER_DLLPUBLIC SwModelTestBase : public test::BootstrapFixture,
public unotest::MacrosTest, public XmlTestTools
+class SWQAHELPER_DLLPUBLIC SwModelTestBase : public UnoApiXmlTest
{
private:
- OUString maFilterOptions;
OUString maImportFilterOptions;
OUString maImportFilterName;
- const OUString mpTestDocumentPath;
bool mbExported; ///< Does maTempFile already contain something useful?
protected:
- css::uno::Reference< css::lang::XComponent > mxComponent;
-
rtl::Reference<TestInteractionHandler> xInteractionHandler;
xmlBufferPtr mpXmlBuffer;
const char* mpFilter;
sal_uInt32 mnStartTime;
- utl::TempFileNamed maTempFile;
SvMemoryStream maMemory; ///< Underlying memory for parsed PDF files.
- bool mbFontNameWYSIWYG;
virtual OUString getTestName() { return OUString(); }
@@ -121,11 +113,6 @@ protected:
void paste(std::u16string_view aFilename,
css::uno::Reference<css::text::XTextRange> const& xTextRange);
public:
- void setFilterOptions(const OUString &rFilterOptions)
- {
- maFilterOptions = rFilterOptions;
- }
-
void setImportFilterOptions(const OUString &rFilterOptions)
{
maImportFilterOptions = rFilterOptions;
@@ -138,10 +125,6 @@ public:
SwModelTestBase(const OUString& pTestDocumentPath = OUString(), const
char* pFilter = "");
- void setUp() override;
-
- void tearDown() override;
-
protected:
/**
* Helper func used by each unit test to test the 'import' code.
@@ -327,11 +310,6 @@ protected:
"com.sun.star.text.WebDocument", pName,
pPassword);
}
- OUString createFileURL(std::u16string_view aFileName)
- {
- return m_directories.getSrcRootURL() + mpTestDocumentPath + "/" +
aFileName;
- }
-
void setTestInteractionHandler(const char* pPassword,
std::vector<beans::PropertyValue>& rFilterOptions);
void loadURLWithComponent(OUString const& rURL, OUString const&
rComponent, const char* pName, const char* pPassword);
@@ -357,14 +335,6 @@ protected:
/// Get shape count.
int getShapes() const;
- /**
- * Given that some problem doesn't affect the result in the importer, we
- * test the resulting file directly, by opening the zip file, parsing an
- * xml stream, and asserting an XPath expression. This method returns the
- * xml stream, so that you can do the asserting.
- */
- xmlDocUniquePtr parseExport(const OUString& rStreamName);
-
/**
* Returns an xml stream of an exported file.
* To be used when the exporter doesn't create zip archives, but single
files
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index a9cd21c4d1ce..540874ac9322 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -55,37 +55,12 @@ void SwModelTestBase::paste(std::u16string_view aFilename,
}
SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath, const
char* pFilter)
- : mpTestDocumentPath(pTestDocumentPath)
+ : UnoApiXmlTest(pTestDocumentPath)
, mbExported(false)
, mpXmlBuffer(nullptr)
, mpFilter(pFilter)
, mnStartTime(0)
- ,
mbFontNameWYSIWYG(officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::get())
{
- maTempFile.EnableKillingFile();
-}
-
-void SwModelTestBase::setUp()
-{
- test::BootstrapFixture::setUp();
- mxDesktop.set(
-
css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
- SfxApplication::GetOrCreate();
- std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(false,
xChanges);
- xChanges->commit();
-}
-
-void SwModelTestBase::tearDown()
-{
- if (mxComponent.is())
- mxComponent->dispose();
- std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(mbFontNameWYSIWYG,
xChanges);
- xChanges->commit();
- test::BootstrapFixture::tearDown();
}
void SwModelTestBase::executeImportTest(const char* filename, const char*
pPassword)
@@ -552,28 +527,10 @@ void SwModelTestBase::reload(const char* pFilter, const
char* pName, const char*
void SwModelTestBase::save(const OUString& aFilterName, const char* pName,
const char* pPassword)
{
- uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= aFilterName;
- if (!maFilterOptions.isEmpty())
- aMediaDescriptor["FilterOptions"] <<= maFilterOptions;
- if (pPassword)
- {
- if (aFilterName != "Office Open XML Text")
- {
- aMediaDescriptor["Password"] <<=
OUString::createFromAscii(pPassword);
- }
- else
- {
- OUString sPassword = OUString::createFromAscii(pPassword);
- css::uno::Sequence<css::beans::NamedValue> aEncryptionData{
- { "CryptoType", css::uno::Any(OUString("Standard")) },
- { "OOXPassword", css::uno::Any(sPassword) }
- };
- aMediaDescriptor[utl::MediaDescriptor::PROP_ENCRYPTIONDATA] <<=
aEncryptionData;
- }
- }
- xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+ // FIXME: Merge skipValidation and mustValidate
+ skipValidation();
+
+ UnoApiXmlTest::save(aFilterName, pPassword);
// TODO: for now, validate only ODF here
if (mustValidate(pName) || aFilterName == "writer8"
@@ -640,13 +597,6 @@ int SwModelTestBase::getShapes() const
return xDraws->getCount();
}
-xmlDocUniquePtr SwModelTestBase::parseExport(const OUString& rStreamName)
-{
- std::unique_ptr<SvStream> pStream(parseExportStream(maTempFile.GetURL(),
rStreamName));
-
- return parseXmlStream(pStream.get());
-}
-
xmlDocUniquePtr SwModelTestBase::parseExportedFile()
{
auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ |
StreamMode::TEMPORARY));
diff --git a/sw/rtfexport_setup.mk b/sw/rtfexport_setup.mk
index 3ea61755d467..e4421cab8ac3 100644
--- a/sw/rtfexport_setup.mk
+++ b/sw/rtfexport_setup.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport$(1), \
i18nlangtag \
sal \
sfx \
+ subsequenttest \
svl \
sw \
swqahelper \
diff --git a/sw/uiwriter_setup.mk b/sw/uiwriter_setup.mk
index c6b1d6417f24..37c506149e7e 100644
--- a/sw/uiwriter_setup.mk
+++ b/sw/uiwriter_setup.mk
@@ -18,6 +18,7 @@ define sw_uiwriter_libraries
msword \
sal \
sfx \
+ subsequenttest \
svl \
svt \
svxcore \
diff --git a/sw/ww8export_setup.mk b/sw/ww8export_setup.mk
index f2fdd0a5aa9c..26a58ad41191 100644
--- a/sw/ww8export_setup.mk
+++ b/sw/ww8export_setup.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export$(1), \
test \
unotest \
utl \
+ subsequenttest \
svl \
svxcore \
sw \
diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx
index a0c41da78ec5..6918f7a7a174 100644
--- a/test/source/unoapi_test.cxx
+++ b/test/source/unoapi_test.cxx
@@ -9,6 +9,7 @@
#include <test/unoapi_test.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <comphelper/processfactory.hxx>
@@ -82,13 +83,31 @@ uno::Any UnoApiTest::executeMacro(const OUString&
rScriptURL,
return aRet;
}
-void UnoApiTest::save(const OUString& rFilter)
+void UnoApiTest::save(const OUString& rFilter, const char* pPassword)
{
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilter;
if (!maFilterOptions.isEmpty())
aMediaDescriptor["FilterOptions"] <<= maFilterOptions;
css::uno::Reference<frame::XStorable> xStorable(mxComponent,
css::uno::UNO_QUERY_THROW);
+
+ if (pPassword)
+ {
+ if (rFilter != "Office Open XML Text")
+ {
+ aMediaDescriptor["Password"] <<=
OUString::createFromAscii(pPassword);
+ }
+ else
+ {
+ OUString sPassword = OUString::createFromAscii(pPassword);
+ uno::Sequence<beans::NamedValue> aEncryptionData{
+ { "CryptoType", uno::Any(OUString("Standard")) },
+ { "OOXPassword", uno::Any(sPassword) }
+ };
+ aMediaDescriptor[utl::MediaDescriptor::PROP_ENCRYPTIONDATA] <<=
aEncryptionData;
+ }
+ }
+
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
if (!mbSkipValidation)
