sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 846e57fd31e7fa37021a12b3088ca565a459ff4a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Apr 12 08:23:07 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Apr 12 09:20:35 2022 +0200
CppunitTest_sw_ooxmlexport8: avoid mustTestImportOf()
Can use CPPUNIT_TEST_FIXTURE() instead.
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
(CppunitTest_sw_rtfimport: convert one testcase to use
CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation.
Change-Id: I92e2c25121a543747471e4066b55ddaf87a7a88b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132874
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 415138bc5e28..33c347661233 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -60,15 +60,6 @@ public:
}
return nullptr;
}
-
-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 OString(filename).endsWith(".docx");
- }
};
DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
@@ -77,8 +68,9 @@ DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER);
}
-DECLARE_OOXMLEXPORT_TEST(testTdf48569, "tdf48569.odt")
+CPPUNIT_TEST_FIXTURE(Test, testTdf48569)
{
+ loadAndReload("tdf48569.odt");
CPPUNIT_ASSERT_EQUAL(2, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// File crashing while saving in LO
