summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2022-03-29 20:59:15 +0200
committerMiklos Vajna <vmiklos@collabora.com>2022-03-30 08:09:32 +0200
commit7c647704cf0b272304f9e22940e27cee53fa034a (patch)
tree5f84b737216bd0c383cb45257498eabaed68b0c7 /sw
parent92ddacfaa00f7dbcddc521f2239916e69e9a33d6 (diff)
CppunitTest_sw_ooxmlexport6: 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: I8ee8a13a0aafda32176b109c1f27622974e9cf12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132284 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport6.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 1ed0acf0562a..6c35215f584a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -31,15 +31,6 @@ class Test : public SwModelTestBase
{
public:
Test() : SwModelTestBase("/sw/qa/extras/ooxmlexport/data/", "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 OString(filename).endsWith(".docx");
- }
};
CPPUNIT_TEST_FIXTURE(Test, testTdf133701)
@@ -152,8 +143,9 @@ DECLARE_OOXMLEXPORT_TEST(testDMLSolidfillAlpha, "dml-solidfill-alpha.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getProperty<sal_Int16>(xShape, "FillTransparence"));
}
-DECLARE_OOXMLEXPORT_TEST(testDMLTextFrameNoFill, "frame.fodt")
+CPPUNIT_TEST_FIXTURE(Test, testDMLTextFrameNoFill)
{
+ loadAndReload("frame.fodt");
// Problem is that default text frame background is white in Writer and transparent in Word
uno::Reference<beans::XPropertySet> xShape1(getShape(1), uno::UNO_QUERY);
// it is re-imported as solid