[Libreoffice-commits] core.git: sw/qa

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 91cbd74b6d469079e97064c9c88e0860941841fa
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Apr 5 20:09:27 2022 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Apr 6 08:13:28 2022 +0200

    CppunitTest_sw_ooxmlexport7: 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: I32bd9a8e6ddf706f87bc2f17b75539d4d4c68f13
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132586
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 23cdbc2c53b6..d1a4378b1b71 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -27,14 +27,6 @@ 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");
-    }
-
     // We import OOXML's EMUs into integral mm100 internal representation, 
then export back into
     // EMUs. This results in inaccuracies.
     void assertXPathHasApproxEMU(const xmlDocUniquePtr& pXmlDoc, const 
OString& rXPath,
@@ -731,8 +723,9 @@ CPPUNIT_TEST_FIXTURE(Test, testAbsolutePositionOffsetValue)
     }
 }
 
-DECLARE_OOXMLEXPORT_TEST(testRubyHyperlink, "rubyhyperlink.fodt")
+CPPUNIT_TEST_FIXTURE(Test, testRubyHyperlink)
 {
+    loadAndReload("rubyhyperlink.fodt");
     // test that export doesn't assert with overlapping ruby / hyperlink attr
 }