sc/CppunitTest_sc_pdf_export.mk | 1
sc/qa/extras/scpdfexport.cxx | 66 ++++++++++++++++------------------------
2 files changed, 28 insertions(+), 39 deletions(-)
New commits:
commit b887d67ff9914100df787bd2036b22bf32456fab
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Oct 20 15:07:00 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Oct 20 20:01:24 2022 +0200
CppunitTest_sc_pdf_export: inherit from CalcUnoApiTest
in order to get rid of setUp/tearDown
Change-Id: I94dcb647760c71ec8bfc2bbdf50361d81f586eea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141566
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/CppunitTest_sc_pdf_export.mk b/sc/CppunitTest_sc_pdf_export.mk
index 19b67515cb14..5ed4986e9513 100644
--- a/sc/CppunitTest_sc_pdf_export.mk
+++ b/sc/CppunitTest_sc_pdf_export.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_pdf_export, \
sax \
sc \
sfx \
+ subsequenttest \
svl \
test \
tl \
diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx
index c22a1d0626e6..fb9f2287835e 100644
--- a/sc/qa/extras/scpdfexport.cxx
+++ b/sc/qa/extras/scpdfexport.cxx
@@ -10,6 +10,8 @@
#include <sal/config.h>
#include <config_oox.h>
+#include <test/calc_unoapi_test.hxx>
+
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -17,9 +19,7 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <comphelper/propertysequence.hxx>
-#include <test/bootstrapfixture.hxx>
#include <unotools/tempfile.hxx>
-#include <unotest/macros_test.hxx>
#include <docsh.hxx>
#include <editutil.hxx>
#include <editeng/eeitem.hxx>
@@ -38,17 +38,12 @@ using namespace css::lang;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-class ScPDFExportTest : public test::BootstrapFixture, public
unotest::MacrosTest
+class ScPDFExportTest : public CalcUnoApiTest
{
- Reference<XComponent> mxComponent;
-
public:
- ScPDFExportTest() {}
+ ScPDFExportTest();
~ScPDFExportTest();
- virtual void setUp() override final;
- virtual void tearDown() override final;
-
// helpers
private:
std::shared_ptr<utl::TempFileNamed> exportToPDF(const
uno::Reference<frame::XModel>& xModel,
@@ -85,7 +80,10 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-constexpr OUStringLiteral DATA_DIRECTORY = u"/sc/qa/extras/testdocuments/";
+ScPDFExportTest::ScPDFExportTest()
+ : CalcUnoApiTest("sc/qa/extras/testdocuments/")
+{
+}
ScPDFExportTest::~ScPDFExportTest()
{
@@ -94,22 +92,6 @@ ScPDFExportTest::~ScPDFExportTest()
#endif
}
-void ScPDFExportTest::setUp()
-{
- test::BootstrapFixture::setUp();
-
- mxDesktop.set(
-
css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
-}
-
-void ScPDFExportTest::tearDown()
-{
- if (mxComponent.is())
- mxComponent->dispose();
-
- test::BootstrapFixture::tearDown();
-}
-
bool ScPDFExportTest::hasTextInPdf(const std::shared_ptr<utl::TempFileNamed>&
pPDFFile,
const char* sText, bool& bFound)
{
@@ -387,8 +369,9 @@ void ScPDFExportTest::testExportFitToPage_Tdf103516()
void ScPDFExportTest::testUnoCommands_Tdf120161()
{
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "tdf120161.ods",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"tdf120161.ods", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
// A1:G1
{
@@ -417,9 +400,10 @@ void ScPDFExportTest::testUnoCommands_Tdf120161()
void ScPDFExportTest::testTdf64703_hiddenPageBreak()
{
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
- + "tdf64703_hiddenPageBreak.ods",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"tdf64703_hiddenPageBreak.ods", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
+
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
// A1:A11: 4-page export
@@ -440,8 +424,9 @@ void ScPDFExportTest::testTdf143978()
return;
}
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "tdf143978.ods",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"tdf143978.ods", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
// A1:A2
@@ -487,8 +472,9 @@ void ScPDFExportTest::testTdf84012()
return;
}
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "tdf84012.ods",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"tdf84012.ods", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
// A1
@@ -528,8 +514,9 @@ void ScPDFExportTest::testTdf78897()
return;
}
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "tdf78897.xls",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"tdf78897.xls", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
// C3:D3
@@ -564,8 +551,9 @@ void ScPDFExportTest::testTdf78897()
// just needs to not crash on export to pdf
void ScPDFExportTest::testForcepoint97()
{
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "forcepoint97.xlsx",
- "com.sun.star.sheet.SpreadsheetDocument");
+ OUString aFileURL;
+ createFileURL(u"forcepoint97.xlsx", aFileURL);
+ mxComponent = loadFromDesktop(aFileURL);
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
// A1:H81
