sw/qa/extras/uiwriter/uiwriter.cxx | 36 --------------------------------- vcl/qa/cppunit/pdfexport/pdfexport.cxx | 14 ++++++++++++ 2 files changed, 14 insertions(+), 36 deletions(-)
New commits: commit a4691c7d5eb494c242305936428086940f90d83a Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Mon Nov 29 10:59:27 2021 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Mon Nov 29 16:42:38 2021 +0100 these are pdf export tests, move them to vcl_pdfexport Change-Id: Ic9412e86f9256f8e2ca6823d8b5b8757c4273025 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126025 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 4325aeb1b1f5..76ee8d22f846 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -232,8 +232,6 @@ public: void testDeleteTableRedlines(); void testXFlatParagraph(); void testTdf81995(); - void testForcepoint3(); - void testForcepoint80(); void testExportToPicture(); void testTdf77340(); void testTdf79236(); @@ -353,8 +351,6 @@ public: CPPUNIT_TEST(testDeleteTableRedlines); CPPUNIT_TEST(testXFlatParagraph); CPPUNIT_TEST(testTdf81995); - CPPUNIT_TEST(testForcepoint3); - CPPUNIT_TEST(testForcepoint80); CPPUNIT_TEST(testExportToPicture); CPPUNIT_TEST(testTdf77340); CPPUNIT_TEST(testTdf79236); @@ -2018,38 +2014,6 @@ void SwUiWriterTest::testTdf81995() } } -void SwUiWriterTest::testForcepoint3() -{ - createSwDoc(DATA_DIRECTORY, "flowframe_null_ptr_deref.sample"); - uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({ - { "FilterName", uno::Any(OUString("writer_pdf_Export")) }, - })); - utl::TempFile aTempFile; - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - // printing asserted in SwFrame::GetNextSctLeaf() - xStorable->storeToURL(aTempFile.GetURL(), aDescriptor); - aTempFile.EnableKillingFile(); -} - -void SwUiWriterTest::testForcepoint80() -{ - try - { - createSwDoc(DATA_DIRECTORY, "forcepoint80-1.rtf"); - uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({ - { "FilterName", uno::Any(OUString("writer_pdf_Export")) }, - })); - utl::TempFile aTempFile; - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - // printing asserted in SwCellFrame::FindStartEndOfRowSpanCell - xStorable->storeToURL(aTempFile.GetURL(), aDescriptor); - aTempFile.EnableKillingFile(); - } - catch(...) - { - } -} - void SwUiWriterTest::testExportToPicture() { createSwDoc(); diff --git a/sw/qa/extras/uiwriter/data/flowframe_null_ptr_deref.sample b/vcl/qa/cppunit/pdfexport/data/flowframe_null_ptr_deref.sample similarity index 100% rename from sw/qa/extras/uiwriter/data/flowframe_null_ptr_deref.sample rename to vcl/qa/cppunit/pdfexport/data/flowframe_null_ptr_deref.sample diff --git a/sw/qa/extras/uiwriter/data/forcepoint80-1.rtf b/vcl/qa/cppunit/pdfexport/data/forcepoint80-1.rtf similarity index 100% rename from sw/qa/extras/uiwriter/data/forcepoint80-1.rtf rename to vcl/qa/cppunit/pdfexport/data/forcepoint80-1.rtf diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index c21c4241b609..2ca8e3764a19 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1547,6 +1547,20 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testForcePoint71) saveAsPDF(u"forcepoint71.key"); } +CPPUNIT_TEST_FIXTURE(PdfExportTest, testForcePoint80) +{ + // printing asserted in SwCellFrame::FindStartEndOfRowSpanCell + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + saveAsPDF(u"forcepoint80-1.rtf"); +} + +CPPUNIT_TEST_FIXTURE(PdfExportTest, testForcePoint3) +{ + // printing asserted in SwFrame::GetNextSctLeaf() + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + saveAsPDF(u"flowframe_null_ptr_deref.sample"); +} + CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf84283) { // Without the fix in place, this test would have crashed