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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |    8 ++++----
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx |    7 ++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 90d6d7bb71a4961fc96d09833f5fefb77897f9f3
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Apr 18 16:47:22 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Apr 18 21:28:04 2023 +0200

    sw: these test should also check the export
    
    Change-Id: I4b6a42454c186b17bf35c204dae1e051bb401b84
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150580
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 0fd98a48f759..8fea20074208 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -872,16 +872,16 @@ CPPUNIT_TEST_FIXTURE(Test, testSemiTransparentText)
     CPPUNIT_ASSERT_EQUAL(nTransparence, nActual);
 }
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf147485)
+DECLARE_OOXMLEXPORT_TEST(testTdf147485, "Tdf147485.docx")
 {
     // Before the fix this was impossible.
-    createSwDoc("Tdf147485.docx");
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf149546)
+DECLARE_OOXMLEXPORT_TEST(testTdf149546, "tdf149546.docx")
 {
     // Before the fix this was impossible.
-    createSwDoc("tdf149546.docx");
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testUserField)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index fed8066f87f8..7088fc6ba0e8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -210,10 +210,8 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135906)
     // just test round-tripping. The document was exported as corrupt and 
didn't re-load.
 }
 
-CPPUNIT_TEST_FIXTURE(Test, TestTdf146802)
+DECLARE_OOXMLEXPORT_TEST(testTdf146802, "tdf146802.docx")
 {
-    createSwDoc("tdf146802.docx");
-
     // First check if the load failed, as before the fix.
     CPPUNIT_ASSERT(mxComponent);
 
@@ -1083,9 +1081,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx")
     }
 }
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf154481)
+DECLARE_OOXMLEXPORT_TEST(testTdf154481, "tdf154481.docx")
 {
-    createSwDoc("tdf154481.docx");
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Missing pages!", 7, getPages());
 }