chart2/qa/extras/chart2export3.cxx | 2 +- chart2/qa/extras/charttest.hxx | 4 ++-- include/test/unoapi_test.hxx | 2 +- include/test/unoapixml_test.hxx | 2 +- sw/qa/core/header_footer/HeaderFooterTest.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport19.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport22.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport23.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport24.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport25.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 4 ++-- sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2 +- sw/qa/extras/uiwriter/uiwriter10.cxx | 2 +- sw/qa/inc/swmodeltestbase.hxx | 2 +- sw/qa/unit/swmodeltestbase.cxx | 4 ++-- test/source/unoapi_test.cxx | 13 +++---------- test/source/unoapixml_test.cxx | 4 ++-- 36 files changed, 42 insertions(+), 49 deletions(-)
New commits: commit 49f203b628e6cfb3acfd92573eb58f98065a21d0 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 19 21:42:18 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:19:50 2025 +0100 UnoApiTest: do not skip DOCX export validation unless it's explicitily specified For now, turn it off only in those place where it's already failing. Change-Id: I6e6d384e2bea3a2a3307b6b1bd5dd8fac260b09b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194223 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Xisco Fauli <[email protected]> diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index 31d407cbe787..8dda1c09c9ad 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -21,7 +21,7 @@ using beans::XPropertySet; class Chart2ExportTest3 : public ChartTest { public: - Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} + Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index a8edb86bbde9..0b921a191c39 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -62,8 +62,8 @@ using namespace css::uno; class ChartTest : public UnoApiXmlTest { public: - ChartTest(const OUString& path) - : UnoApiXmlTest(path) + ChartTest(const OUString& path, bool bSkipValidation = false) + : UnoApiXmlTest(path, bSkipValidation) { } diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index 2790f531d774..b1498e31f5dd 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -118,7 +118,7 @@ const std::unordered_map<TestFilter, OUString> TestFilterNames{ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unotest::MacrosTest { public: - UnoApiTest(OUString path); + UnoApiTest(OUString path, bool bSkipValidation = false); virtual void setUp() override; virtual void tearDown() override; diff --git a/include/test/unoapixml_test.hxx b/include/test/unoapixml_test.hxx index 569be11790b9..ae63b6d0ac94 100644 --- a/include/test/unoapixml_test.hxx +++ b/include/test/unoapixml_test.hxx @@ -20,7 +20,7 @@ class OOO_DLLPUBLIC_TEST UnoApiXmlTest : public UnoApiTest, public XmlTestTools { public: - UnoApiXmlTest(OUString path); + UnoApiXmlTest(OUString path, bool bSkipValidation = false); xmlDocUniquePtr parseExport(OUString const& rStreamName); diff --git a/sw/qa/core/header_footer/HeaderFooterTest.cxx b/sw/qa/core/header_footer/HeaderFooterTest.cxx index 5f117f87b0b6..0b2c23012d67 100644 --- a/sw/qa/core/header_footer/HeaderFooterTest.cxx +++ b/sw/qa/core/header_footer/HeaderFooterTest.cxx @@ -43,7 +43,7 @@ public: void checkShapeInFirstPageHeader(); HeaderFooterTest() - : SwModelTestBase(u"/sw/qa/core/header_footer/data/"_ustr) + : SwModelTestBase(u"/sw/qa/core/header_footer/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index fb8965c5bc24..a8290f4942a6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -37,7 +37,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testfdo81381) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 7a884b455426..3db2a5c07d95 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -40,7 +40,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testWPGtextboxes, "testWPGtextboxes.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index c4a61db19d73..9066053c9f6d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -31,7 +31,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testTdf57589_hashColor, "tdf57589_hashColor.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 25a2507196a9..4970bda289c5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -25,7 +25,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 383e3776916a..9d619b990362 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -32,7 +32,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; // TODO: the re-import doesn't work just yet, but that isn't a regression... diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 8e5439aa4fb6..92c6270c818b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(Tdf130907, "tdf130907.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index de298a604319..1886365dd0d5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -24,7 +24,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testTdf123621) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 3a5022865d55..00b5f4eb2e4d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -35,7 +35,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testTdf143860NonPrimitiveCustomShape) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index cac6d99b4b59..a00fe6ed9e6c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -42,7 +42,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testTdf135164_cancelledNumbering, "tdf135164_cancelledNumbering.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index cbcdfb1ec463..6403780fd087 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -40,7 +40,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testTdf150197_predefinedNumbering) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx index 5dd58fd57536..0ab4df0e7762 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx @@ -42,7 +42,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 7eeffe610090..1398834b0659 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -38,7 +38,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testPageGraphicBackground) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx index 95abfb85130d..a3251a0feb27 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx @@ -28,7 +28,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index 4e1943a8d424..742a20c49573 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -37,7 +37,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx index 09c90c229101..92bc7ef73969 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx @@ -32,7 +32,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx index 01ac9461a92c..b248a098a1fd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx @@ -28,7 +28,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx index ba5056fb1728..dadd7ca40c85 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx @@ -40,7 +40,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx index e8d29ac4e07a..175787a0f30f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx @@ -28,7 +28,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 73449804e5fd..dad7d38a79f3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -27,7 +27,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 20e33b03801a..70a0cce28dea 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -31,7 +31,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} protected: void verifyComboBoxExport(bool aComboBoxAsDropDown); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index a473364369dd..3cc270121327 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -23,7 +23,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testFDO76248) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index c20424ba73c1..2eef94530bc8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -30,7 +30,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; CPPUNIT_TEST_FIXTURE(Test, testTdf133701) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 064e434ab9f4..0b37bb335116 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -28,7 +28,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} protected: // We import OOXML's EMUs into integral mm100 internal representation, then export back into diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 7c9a318af7dc..0374efb5eec7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -44,7 +44,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index c6c2fe739319..6b8239d6f4dd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -34,14 +34,14 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; class DocmTest : public SwModelTestBase { public: DocmTest() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) { } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index f2fbc775d98b..5baaf63f00e3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -25,7 +25,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} }; DECLARE_OOXMLEXPORT_TEST(testFdo47669, "fdo47669.docx") diff --git a/sw/qa/extras/uiwriter/uiwriter10.cxx b/sw/qa/extras/uiwriter/uiwriter10.cxx index 84ad9e5178d9..9822e0c3b6f8 100644 --- a/sw/qa/extras/uiwriter/uiwriter10.cxx +++ b/sw/qa/extras/uiwriter/uiwriter10.cxx @@ -42,7 +42,7 @@ class SwUiWriterTest5 : public SwModelTestBase { public: SwUiWriterTest5() - : SwModelTestBase(u"/sw/qa/extras/uiwriter/data/"_ustr) + : SwModelTestBase(u"/sw/qa/extras/uiwriter/data/"_ustr, /*bSkipValidation*/ true) { } diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index 11967d327dd5..f9bd1855dd4c 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -79,7 +79,7 @@ protected: void paste(std::u16string_view aFilename, const OUString& aInstance, css::uno::Reference<css::text::XTextRange> const& xTextRange); public: - SwModelTestBase(const OUString& pTestDocumentPath = OUString()); + SwModelTestBase(const OUString& pTestDocumentPath = OUString(), bool bSkipValidation = false); protected: /** diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index e149687a9cf1..70828d032bbb 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -55,8 +55,8 @@ void SwModelTestBase::paste(std::u16string_view aFilename, const OUString& aInst CPPUNIT_ASSERT(xFilter->filter(aDescriptor)); } -SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath) - : UnoApiXmlTest(pTestDocumentPath) +SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath, bool bSkipValidation) + : UnoApiXmlTest(pTestDocumentPath, bSkipValidation) , mpXmlBuffer(nullptr) { } diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index a3cc8bbd3519..9660ea477051 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -24,8 +24,8 @@ using namespace css; using namespace css::uno; -UnoApiTest::UnoApiTest(OUString path) - : mbSkipValidation(false) +UnoApiTest::UnoApiTest(OUString path, bool bSkipValidation) + : mbSkipValidation(bSkipValidation) , m_aBaseString(std::move(path)) , meImportFilterName(TestFilter::NONE) { @@ -180,14 +180,7 @@ void UnoApiTest::save(TestFilter eFilter, const char* pPassword) saveWithParams(aMediaDescriptor.getAsConstPropertyValueList()); if (!mbSkipValidation) - { - if (eFilter == TestFilter::DOCX) - { - // do nothing: too many validation errors right now - } - else - validate(maTempFile.GetFileName(), aFilter); - } + validate(maTempFile.GetFileName(), aFilter); } void UnoApiTest::saveWithParams(const uno::Sequence<beans::PropertyValue>& rParams) diff --git a/test/source/unoapixml_test.cxx b/test/source/unoapixml_test.cxx index d07c97351066..121e57625269 100644 --- a/test/source/unoapixml_test.cxx +++ b/test/source/unoapixml_test.cxx @@ -20,8 +20,8 @@ using namespace css; -UnoApiXmlTest::UnoApiXmlTest(OUString path) - : UnoApiTest(std::move(path)) +UnoApiXmlTest::UnoApiXmlTest(OUString path, bool bSkipValidation) + : UnoApiTest(std::move(path), bSkipValidation) { }
