sw/qa/extras/uiwriter/uiwriter8.cxx | 23 +++++++++++++++++++++++ sw/qa/uitest/writer_tests4/insertPageHeader.py | 13 ------------- 2 files changed, 23 insertions(+), 13 deletions(-)
New commits: commit f8a5e416ea7713c7936b1533b43e16e2b711bea1 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Thu Jan 26 13:33:34 2023 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Thu Jan 26 15:39:45 2023 +0000 tdf#146248: sw: move UItest to CppUnittest Change-Id: Ibb198808d124457f6676cdf642b75289948514d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146174 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/qa/uitest/data/tdf146248.docx b/sw/qa/extras/uiwriter/data/tdf146248.docx similarity index 100% rename from sw/qa/uitest/data/tdf146248.docx rename to sw/qa/extras/uiwriter/data/tdf146248.docx diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 2a1cbedc8256..2bd6b415f11e 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -819,6 +819,29 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf144364) getParagraph(1)->getString()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146248) +{ + createSwDoc("tdf146248.docx"); + + uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName("Standard"), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xPageStyle, "HeaderIsOn")); + + SwDoc* pDoc = getSwDoc(); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + + // Delete the header + pWrtShell->ChangeHeaderOrFooter(u"Default Page Style", true, false, false); + + CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xPageStyle, "HeaderIsOn")); + + // Without the fix in place, this test would have crashed here + dispatchCommand(mxComponent, ".uno:Undo", {}); + Scheduler::ProcessEventsToIdle(); + + CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xPageStyle, "HeaderIsOn")); +} + CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141613) { createSwDoc(); diff --git a/sw/qa/uitest/writer_tests4/insertPageHeader.py b/sw/qa/uitest/writer_tests4/insertPageHeader.py index 406671021881..e71749b82931 100644 --- a/sw/qa/uitest/writer_tests4/insertPageHeader.py +++ b/sw/qa/uitest/writer_tests4/insertPageHeader.py @@ -62,17 +62,4 @@ class WriterInsertPageHeader(UITestCase): self.delete_header() - def test_tdf146248(self): - with self.ui_test.load_file(get_url_for_data_file("tdf146248.docx")): - - self.delete_header() - - # crashed before - self.xUITest.executeCommand(".uno:Undo") - - document = self.ui_test.get_component() - self.assertEqual( - document.StyleFamilies.PageStyles.Standard.HeaderIsOn, True) - - # vim: set shiftwidth=4 softtabstop=4 expandtab: