SwModelTestBase: inherit from UnoApiXmlTest

x1sc0 · x1sc0 · commit 4170b94c443b · 2022-11-09T11:34:05.000+01:00
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 <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
diff --git a/sw/Library_swqahelper.mk b/sw/Library_swqahelper.mk
diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
diff --git a/sw/rtfexport_setup.mk b/sw/rtfexport_setup.mk
diff --git a/sw/uiwriter_setup.mk b/sw/uiwriter_setup.mk
diff --git a/sw/ww8export_setup.mk b/sw/ww8export_setup.mk
diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx
