sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
New commits: commit 5aa575ebe5ee199b3ac545c4c0367260227eecb2 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Tue Sep 20 20:10:59 2022 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Wed Sep 21 10:42:45 2022 +0200 CppunitTest_sw_ooxmlfieldexport: remove not needed mustTestImportOf() See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: I819eea323c7445bf25444c11c35314f439d4116c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140261 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index f5db919b4c7e..079312daf8c1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -27,15 +27,6 @@ class Test : public SwModelTestBase { public: Test() : SwModelTestBase(DATA_DIRECTORY, "Office Open XML Text") {} - -protected: - /** - * Denylist handling - */ - bool mustTestImportOf(const char* filename) const override { - // If the testcase is stored in some other format, it's pointless to test. - return o3tl::ends_with(filename, ".docx"); - } }; DECLARE_OOXMLEXPORT_TEST(testFdo47669, "fdo47669.docx") @@ -80,8 +71,9 @@ CPPUNIT_TEST_FIXTURE(Test, testBnc834035) assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:hyperlink", "anchor", "_Toc363553908"); } -DECLARE_OOXMLEXPORT_TEST(testCp1000015, "cp1000015.odt") +CPPUNIT_TEST_FIXTURE(Test, testCp1000015) { + loadAndReload("cp1000015.odt"); CPPUNIT_ASSERT_EQUAL(1, getPages()); // Redline and hyperlink end got exported in an incorrect order. getParagraph(1, "Hello."); @@ -659,20 +651,23 @@ DECLARE_OOXMLEXPORT_TEST(testFixedDateFields, "fixed-date-field.docx") } } -DECLARE_OOXMLEXPORT_TEST(testToxmarkHyperlink, "toxmarkhyperlink.fodt") +CPPUNIT_TEST_FIXTURE(Test, testToxmarkHyperlink) { + loadAndReload("toxmarkhyperlink.fodt"); // test that export doesn't assert with overlapping fields / hyperlink attr } -DECLARE_OOXMLEXPORT_TEST(testOO34469, "ooo34469-1.odt") +CPPUNIT_TEST_FIXTURE(Test, testOO34469) { + loadAndReload("ooo34469-1.odt"); CPPUNIT_ASSERT_EQUAL(1, getPages()); if (xmlDocUniquePtr pXmlDoc = parseExport()) assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:hyperlink[1]", "anchor", "2.9.2.Creating_New_files|outline"); } -DECLARE_OOXMLEXPORT_TEST(testOO39845, "ooo39845-7.odt") +CPPUNIT_TEST_FIXTURE(Test, testOO39845) { + loadAndReload("ooo39845-7.odt"); CPPUNIT_ASSERT_EQUAL(1, getPages()); if (xmlDocUniquePtr pXmlDoc = parseExport()) assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:hyperlink[1]", "anchor", "Figure4|graphic"); @@ -770,8 +765,9 @@ DECLARE_OOXMLEXPORT_TEST( testDateFieldAtEndOfParagraph, "date_field_at_end_of_p } } -DECLARE_OOXMLEXPORT_TEST(testDropDownFieldEntryLimit, "tdf126792.odt" ) +CPPUNIT_TEST_FIXTURE(Test, testDropDownFieldEntryLimit) { + loadAndReload("tdf126792.odt" ); CPPUNIT_ASSERT_EQUAL(1, getPages()); // In MSO, there is a limit of 25 for the items in a drop-down form field. // So we truncate the list of items to not exceed this limit.